facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

trydiff: make addindexmeta() unconditionally add index meta

Browse Source 
The conditional-ness is not clear from the name and there is only one
caller, so it's clearer to check on the call site. Moving it also
makes addindexmeta() no longer close on the 'opts' variable.
This commit is contained in:
Martin von Zweigbergk 2015-01-07 08:54:26 -08:00
parent 590312deed
commit 86561cd4f0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mercurial/patch.py
View File

@ -1748,8 +1748,7 @@ def trydiff(repo, revs, ctx1, ctx2, modified, added, removed,
header.append('new mode %s\n' % nmode)
def addindexmeta(meta, oindex, nindex):
if opts.git:
meta.append('index %s..%s\n' % (oindex, nindex))
meta.append('index %s..%s\n' % (oindex, nindex))
def gitindex(text):
if not text:
@ -1875,7 +1874,7 @@ def trydiff(repo, revs, ctx1, ctx2, modified, added, removed,
header.insert(0, diffline(join(a), join(b), revs))
if dodiff == 'binary' and not opts.nobinary:
text = mdiff.b85diff(to, tn)
if text:
if text and opts.git:
addindexmeta(header, gitindex(to), gitindex(tn))
else:
text = mdiff.unidiff(to, date1,