1006 for seqno, rev in enumerate(revs): |
1006 for seqno, rev in enumerate(revs): |
1007 single(rev, seqno + 1, fp) |
1007 single(rev, seqno + 1, fp) |
1008 |
1008 |
1009 def diffordiffstat(ui, repo, diffopts, node1, node2, match, |
1009 def diffordiffstat(ui, repo, diffopts, node1, node2, match, |
1010 changes=None, stat=False, fp=None, prefix='', |
1010 changes=None, stat=False, fp=None, prefix='', |
1011 relative='', listsubrepos=False): |
1011 root='', listsubrepos=False): |
1012 '''show diff or diffstat.''' |
1012 '''show diff or diffstat.''' |
1013 if fp is None: |
1013 if fp is None: |
1014 write = ui.write |
1014 write = ui.write |
1015 else: |
1015 else: |
1016 def write(s, **kw): |
1016 def write(s, **kw): |
1017 fp.write(s) |
1017 fp.write(s) |
1018 |
1018 |
1019 if relative: |
1019 if root: |
1020 relroot = pathutil.canonpath(repo.root, repo.getcwd(), relative) |
1020 relroot = pathutil.canonpath(repo.root, repo.getcwd(), root) |
1021 else: |
1021 else: |
1022 relroot = '' |
1022 relroot = '' |
1023 if relroot != '': |
1023 if relroot != '': |
1024 # XXX relative roots currently don't work if the root is within a |
1024 # XXX relative roots currently don't work if the root is within a |
1025 # subrepo |
1025 # subrepo |