equal
deleted
inserted
replaced
27 raise util.Abort('losing data for %s' % fn) |
27 raise util.Abort('losing data for %s' % fn) |
28 else: |
28 else: |
29 raise util.Abort('--git must be yes, no or auto') |
29 raise util.Abort('--git must be yes, no or auto') |
30 |
30 |
31 node1, node2 = scmutil.revpair(repo, []) |
31 node1, node2 = scmutil.revpair(repo, []) |
32 m = scmutil.match(repo, pats, opts) |
32 m = scmutil.match(repo[node2], pats, opts) |
33 it = patch.diff(repo, node1, node2, match=m, opts=diffopts, |
33 it = patch.diff(repo, node1, node2, match=m, opts=diffopts, |
34 losedatafn=losedatafn) |
34 losedatafn=losedatafn) |
35 for chunk in it: |
35 for chunk in it: |
36 ui.write(chunk) |
36 ui.write(chunk) |
37 for fn in sorted(brokenfiles): |
37 for fn in sorted(brokenfiles): |