Patchwork [3,of,5,V3] transplant: add test for interactive transplant

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Dec. 1, 2013, 4:01 p.m.
Message ID <d3a08ba9a1e7a3e34443.1385913715@juju>
Download mbox | patch
Permalink /patch/3194/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - Dec. 1, 2013, 4:01 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1385913030 -32400
#      Mon Dec 02 00:50:30 2013 +0900
# Node ID d3a08ba9a1e7a3e344435faa23f1d44a02c4dbd4
# Parent  10729975075587139699459f621a6571d21a2a35
transplant: add test for interactive transplant

Patch

diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -444,6 +444,67 @@ 
   applying a53251cdf717
   4:a53251cdf717 merged at 4831f4dc831a
 
+test interactive transplant
+
+  $ hg --config extensions.strip= -q strip 0
+  $ hg -R ../t log -G --template "{rev}:{node|short}"
+  @  4:a53251cdf717
+  |
+  o  3:722f4667af76
+  |
+  o  2:37a1297eb21b
+  |
+  | o  1:d11e3596cc1a
+  |/
+  o  0:17ab29e464c6
+  
+  $ hg transplant -q --config ui.interactive=true -s ../t <<EOF
+  > p
+  > y
+  > n
+  > n
+  > m
+  > c
+  > EOF
+  0:17ab29e464c6
+  apply changeset? [ynmpcq?]: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/r1	Thu Jan 01 00:00:00 1970 +0000
+  @@ -0,0 +1,1 @@
+  +r1
+  apply changeset? [ynmpcq?]: 1:d11e3596cc1a
+  apply changeset? [ynmpcq?]: 2:37a1297eb21b
+  apply changeset? [ynmpcq?]: 3:722f4667af76
+  apply changeset? [ynmpcq?]: 4:a53251cdf717
+  apply changeset? [ynmpcq?]:  (no-eol)
+  $ hg log -G --template "{node|short}"
+  @    88be5dde5260
+  |\
+  | o  722f4667af76
+  | |
+  | o  37a1297eb21b
+  |/
+  o  17ab29e464c6
+  
+  $ hg transplant -q --config ui.interactive=true -s ../t <<EOF
+  > x
+  > ?
+  > y
+  > q
+  > EOF
+  1:d11e3596cc1a
+  apply changeset? [ynmpcq?]: no such option
+  apply changeset? [ynmpcq?]: y: transplant this changeset
+  n: skip this changeset
+  m: merge at this changeset
+  p: show patch
+  c: commit selected changesets
+  q: cancel transplant
+  ?: show this help
+  apply changeset? [ynmpcq?]: 4:a53251cdf717
+  apply changeset? [ynmpcq?]:  (no-eol)
+  $ hg heads --template "{node|short}\n"
+  88be5dde5260
+
   $ cd ..