You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/07/30 21:41:43 UTC
svn commit: r1367246 - /subversion/trunk/tools/dev/gdb-py/svndbg/printers.py
Author: julianfoad
Date: Mon Jul 30 19:41:42 2012
New Revision: 1367246
URL: http://svn.apache.org/viewvc?rev=1367246&view=rev
Log:
* tools/dev/gdb-py/svndbg/printers.py
(SvnMergeRangePrinter): Format the range in the standard way.
Modified:
subversion/trunk/tools/dev/gdb-py/svndbg/printers.py
Modified: subversion/trunk/tools/dev/gdb-py/svndbg/printers.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/gdb-py/svndbg/printers.py?rev=1367246&r1=1367245&r2=1367246&view=diff
==============================================================================
--- subversion/trunk/tools/dev/gdb-py/svndbg/printers.py (original)
+++ subversion/trunk/tools/dev/gdb-py/svndbg/printers.py Mon Jul 30 19:41:42 2012
@@ -207,9 +207,22 @@ class SvnMergeRangePrinter:
return 'NULL'
r = self.val
- rs = str(r['start']) + '-' + str(r['end'])
+ start = int(r['start'])
+ end = int(r['end'])
+ if start >= 0 and start < end:
+ if start + 1 == end:
+ rs = str(end)
+ else:
+ rs = str(start + 1) + '-' + str(end)
+ elif end >= 0 and end < start:
+ if start == end + 1:
+ rs = '-' + str(start)
+ else:
+ rs = str(start) + '-' + str(end + 1)
+ else:
+ rs = '(INVALID: s=%d, e=%d)' % (start, end)
if not r['inheritable']:
- rs += '*'
+ rs += '*'
return rs
def display_hint(self):