diff tests/test-absorb-rename.t @ 40190:31dfa7dac4c9

absorb: prompt user to accept absorb changes by default

Change the default absorb behaviour to print the changes out and then prompt
the user if they want to absorb the changes or not.

Providing the `-p` option still prints the result and exits.  A new `-a` option
is provided which applies the changes without printing them, giving the
equivalent of the old behaviour.

Differential Revision: https://phab.mercurial-scm.org/D4999

--- a/tests/test-absorb-rename.t	Fri Oct 12 15:46:52 2018 +0000
+++ b/tests/test-absorb-rename.t	Fri Oct 12 17:48:40 2018 +0000
@@ -34,7 +34,7 @@
   2 0b888b00216c a: 3
 
   $ sedi 's/$/a/' a
-  $ hg absorb -pq
+  $ hg absorb -apq
   showing changes for a
           @@ -0,3 +0,3 @@
   eff892d -1
@@ -62,7 +62,7 @@
 
   $ sedi 's/a/A/' a
 
-  $ hg absorb -pq
+  $ hg absorb -apq
   showing changes for a
           @@ -0,3 +0,3 @@
           -1a
@@ -105,7 +105,7 @@
   $ sedi 's/$/a/' a
   $ sedi 's/$/b/' b
 
-  $ hg absorb -pq
+  $ hg absorb -apq
   showing changes for a
           @@ -0,1 +0,1 @@
   eff892d -1
@@ -149,7 +149,7 @@
   $ sedi 's/$/a/' a
   $ sedi 's/$/a/' b
 
-  $ hg absorb -pq
+  $ hg absorb -apq
   showing changes for a
           @@ -0,2 +0,2 @@
           -1
@@ -196,7 +196,7 @@
   $ sedi 's/$/a/' a
   $ sedi 's/$/c/' c
 
-  $ hg absorb -pq
+  $ hg absorb -apq
   showing changes for a
           @@ -0,2 +0,2 @@
   55105f9 -1
@@ -244,7 +244,7 @@
   
 run absorb again would apply the change to c
 
-  $ hg absorb -pq
+  $ hg absorb -apq
   showing changes for c
           @@ -0,1 +0,1 @@
   7060601 -1
@@ -309,7 +309,7 @@
   $ sedi 's/$/e/' e
   $ sedi 's/$/d/' d
 
-  $ hg absorb -pq
+  $ hg absorb -apq
   showing changes for d
           @@ -0,2 +0,2 @@
   55105f9 -1