Show More
@@ -1663,7 +1663,7 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1663 | def join(f): |
|
1663 | def join(f): | |
1664 | return os.path.join(prefix, f) |
|
1664 | return os.path.join(prefix, f) | |
1665 |
|
1665 | |||
1666 |
def diffline( |
|
1666 | def diffline(a, b, revs): | |
1667 | if repo.ui.quiet and not opts.git: |
|
1667 | if repo.ui.quiet and not opts.git: | |
1668 | return '' |
|
1668 | return '' | |
1669 | parts = ['diff'] |
|
1669 | parts = ['diff'] | |
@@ -1763,7 +1763,7 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1763 |
|
1763 | |||
1764 | if dodiff: |
|
1764 | if dodiff: | |
1765 | if opts.git or revs: |
|
1765 | if opts.git or revs: | |
1766 |
header.insert(0, diffline( |
|
1766 | header.insert(0, diffline(join(a), join(b), revs)) | |
1767 | if dodiff == 'binary': |
|
1767 | if dodiff == 'binary': | |
1768 | text = mdiff.b85diff(to, tn) |
|
1768 | text = mdiff.b85diff(to, tn) | |
1769 | else: |
|
1769 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now