##// END OF EJS Templates
trydiff: order header-writing code in same order as output...
Martin von Zweigbergk -
r24001:f610c3bd default
parent child Browse files
Show More
@@ -1850,6 +1850,8 b' def trydiff(repo, revs, ctx1, ctx2, modi'
1850 path1 = posixpath.join(prefix, f1)
1850 path1 = posixpath.join(prefix, f1)
1851 path2 = posixpath.join(prefix, f2)
1851 path2 = posixpath.join(prefix, f2)
1852 header = []
1852 header = []
1853 if opts.git or revs:
1854 header.append(diffline(path1, path2, revs))
1853 if opts.git:
1855 if opts.git:
1854 if content1 is None: # added
1856 if content1 is None: # added
1855 header.append('new file mode %s\n' % gitmode[flag2])
1857 header.append('new file mode %s\n' % gitmode[flag2])
@@ -1864,8 +1866,6 b' def trydiff(repo, revs, ctx1, ctx2, modi'
1864 header.append('%s from %s\n' % (op, path1))
1866 header.append('%s from %s\n' % (op, path1))
1865 header.append('%s to %s\n' % (op, path2))
1867 header.append('%s to %s\n' % (op, path2))
1866
1868
1867 if opts.git or revs:
1868 header.insert(0, diffline(path1, path2, revs))
1869 if binarydiff and not opts.nobinary:
1869 if binarydiff and not opts.nobinary:
1870 text = mdiff.b85diff(content1, content2)
1870 text = mdiff.b85diff(content1, content2)
1871 if text and opts.git:
1871 if text and opts.git:
General Comments 0
You need to be logged in to leave comments. Login now