facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity

trydiff: extract 'date2' variable like existing 'date1'

Browse Source 
Note that there is a comment saying "ctx2 date may be dynamic". The
comment was introduced in 8ed3d2a60500 (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.
This commit is contained in:
Martin von Zweigbergk 2014-12-23 14:56:30 -08:00
parent c7f4a068b8
commit 12fa2d93ff
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mercurial/patch.py
View File

@ -1784,6 +1784,7 @@ def trydiff(repo, revs, ctx1, ctx2, modified, added, removed,
return line
date1 = util.datestr(ctx1.date())
date2 = util.datestr(ctx2.date())
man1 = ctx1.manifest()
gone = set()
@ -1878,9 +1879,8 @@ def trydiff(repo, revs, ctx1, ctx2, modified, added, removed,
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: