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