##// END OF EJS Templates
trydiff: remove unused argument to diffline()...
Martin von Zweigbergk -
r24021:f51a822d default
parent child Browse files
Show More
@@ -1753,13 +1753,13 b' def trydiff(repo, revs, ctx1, ctx2, modi'
1753 aprefix = 'a/'
1753 aprefix = 'a/'
1754 bprefix = 'b/'
1754 bprefix = 'b/'
1755
1755
1756 def diffline(a, b, revs):
1756 def diffline(f, revs):
1757 if not repo.ui.quiet:
1757 if not repo.ui.quiet:
1758 if revs:
1758 if revs:
1759 revinfo = ' '.join(["-r %s" % rev for rev in revs])
1759 revinfo = ' '.join(["-r %s" % rev for rev in revs])
1760 line = 'diff %s %s\n' % (revinfo, a)
1760 line = 'diff %s %s\n' % (revinfo, f)
1761 else:
1761 else:
1762 line = 'diff %s\n' % a
1762 line = 'diff %s\n' % f
1763 else:
1763 else:
1764 line = ''
1764 line = ''
1765 return line
1765 return line
@@ -1846,7 +1846,7 b' def trydiff(repo, revs, ctx1, ctx2, modi'
1846 path2 = posixpath.join(prefix, f2)
1846 path2 = posixpath.join(prefix, f2)
1847 header = []
1847 header = []
1848 if revs:
1848 if revs:
1849 header.append(diffline(path1, path2, revs))
1849 header.append(diffline(path1, revs))
1850 elif opts.git:
1850 elif opts.git:
1851 header.append('diff --git %s%s %s%s\n' %
1851 header.append('diff --git %s%s %s%s\n' %
1852 (aprefix, path1, bprefix, path2))
1852 (aprefix, path1, bprefix, path2))
General Comments 0
You need to be logged in to leave comments. Login now