##// END OF EJS Templates
trydiff: extract 'date2' variable like existing 'date1'...
Martin von Zweigbergk -
r23662:bc7d90c9 default
parent child Browse files
Show More
@@ -1784,6 +1784,7 b' def trydiff(repo, revs, ctx1, ctx2, modi'
1784 return line
1784 return line
1785
1785
1786 date1 = util.datestr(ctx1.date())
1786 date1 = util.datestr(ctx1.date())
1787 date2 = util.datestr(ctx2.date())
1787 man1 = ctx1.manifest()
1788 man1 = ctx1.manifest()
1788
1789
1789 gone = set()
1790 gone = set()
@@ -1878,9 +1879,8 b' def trydiff(repo, revs, ctx1, ctx2, modi'
1878 addindexmeta(header, [gitindex(to), gitindex(tn)])
1879 addindexmeta(header, [gitindex(to), gitindex(tn)])
1879 else:
1880 else:
1880 text = mdiff.unidiff(to, date1,
1881 text = mdiff.unidiff(to, date1,
1881 # ctx2 date may be dynamic
1882 tn, date2,
1882 tn, util.datestr(ctx2.date()),
1883 join(a), join(b), opts=opts)
1883 join(a), join(b), opts=opts)
1884 if header and (text or len(header) > 1):
1884 if header and (text or len(header) > 1):
1885 yield ''.join(header)
1885 yield ''.join(header)
1886 if text:
1886 if text:
General Comments 0
You need to be logged in to leave comments. Login now