Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc1, 0.4rc2, and 0.4rc3

hggtk/changeset: hg-version safe mdiff.unidiff() call

Verified to work correctly on hg 0.9.4, 0.9.5, and tip

Changeset 47adc84be374…

Parent 246175ee2a9f…

by Steve Borho

Changes to one file · Browse files at 47adc84be374 Showing diff from parent 246175ee2a9f Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​changeset.py Stacked
 
343
344
345
346
 
 
347
348
 
 
 
 
 
 
 
349
350
351
 
343
344
345
 
346
347
348
 
349
350
351
352
353
354
355
356
357
358
@@ -343,9 +343,16 @@
  if dodiff == 'binary':   text = 'binary file has changed.\n'   elif dodiff: - text = patch.mdiff.unidiff(to, date1, + try: + text = patch.mdiff.unidiff(to, date1,   tn, util.datestr(ctx2.date()), - a, b, None, opts=patch.mdiff.defaultopts) + fn1=a, fn2=b, r=None, + opts=patch.mdiff.defaultopts) + except TypeError: + # hg-0.9.5 and before + text = patch.mdiff.unidiff(to, date1, + tn, util.datestr(ctx2.date()), + f, None, opts=patch.mdiff.defaultopts)   else:   text = ''   if header or text: yield (s, f, ''.join(header) + text)