equal
deleted
inserted
replaced
1753 aprefix = 'a/' |
1753 aprefix = 'a/' |
1754 bprefix = 'b/' |
1754 bprefix = 'b/' |
1755 |
1755 |
1756 def diffline(f, revs): |
1756 def diffline(f, revs): |
1757 if not repo.ui.quiet: |
1757 if not repo.ui.quiet: |
1758 if revs: |
1758 revinfo = ' '.join(["-r %s" % rev for rev in revs]) |
1759 revinfo = ' '.join(["-r %s" % rev for rev in revs]) |
1759 line = 'diff %s %s\n' % (revinfo, f) |
1760 line = 'diff %s %s\n' % (revinfo, f) |
|
1761 else: |
|
1762 line = 'diff %s\n' % f |
|
1763 else: |
1760 else: |
1764 line = '' |
1761 line = '' |
1765 return line |
1762 return line |
1766 |
1763 |
1767 date1 = util.datestr(ctx1.date()) |
1764 date1 = util.datestr(ctx1.date()) |