##// END OF EJS Templates
trydiff: remove unused code for git index of "combined diff"...
Martin von Zweigbergk -
r23751:30c6e85a default
parent child Browse files
Show More
@@ -1747,13 +1747,9 b' def trydiff(repo, revs, ctx1, ctx2, modi'
1747 header.append('old mode %s\n' % omode)
1747 header.append('old mode %s\n' % omode)
1748 header.append('new mode %s\n' % nmode)
1748 header.append('new mode %s\n' % nmode)
1749
1749
1750 def addindexmeta(meta, revs):
1750 def addindexmeta(meta, oindex, nindex):
1751 if opts.git:
1751 if opts.git:
1752 i = len(revs)
1752 meta.append('index %s..%s\n' % (oindex, nindex))
1753 if i==2:
1754 meta.append('index %s..%s\n' % tuple(revs))
1755 elif i==3:
1756 meta.append('index %s,%s..%s\n' % tuple(revs))
1757
1753
1758 def gitindex(text):
1754 def gitindex(text):
1759 if not text:
1755 if not text:
@@ -1880,7 +1876,7 b' def trydiff(repo, revs, ctx1, ctx2, modi'
1880 if dodiff == 'binary' and not opts.nobinary:
1876 if dodiff == 'binary' and not opts.nobinary:
1881 text = mdiff.b85diff(to, tn)
1877 text = mdiff.b85diff(to, tn)
1882 if text:
1878 if text:
1883 addindexmeta(header, [gitindex(to), gitindex(tn)])
1879 addindexmeta(header, gitindex(to), gitindex(tn))
1884 else:
1880 else:
1885 text = mdiff.unidiff(to, date1,
1881 text = mdiff.unidiff(to, date1,
1886 tn, date2,
1882 tn, date2,
General Comments 0
You need to be logged in to leave comments. Login now