Show More
@@ -21,6 +21,7 b' from . import (' | |||||
21 | obsutil, |
|
21 | obsutil, | |
22 | revset, |
|
22 | revset, | |
23 | scmutil, |
|
23 | scmutil, | |
|
24 | util, | |||
24 | ) |
|
25 | ) | |
25 |
|
26 | |||
26 |
|
27 | |||
@@ -38,6 +39,10 b" def precheck(repo, revs, action=b'rewrit" | |||||
38 | hint = _(b"no changeset checked out") |
|
39 | hint = _(b"no changeset checked out") | |
39 | raise error.InputError(msg, hint=hint) |
|
40 | raise error.InputError(msg, hint=hint) | |
40 |
|
41 | |||
|
42 | if any(util.safehasattr(r, 'rev') for r in revs): | |||
|
43 | repo.ui.develwarn(b"rewriteutil.precheck called with ctx not revs") | |||
|
44 | revs = (r.rev() for r in revs) | |||
|
45 | ||||
41 | if len(repo[None].parents()) > 1: |
|
46 | if len(repo[None].parents()) > 1: | |
42 | raise error.StateError(_(b"cannot %s while merging") % action) |
|
47 | raise error.StateError(_(b"cannot %s while merging") % action) | |
43 |
|
48 |
General Comments 0
You need to be logged in to leave comments.
Login now