Skip to content

Commit 0ddd75b

Browse files
quark-zjumeta-codesync[bot]
authored andcommitted
drop: use commit hashes for rebase
Summary: Avoid using (unstable) revision numbers for rebase. Unblocks migrating off rev numbers. Reviewed By: zzl0 Differential Revision: D93880426 fbshipit-source-id: 0bab62e3ff0a72801df6a0065007bb4f39b8437f
1 parent 775c027 commit 0ddd75b

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

eden/scm/sapling/ext/drop.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
from sapling import cmdutil, error, extensions, registrar, scmutil
3838
from sapling.i18n import _
39+
from sapling.node import hex
3940

4041

4142
cmdtable = {}
@@ -94,22 +95,24 @@ def drop(ui, repo, *revs, **opts) -> None:
9495
raise error.Abort(_("public changeset which landed cannot be dropped"))
9596

9697
node = changectx.node()
97-
parents = repo.revs("parents(%n)", node)
98+
parents = list(repo.nodes("parents(%n)", node))
9899
if len(parents) > 1:
99100
raise error.Abort(_("merge changeset cannot be dropped"))
100101
elif len(parents) == 0:
101102
raise error.Abort(_("root changeset cannot be dropped"))
102103

103104
_showrev(ui, repo, node)
104105

105-
descendants = repo.revs("(%n::) - %n", node, node)
106-
parent = parents.first()
106+
descendants = list(repo.nodes("(%n::) - %n", node, node))
107+
parent = parents[0]
107108
with repo.wlock():
108109
with repo.lock():
109110
with repo.transaction("drop"):
110111
if len(descendants) > 0:
111112
try:
112-
rebasemod.rebase(ui, repo, dest=str(parent), rev=descendants)
113+
rebasemod.rebase(
114+
ui, repo, dest=hex(parent), rev=list(map(hex, descendants))
115+
)
113116
except error.InterventionRequired:
114117
ui.warn(
115118
_(

0 commit comments

Comments
 (0)