[PATCH 3 of 5 V2] test-mq-subrepo: replace repeated --config ui.interactive=1 by repo hgrc

Yuya Nishihara yuya at tcha.org
Fri Oct 10 10:09:19 CDT 2014


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1412949830 -32400
#      Fri Oct 10 23:03:50 2014 +0900
# Node ID 80977d0b038a9a42a9b6819e77b80d343c1f711e
# Parent  6181d856ed3603a764cbcb24f934dee9abb9f7a5
test-mq-subrepo: replace repeated --config ui.interactive=1 by repo hgrc

diff --git a/tests/test-mq-subrepo.t b/tests/test-mq-subrepo.t
--- a/tests/test-mq-subrepo.t
+++ b/tests/test-mq-subrepo.t
@@ -282,7 +282,11 @@ qpush
 handle subrepos safely on qrecord
 
   $ mkrepo repo-2499-qrecord
-  $ testadd qrecord --config ui.interactive=1 -m0 0.diff <<EOF
+  $ cat <<EOF >> .hg/hgrc
+  > [ui]
+  > interactive = true
+  > EOF
+  $ testadd qrecord -m0 0.diff <<EOF
   > y
   > y
   > EOF
@@ -290,7 +294,7 @@ handle subrepos safely on qrecord
   % abort when adding .hgsub w/dirty subrepo
   A .hgsub
   A sub/a
-  % qrecord --config ui.interactive=1 -m0 0.diff
+  % qrecord -m0 0.diff
   diff --git a/.hgsub b/.hgsub
   new file mode 100644
   examine changes to '.hgsub'? [Ynesfdaq?] y
@@ -299,7 +303,7 @@ handle subrepos safely on qrecord
   [255]
   % update substate when adding .hgsub w/clean updated subrepo
   A .hgsub
-  % qrecord --config ui.interactive=1 -m0 0.diff
+  % qrecord -m0 0.diff
   diff --git a/.hgsub b/.hgsub
   new file mode 100644
   examine changes to '.hgsub'? [Ynesfdaq?] y
@@ -308,7 +312,7 @@ handle subrepos safely on qrecord
    source   sub
    revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
 
-  $ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF
+  $ testmod qrecord -m1 1.diff <<EOF
   > y
   > y
   > EOF
@@ -316,7 +320,7 @@ handle subrepos safely on qrecord
   % abort when modifying .hgsub w/dirty subrepo
   M .hgsub
   A sub2/a
-  % qrecord --config ui.interactive=1 -m1 1.diff
+  % qrecord -m1 1.diff
   diff --git a/.hgsub b/.hgsub
   1 hunks, 1 lines changed
   examine changes to '.hgsub'? [Ynesfdaq?] y
@@ -330,7 +334,7 @@ handle subrepos safely on qrecord
   [255]
   % update substate when modifying .hgsub w/clean updated subrepo
   M .hgsub
-  % qrecord --config ui.interactive=1 -m1 1.diff
+  % qrecord -m1 1.diff
   diff --git a/.hgsub b/.hgsub
   1 hunks, 1 lines changed
   examine changes to '.hgsub'? [Ynesfdaq?] y
@@ -349,7 +353,7 @@ handle subrepos safely on qrecord
 
   $ hg qpop -qa
   patch queue now empty
-  $ testrm1 qrecord --config ui.interactive=1 -m2 2.diff <<EOF
+  $ testrm1 qrecord -m2 2.diff <<EOF
   > y
   > y
   > EOF
@@ -357,7 +361,7 @@ handle subrepos safely on qrecord
   % update substate when removing .hgsub w/dirty subrepo
   M sub3/a
   R .hgsub
-  % qrecord --config ui.interactive=1 -m2 2.diff
+  % qrecord -m2 2.diff
   diff --git a/.hgsub b/.hgsub
   deleted file mode 100644
   examine changes to '.hgsub'? [Ynesfdaq?] y
@@ -366,14 +370,14 @@ handle subrepos safely on qrecord
 
   $ hg qpop -qa
   patch queue now empty
-  $ testrm2 qrecord --config ui.interactive=1 -m3 3.diff <<EOF
+  $ testrm2 qrecord -m3 3.diff <<EOF
   > y
   > y
   > EOF
   adding a
   % update substate when removing .hgsub w/clean updated subrepo
   R .hgsub
-  % qrecord --config ui.interactive=1 -m3 3.diff
+  % qrecord -m3 3.diff
   diff --git a/.hgsub b/.hgsub
   deleted file mode 100644
   examine changes to '.hgsub'? [Ynesfdaq?] y


More information about the Mercurial-devel mailing list