equal
deleted
inserted
replaced
834 if opts is None: |
834 if opts is None: |
835 opts = {} |
835 opts = {} |
836 stat = opts.get(b'stat') |
836 stat = opts.get(b'stat') |
837 m = scmutil.match(repo[node1], files, opts) |
837 m = scmutil.match(repo[node1], files, opts) |
838 logcmdutil.diffordiffstat( |
838 logcmdutil.diffordiffstat( |
839 self.ui, repo, diffopts, node1, node2, m, changes, stat, fp |
839 self.ui, |
|
840 repo, |
|
841 diffopts, |
|
842 repo[node1], |
|
843 repo[node2], |
|
844 m, |
|
845 changes, |
|
846 stat, |
|
847 fp, |
840 ) |
848 ) |
841 |
849 |
842 def mergeone(self, repo, mergeq, head, patch, rev, diffopts): |
850 def mergeone(self, repo, mergeq, head, patch, rev, diffopts): |
843 # first try just applying the patch |
851 # first try just applying the patch |
844 (err, n) = self.apply( |
852 (err, n) = self.apply( |