Mercurial > hg-stable
changeset 24001:f610c3bd03d3
trydiff: order header-writing code in same order as output
Instead of inserting a line before the others header lines, move the
code that writes that line before the code that writes the other
lines.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 16 Jan 2015 14:49:08 -0800 |
| parents | 82e3324c4df9 |
| children | 96d130697f07 |
| files | mercurial/patch.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/patch.py Fri Jan 16 14:53:37 2015 -0800 +++ b/mercurial/patch.py Fri Jan 16 14:49:08 2015 -0800 @@ -1850,6 +1850,8 @@ path1 = posixpath.join(prefix, f1) path2 = posixpath.join(prefix, f2) header = [] + if opts.git or revs: + header.append(diffline(path1, path2, revs)) if opts.git: if content1 is None: # added header.append('new file mode %s\n' % gitmode[flag2]) @@ -1864,8 +1866,6 @@ header.append('%s from %s\n' % (op, path1)) header.append('%s to %s\n' % (op, path2)) - if opts.git or revs: - header.insert(0, diffline(path1, path2, revs)) if binarydiff and not opts.nobinary: text = mdiff.b85diff(content1, content2) if text and opts.git: