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

Don't generate git diff header for empty diffs

Browse Source
This commit is contained in:
Brendan Cully 2006-10-10 14:48:26 -07:00
parent b373d10384
commit 2b9e1a5fbd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mercurial/patch.py
View File

@ -467,6 +467,7 @@ def diff(repo, node1=None, node2=None, files=None, match=util.always,
to = None
tn = None
dodiff = True
header = []
if f in mmap:
to = getfile(f).read(mmap[f])
if f not in removed:
@ -480,7 +481,6 @@ def diff(repo, node1=None, node2=None, files=None, match=util.always,
header.append('new mode %s\n' % nmode)
a, b = f, f
header = []
if f in added:
if node2:
mode = gitmode(mmap2.execf(f))
@ -510,11 +510,12 @@ def diff(repo, node1=None, node2=None, files=None, match=util.always,
nmode = gitmode(util.is_exec(repo.wjoin(f), mmap.execf(f)))
addmodehdr(header, omode, nmode)
r = None
if dodiff:
header.insert(0, 'diff --git a/%s b/%s\n' % (a, b))
fp.write(''.join(header))
header.insert(0, 'diff --git a/%s b/%s\n' % (a, b))
if dodiff:
fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, opts=opts))
text = mdiff.unidiff(to, date1, tn, date2(f), f, r, opts=opts)
if text or len(header) > 1:
fp.write(''.join(header))
fp.write(text)
def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False,
opts=None):