[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH v2] Make display_lines output a diff

From: Ramkumar Ramachandra <artagnon_at_gmail.com>
Date: Tue, 27 Jul 2010 18:18:13 +0530

Hi Daniel,

Daniel Shahaf writes:
> I suggest
>
> fromfile="EXPECTED %s" % label,
> tofile="ACTUAL %s" % label,

Do I get a +1 for this?

[[[
* subversion/tests/cmdline/svntest/verify.py
  (display_lines): Improve diff output by displaying `message` along
  with the header.

Suggested by: danielsh
]]]

Index: subversion/tests/cmdline/svntest/verify.py
===================================================================
--- subversion/tests/cmdline/svntest/verify.py (revision 979511)
+++ subversion/tests/cmdline/svntest/verify.py (working copy)
@@ -296,7 +296,8 @@ def display_lines(message, label, expected, actual
   # Additionally print unified diff
   print('DIFF ' + ' '.join(output.split(' ')[1:]))
   for x in unified_diff(expected, actual,
- fromfile="EXPECTED", tofile="ACTUAL"):
+ fromfile="EXPECTED %s" % label,
+ tofile="ACTUAL %s" % label):
     sys.stdout.write(x)
 
 def compare_and_display_lines(message, label, expected, actual,
Received on 2010-07-27 14:50:40 CEST

This is an archived mail posted to the Subversion Dev mailing list.