Patchwork [2,of,8] histedit-helpers: fixbundle should not complain about no input

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 14, 2015, 11:37 p.m.
Message ID <d1c056038e9c4e0af4aa.1450136243@waste.org>
Download mbox | patch
Permalink /patch/12039/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 14, 2015, 11:37 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450131690 0
#      Mon Dec 14 22:21:30 2015 +0000
# Node ID d1c056038e9c4e0af4aa8ec9b86d551cbecfacab
# Parent  bdb82a9f9ee8869211019fdaac9d6eb56bf28abe
histedit-helpers: fixbundle should not complain about no input
Augie Fackler - Dec. 15, 2015, 6:07 p.m.
On Mon, Dec 14, 2015 at 05:37:23PM -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450131690 0
> #      Mon Dec 14 22:21:30 2015 +0000
> # Node ID d1c056038e9c4e0af4aa8ec9b86d551cbecfacab
> # Parent  bdb82a9f9ee8869211019fdaac9d6eb56bf28abe
> histedit-helpers: fixbundle should not complain about no input

These first two are queued, will look at the rest in a later pass over patches. Thanks!

>
> diff --git a/tests/histedit-helpers.sh b/tests/histedit-helpers.sh
> --- a/tests/histedit-helpers.sh
> +++ b/tests/histedit-helpers.sh
> @@ -2,5 +2,6 @@
>      grep -v 'saving bundle' | grep -v 'saved backup' | \
>          grep -v added | grep -v adding | \
>          grep -v "unable to find 'e' for patching" | \
> -        grep -v "e: No such file or directory"
> +        grep -v "e: No such file or directory" | \
> +    cat
>  }
> diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t
> --- a/tests/test-histedit-no-change.t
> +++ b/tests/test-histedit-no-change.t
> @@ -187,7 +187,6 @@
>    hist:   2 remaining (histedit --continue)
>
>    $ hg histedit --abort 2>&1 | fixbundle
> -  [1]
>
>  modified files should survive the abort when we've moved away already
>    $ hg st
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/histedit-helpers.sh b/tests/histedit-helpers.sh
--- a/tests/histedit-helpers.sh
+++ b/tests/histedit-helpers.sh
@@ -2,5 +2,6 @@ 
     grep -v 'saving bundle' | grep -v 'saved backup' | \
         grep -v added | grep -v adding | \
         grep -v "unable to find 'e' for patching" | \
-        grep -v "e: No such file or directory"
+        grep -v "e: No such file or directory" | \
+    cat
 }
diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t
--- a/tests/test-histedit-no-change.t
+++ b/tests/test-histedit-no-change.t
@@ -187,7 +187,6 @@ 
   hist:   2 remaining (histedit --continue)
 
   $ hg histedit --abort 2>&1 | fixbundle
-  [1]
 
 modified files should survive the abort when we've moved away already
   $ hg st