--- a/hgext3rd/evolve/cmdrewrite.py Fri Aug 31 09:11:04 2018 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py Fri Aug 31 09:13:11 2018 +0200
@@ -1351,11 +1351,11 @@
origctx = repo[revs.first()]
if origctx in pctx.ancestors() or origctx.node() == pctx.node():
- raise error.Abort(_("cannot grab an ancestor revision"))
+ raise error.Abort(_("cannot pick an ancestor revision"))
- rewriteutil.precheck(repo, [origctx.rev()], 'grab')
+ rewriteutil.precheck(repo, [origctx.rev()], 'pick')
- ui.status(_('grabbing %d:%s "%s"\n') %
+ ui.status(_('picking %d:%s "%s"\n') %
(origctx.rev(), origctx,
origctx.description().split("\n", 1)[0]))
stats = merge.graft(repo, origctx, origctx.p1(), ['local',
@@ -1369,10 +1369,10 @@
elif abort:
if not grabstate:
- raise error.Abort(_("no interrupted grab state exists"))
+ raise error.Abort(_("no interrupted pick state exists"))
grabstate.load()
pctxnode = grabstate['oldpctx']
- ui.status(_("aborting grab, updating to %s\n") %
+ ui.status(_("aborting pick, updating to %s\n") %
node.hex(pctxnode)[:12])
hg.updaterepo(repo, pctxnode, True)
return 0
@@ -1382,7 +1382,7 @@
raise error.Abort(_("cannot specify both --continue and "
"revision"))
if not grabstate:
- raise error.Abort(_("no interrupted grab state exists"))
+ raise error.Abort(_("no interrupted pick state exists"))
grabstate.load()
orignode = grabstate['orignode']
@@ -1400,7 +1400,7 @@
obsolete.createmarkers(repo, [(origctx, (newctx,))], operation="grab")
if newnode is None:
- ui.warn(_("note: grab of %d:%s created no changes to commit\n") %
+ ui.warn(_("note: picking %d:%s created no changes to commit\n") %
(origctx.rev(), origctx))
return 0
--- a/tests/test-evolve-abort-phasediv.t Fri Aug 31 09:11:04 2018 +0200
+++ b/tests/test-evolve-abort-phasediv.t Fri Aug 31 09:13:11 2018 +0200
@@ -44,7 +44,7 @@
$ hg up .^^^
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg grab -r .~-3
- grabbing 4:c41c793e0ef1 "added d"
+ picking 4:c41c793e0ef1 "added d"
$ echo foobar > c
$ hg add c
$ hg amend
@@ -152,7 +152,7 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
[1] added a
$ hg grab -r ca1b80f
- grabbing 3:ca1b80f7960a "added c"
+ picking 3:ca1b80f7960a "added c"
$ echo foobar > b
$ hg add b
$ hg amend
--- a/tests/test-evolve-issue5832.t Fri Aug 31 09:11:04 2018 +0200
+++ b/tests/test-evolve-issue5832.t Fri Aug 31 09:13:11 2018 +0200
@@ -192,7 +192,7 @@
$ echo l > l
$ hg ci -Aqm "added l"
$ hg grab -r 1b24879c5c3c
- grabbing 1:1b24879c5c3c "added a"
+ picking 1:1b24879c5c3c "added a"
2 new orphan changesets
$ hg up bde1d2b6b5e5
@@ -338,7 +338,7 @@
$ echo l > l
$ hg ci -Aqm "added l"
$ hg grab -r 1b24879c5c3c
- grabbing 1:1b24879c5c3c "added a"
+ picking 1:1b24879c5c3c "added a"
2 new orphan changesets
$ hg up bde1d2b6b5e5
--- a/tests/test-evolve-stop-phasediv.t Fri Aug 31 09:11:04 2018 +0200
+++ b/tests/test-evolve-stop-phasediv.t Fri Aug 31 09:13:11 2018 +0200
@@ -41,7 +41,7 @@
$ hg up .^^^
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg grab -r .~-3
- grabbing 4:c41c793e0ef1 "added d"
+ picking 4:c41c793e0ef1 "added d"
$ echo foobar > c
$ hg add c
$ hg amend
--- a/tests/test-evolve.t Fri Aug 31 09:11:04 2018 +0200
+++ b/tests/test-evolve.t Fri Aug 31 09:13:11 2018 +0200
@@ -597,7 +597,7 @@
o 0:8685c6d34325@default(draft) add 0
$ hg grab -r3
- grabbing 3:0e84df4912da "add 3"
+ picking 3:0e84df4912da "add 3"
$ hg graft -r1
grafting 1:73d38bb17fd7 "add 1"
$ hg prune -r2 --succ .
@@ -629,7 +629,7 @@
created new head
$ hg up -qC 6
$ hg grab -r 7
- grabbing 7:a5bfd90a2f29 "conflict"
+ picking 7:a5bfd90a2f29 "conflict"
merging 1
warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
unresolved merge conflicts (see hg help resolve)
--- a/tests/test-grab.t Fri Aug 31 09:11:04 2018 +0200
+++ b/tests/test-grab.t Fri Aug 31 09:13:11 2018 +0200
@@ -46,13 +46,13 @@
Grabbing an ancestor
$ hg grab -r 7c3bad9141dc
- abort: cannot grab an ancestor revision
+ abort: cannot pick an ancestor revision
[255]
Grabbing the working directory parent
$ hg grab -r .
- abort: cannot grab an ancestor revision
+ abort: cannot pick an ancestor revision
[255]
Specifying multiple revisions to grab
@@ -70,13 +70,13 @@
Continuing without interrupted grab
$ hg grab --continue
- abort: no interrupted grab state exists
+ abort: no interrupted pick state exists
[255]
Aborting without interrupted grab
$ hg grab --abort
- abort: no interrupted grab state exists
+ abort: no interrupted pick state exists
[255]
Specifying both continue and revs
@@ -107,7 +107,7 @@
Grabbing a revision
$ hg grab 7c3bad9141dc
- grabbing 1:7c3bad9141dc "add b"
+ picking 1:7c3bad9141dc "add b"
1 new orphan changesets
$ hg glog
@ 5:7c15c05db6fa add b
@@ -144,8 +144,8 @@
o 0:1f0dee641bb7 add a
$ hg grab -r 4538525df7e2
- grabbing 2:4538525df7e2 "add c"
- note: grab of 2:4538525df7e2 created no changes to commit
+ picking 2:4538525df7e2 "add c"
+ note: picking 2:4538525df7e2 created no changes to commit
$ hg glog
@ 6:c4636a81ebeb add c
@@ -165,7 +165,7 @@
$ echo foo > c
$ hg ci -Aqm "foo to c"
$ hg grab -r c4636a81ebeb
- grabbing 6:c4636a81ebeb "add c"
+ picking 6:c4636a81ebeb "add c"
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts (see hg help resolve)
@@ -203,7 +203,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg grab 4e04628911f6
- grabbing 9:4e04628911f6 "foo to c"
+ picking 9:4e04628911f6 "foo to c"
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
unresolved merge conflicts (see hg help resolve)
@@ -214,7 +214,7 @@
continue: hg grab --continue
$ hg grab --continue
- note: grab of 9:4e04628911f6 created no changes to commit
+ note: picking 9:4e04628911f6 created no changes to commit
Testing the abort functionality of hg grab
@@ -228,14 +228,14 @@
~
$ hg grab -r 7c15c05db6fa
- grabbing 5:7c15c05db6fa "add b"
+ picking 5:7c15c05db6fa "add b"
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts (see hg help resolve)
[1]
$ hg grab --abort
- aborting grab, updating to c437988de89f
+ aborting pick, updating to c437988de89f
$ hg glog
@ 10:c437988de89f foo to b
@@ -258,7 +258,7 @@
$ hg phase -r 7c15c05db6fa -p
$ hg grab -r 7c15c05db6fa
- abort: cannot grab public changesets: 7c15c05db6fa
+ abort: cannot pick public changesets: 7c15c05db6fa
(see 'hg help phases' for details)
[255]
@@ -284,7 +284,7 @@
$ hg phase -r 7c15c05db6fa -s -f
$ hg grab -r 7c15c05db6fa
- grabbing 5:7c15c05db6fa "add b"
+ picking 5:7c15c05db6fa "add b"
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
unresolved merge conflicts (see hg help resolve)
@@ -331,7 +331,7 @@
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg grab -r 508d572e7053
- grabbing 12:508d572e7053 "added l"
+ picking 12:508d572e7053 "added l"
$ hg phase -r .
13: secret
--- a/tests/test-stabilize-result.t Fri Aug 31 09:11:04 2018 +0200
+++ b/tests/test-stabilize-result.t Fri Aug 31 09:13:11 2018 +0200
@@ -129,7 +129,7 @@
Get a successors of 8 on it
$ hg grab 1cf0aacfd363
- grabbing 6:1cf0aacfd363 "newer a"
+ picking 6:1cf0aacfd363 "newer a"
Add real change to the successors
--- a/tests/test-tutorial.t Fri Aug 31 09:11:04 2018 +0200
+++ b/tests/test-tutorial.t Fri Aug 31 09:13:11 2018 +0200
@@ -665,7 +665,7 @@
$ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
- grabbing 9:fac207dec9f5 "SPAM SPAM"
+ picking 9:fac207dec9f5 "SPAM SPAM"
merging shopping
$ hg log -G
@ 57e9caedbcb8 (draft): SPAM SPAM
@@ -807,7 +807,7 @@
for simplicity sake we get the bathroom change in line again
$ hg grab 10b8aeaa8cc8
- grabbing 8:10b8aeaa8cc8 "bathroom stuff"
+ picking 8:10b8aeaa8cc8 "bathroom stuff"
merging shopping
$ hg phase --draft .
$ hg log -G