Patchwork [1,of,2,V2,stable?] tests: demonstrate inconsistent messaging around interrupted rebases

login
register
mail settings
Submitter Matt Harbison
Date June 3, 2018, 10:44 p.m.
Message ID <e134101a72dfe7fb4d6a.1528065853@Envy>
Download mbox | patch
Permalink /patch/31955/
State Accepted
Headers show

Comments

Matt Harbison - June 3, 2018, 10:44 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1527960345 14400
#      Sat Jun 02 13:25:45 2018 -0400
# Node ID e134101a72dfe7fb4d6a90a35bfa2103f76d07c8
# Parent  16f93a3b8b05aae9391f26a8b908bfa716456757
tests: demonstrate inconsistent messaging around interrupted rebases
Yuya Nishihara - June 4, 2018, 11:42 a.m.
On Sun, 03 Jun 2018 18:44:13 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1527960345 14400
> #      Sat Jun 02 13:25:45 2018 -0400
> # Node ID e134101a72dfe7fb4d6a90a35bfa2103f76d07c8
> # Parent  16f93a3b8b05aae9391f26a8b908bfa716456757
> tests: demonstrate inconsistent messaging around interrupted rebases

Queued, thanks.

> +New operations are blocked with the correct state message
> +
> +  $ find .hg -name '*state' -prune
> +  .hg/dirstate
> +  .hg/merge/state
> +  .hg/rebasestate
> +  .hg/undo.backup.dirstate
> +  .hg/undo.dirstate
> +  .hg/updatestate

The order is unstable. Added '| sort' in flight.

Patch

diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t
--- a/tests/test-rebase-abort.t
+++ b/tests/test-rebase-abort.t
@@ -376,6 +376,37 @@  test aborting an interrupted series (iss
   rebasing 4:e80b69427d80 "c"
   abort: ^C
   [255]
+
+New operations are blocked with the correct state message
+
+  $ find .hg -name '*state' -prune
+  .hg/dirstate
+  .hg/merge/state
+  .hg/rebasestate
+  .hg/undo.backup.dirstate
+  .hg/undo.dirstate
+  .hg/updatestate
+
+XXX: This should complain about needing to abort/continue rebase
+  $ hg rebase -s 3 -d tip
+  abort: last update was interrupted
+  (use 'hg update' to get a consistent checkout)
+  [255]
+  $ hg up .
+  abort: rebase in progress
+  (use 'hg rebase --continue' or 'hg rebase --abort')
+  [255]
+  $ hg up -C .
+  abort: rebase in progress
+  (use 'hg rebase --continue' or 'hg rebase --abort')
+  [255]
+
+XXX: This should complain about needing to abort/continue rebase
+  $ hg graft 3
+  abort: last update was interrupted
+  (use 'hg update' to get a consistent checkout)
+  [255]
+
   $ hg rebase --abort
   saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
   rebase aborted