Mercurial > hg

changeset 23662:bc7d90c966d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 23 Dec 2014 14:56:30 -0800
parents dbd60f8d88d5
children a9853fc172d2
files mercurial/patch.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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: