##// END OF EJS Templates
trydiff: inline sole addmodehdr() call...
Martin von Zweigbergk -
r24000:82e3324c default
parent child Browse files
Show More
@@ -1739,11 +1739,6 b' def diffui(*args, **kw):'
1739 def trydiff(repo, revs, ctx1, ctx2, modified, added, removed,
1739 def trydiff(repo, revs, ctx1, ctx2, modified, added, removed,
1740 copy, getfilectx, opts, losedatafn, prefix):
1740 copy, getfilectx, opts, losedatafn, prefix):
1741
1741
1742 def addmodehdr(header, mode1, mode2):
1743 if mode1 != mode2:
1744 header.append('old mode %s\n' % mode1)
1745 header.append('new mode %s\n' % mode2)
1746
1747 def addindexmeta(meta, index1, index2):
1742 def addindexmeta(meta, index1, index2):
1748 meta.append('index %s..%s\n' % (index1, index2))
1743 meta.append('index %s..%s\n' % (index1, index2))
1749
1744
@@ -1861,7 +1856,10 b' def trydiff(repo, revs, ctx1, ctx2, modi'
1861 elif content2 is None: # removed
1856 elif content2 is None: # removed
1862 header.append('deleted file mode %s\n' % gitmode[flag1])
1857 header.append('deleted file mode %s\n' % gitmode[flag1])
1863 else: # modified/copied/renamed
1858 else: # modified/copied/renamed
1864 addmodehdr(header, gitmode[flag1], gitmode[flag2])
1859 mode1, mode2 = gitmode[flag1], gitmode[flag2]
1860 if mode1 != mode2:
1861 header.append('old mode %s\n' % mode1)
1862 header.append('new mode %s\n' % mode2)
1865 if op is not None:
1863 if op is not None:
1866 header.append('%s from %s\n' % (op, path1))
1864 header.append('%s from %s\n' % (op, path1))
1867 header.append('%s to %s\n' % (op, path2))
1865 header.append('%s to %s\n' % (op, path2))
General Comments 0
You need to be logged in to leave comments. Login now