[PATCH 2 of 2 evolve-ext-V5] afterresolvehook for evolve --continue
Shusen LIU
liushusen at fb.com
Wed Jan 27 00:14:25 UTC 2016
# HG changeset patch
# User Shusen LIU <liushusen at fb.com>
# Date 1453853221 28800
# Tue Jan 26 16:07:01 2016 -0800
# Node ID 353420302daf4529e72e12725012816a17eef792
# Parent 53915488b7d05a88c09cc807f90f03e9df7efadc
afterresolvehook for evolve --continue
add hook for suggest `hg evolve --continue` when all files resolved, this
behavior is similar to what graft / rebase does.
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -3805,3 +3805,8 @@
tr.close()
finally:
release(tr, lock, wlock) # reverse order
+
+ at eh.uisetup
+def _setupafterresolvedstateshook(ui):
+ cmdutil.afterresolvedstates.append(
+ ['evolvestate', _('hg evolve --continue')])
diff --git a/tests/test-stabilize-conflict.t b/tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t
+++ b/tests/test-stabilize-conflict.t
@@ -165,6 +165,7 @@
$ safesed 's/dix/ten/' babar
$ hg resolve --all -m
(no more unresolved files)
+ continue: hg evolve --continue
$ hg evolve --continue
evolving 5:71c18f70c34f "babar count up to fifteen"
$ hg resolve -l
diff --git a/tests/test-stabilize-result.t b/tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t
+++ b/tests/test-stabilize-result.t
@@ -102,6 +102,7 @@
[255]
$ hg resolve -m a
(no more unresolved files)
+ continue: hg evolve --continue
$ hg evolve --continue
evolving 5:3655f0f50885 "newer a"
More information about the Mercurial-devel
mailing list