# HG changeset patch # User Martin von Zweigbergk # Date 1419375390 28800 # Node ID bc7d90c966d20d0061daa39245700bc05f024047 # Parent dbd60f8d88d510e6fe3c16b18c9973b6ed4b0a12 trydiff: extract 'date2' variable like existing 'date1' Note that there is a comment saying "ctx2 date may be dynamic". The comment was introduced in dccb83241dd0 (patch: use contexts for diff, 2006-12-25), but it seems like it stopped being dynamic in that very changeset -- before that changeset, the date seems to have been the file's mtime, but after the changeset, it seems to be the changeset's timestamp (current time for workingctx). Since no one seems to have missed the "dynamicness", let's simplify and extract a date2 for symmetry with date1. diff -r dbd60f8d88d5 -r bc7d90c966d2 mercurial/patch.py --- a/mercurial/patch.py Tue Dec 23 10:41:45 2014 -0800 +++ b/mercurial/patch.py Tue Dec 23 14:56:30 2014 -0800 @@ -1784,6 +1784,7 @@ return line date1 = util.datestr(ctx1.date()) + date2 = util.datestr(ctx2.date()) man1 = ctx1.manifest() gone = set() @@ -1878,9 +1879,8 @@ addindexmeta(header, [gitindex(to), gitindex(tn)]) else: text = mdiff.unidiff(to, date1, - # ctx2 date may be dynamic - tn, util.datestr(ctx2.date()), - join(a), join(b), opts=opts) + tn, date2, + join(a), join(b), opts=opts) if header and (text or len(header) > 1): yield ''.join(header) if text: