--- a/hgext/rebase.py Tue Sep 28 09:08:43 2021 -0700
+++ b/hgext/rebase.py Tue Sep 28 08:47:11 2021 -0700
@@ -35,6 +35,7 @@
dirstateguard,
error,
extensions,
+ logcmdutil,
merge as mergemod,
mergestate as mergestatemod,
mergeutil,
@@ -1302,19 +1303,19 @@
dest = None
if revf:
- rebaseset = scmutil.revrange(repo, revf)
+ rebaseset = logcmdutil.revrange(repo, revf)
if not rebaseset:
ui.status(_(b'empty "rev" revision set - nothing to rebase\n'))
return None
elif srcf:
- src = scmutil.revrange(repo, srcf)
+ src = logcmdutil.revrange(repo, srcf)
if not src:
ui.status(_(b'empty "source" revision set - nothing to rebase\n'))
return None
# `+ (%ld)` to work around `wdir()::` being empty
rebaseset = repo.revs(b'(%ld):: + (%ld)', src, src)
else:
- base = scmutil.revrange(repo, basef or [b'.'])
+ base = logcmdutil.revrange(repo, basef or [b'.'])
if not base:
ui.status(
_(b'empty "base" revision set - ' b"can't compute rebase set\n")