equal
deleted
inserted
replaced
2 |
2 |
3 from __future__ import absolute_import |
3 from __future__ import absolute_import |
4 |
4 |
5 from mercurial import ( |
5 from mercurial import ( |
6 error, |
6 error, |
|
7 logcmdutil, |
7 patch, |
8 patch, |
8 pycompat, |
9 pycompat, |
9 registrar, |
10 registrar, |
10 scmutil, |
11 scmutil, |
11 ) |
12 ) |
47 raise error.Abort(b'losing data for %s' % fn) |
48 raise error.Abort(b'losing data for %s' % fn) |
48 |
49 |
49 else: |
50 else: |
50 raise error.Abort(b'--git must be yes, no or auto') |
51 raise error.Abort(b'--git must be yes, no or auto') |
51 |
52 |
52 ctx1, ctx2 = scmutil.revpair(repo, []) |
53 ctx1, ctx2 = logcmdutil.revpair(repo, []) |
53 m = scmutil.match(ctx2, pats, opts) |
54 m = scmutil.match(ctx2, pats, opts) |
54 it = patch.diff( |
55 it = patch.diff( |
55 repo, |
56 repo, |
56 ctx1.node(), |
57 ctx1.node(), |
57 ctx2.node(), |
58 ctx2.node(), |