equal
deleted
inserted
replaced
720 else: |
720 else: |
721 util.rename(absf, absorig) |
721 util.rename(absf, absorig) |
722 |
722 |
723 def printdiff(self, repo, diffopts, node1, node2=None, files=None, |
723 def printdiff(self, repo, diffopts, node1, node2=None, files=None, |
724 fp=None, changes=None, opts=None): |
724 fp=None, changes=None, opts=None): |
725 opts = opts or {} |
725 if opts is None: |
|
726 opts = {} |
726 stat = opts.get('stat') |
727 stat = opts.get('stat') |
727 m = scmutil.match(repo[node1], files, opts) |
728 m = scmutil.match(repo[node1], files, opts) |
728 cmdutil.diffordiffstat(self.ui, repo, diffopts, node1, node2, m, |
729 cmdutil.diffordiffstat(self.ui, repo, diffopts, node1, node2, m, |
729 changes, stat, fp) |
730 changes, stat, fp) |
730 |
731 |