D6504: statecheck: changed hint message format
pulkit added a comment. > This changes the old message format used by unfinishedstates > to the format which was used by STATES. The commit message seems outdated. Also I think we can fold this one in previous patch so that there are no un-necessary test changes. @martinvonz what do you think? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 To: taapas1128, durin42, martinvonz, #hg-reviewers Cc: pulkit, mjpieters, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15566.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6504?vs=15557=15566
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6504/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6504
AFFECTED FILES
hgext/transplant.py
mercurial/state.py
tests/test-graft.t
tests/test-histedit-fold.t
tests/test-rebase-conflicts.t
tests/test-shelve.t
tests/test-strip.t
tests/test-transplant.t
CHANGE DETAILS
diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -40,8 +40,7 @@
(branch merge, don't forget to commit)
$ hg transplant 1
abort: merge in progress
- (To continue:hg commit
- To abort: hg merge --abort)
+ (use 'hg commit' or 'hg merge --abort')
[255]
$ hg up -qC tip
$ echo b0 > b1
@@ -489,7 +488,8 @@
? foo.rej
# The repository is in an unfinished *transplant* state.
- # use 'hg transplant --continue' or 'hg update' to abort
+ # To continue:hg transplant --continue
+ # To abort: hg update
$ echo fixed > baz
$ hg transplant --continue
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -275,8 +275,7 @@
##strip not allowed with merge in progress
$ hg strip 4
abort: merge in progress
- (To continue:hg commit
- To abort: hg merge --abort)
+ (use 'hg commit' or 'hg merge --abort')
[255]
##strip allowed --force with merge in progress
$ hg strip 4 --force
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -375,7 +375,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # use 'hg unshelve --continue' or 'hg unshelve --abort'
+ # To continue:hg unshelve --continue
+ # To abort: hg unshelve --abort
ensure that we have a merge with unresolved conflicts
@@ -1153,8 +1154,7 @@
-- unshelve should abort otherwise, it'll eat my second parent.
$ hg unshelve
abort: merge in progress
- (To continue:hg commit
- To abort: hg merge --abort)
+ (use 'hg commit' or 'hg merge --abort')
[255]
$ cd ..
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -80,7 +80,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # use 'hg rebase --continue' or 'hg rebase --abort'
+ # To continue:hg rebase --continue
+ # To abort: hg rebase --abort
Try to continue without solving the conflict:
diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -306,7 +306,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # use 'hg histedit --continue' or 'hg histedit --abort'
+ # To continue:hg histedit --continue
+ # To abort: hg histedit --abort
$ hg resolve -l
U file
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -279,7 +279,9 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # use 'hg graft --continue' or 'hg graft --stop' to stop
+ # To continue:hg graft --continue
+ # To abort: hg graft --abort
+ # To stop:hg graft --stop
Commit while interrupted should fail:
diff --git a/mercurial/state.py b/mercurial/state.py
--- a/mercurial/state.py
+++ b/mercurial/state.py
@@ -98,7 +98,7 @@
"""
def __init__(self, opname, fname, clearable=False, allowcommit=False,
- cmdmsg="", cmdhint=""):
+ cmdmsg="", cmdhint="", statushint="", stopflag=False):
"""opname is the name the command or operation
fname is the file name in which data should be stored in .hg directory.
It is None for merge command.
@@ -110,22 +110,40 @@
cmdmsg is used to pass a different status message in case standard
message of the format "abort: cmdname in progress" is not desired.
cmdhint is used to pass a different hint message in case standard
-message of the format use 'hg cmdname --continue' or
-'hg cmdname --abort'" is not desired.
+message of the format "To continue: hg cmdname --continue
+To abort: hg cmdname --abort" is not desired.
+status hint is used to pass a different status message in case standard
+message of the format ('To continue:hg cmdname --continue'
+'To abort: hg cmdname --abort') is not desired
+stopflag is a boolean that determines whether or not a command supports
+--stop flag
"""
self._opname = opname
self._fname = fname
self._clearable = clearable
self._allowcommit = allowcommit
self._cmdhint = cmdhint
+self._statushint = statushint
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15557.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6504?vs=15554=15557
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6504/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6504
AFFECTED FILES
hgext/transplant.py
mercurial/state.py
tests/test-graft.t
tests/test-histedit-fold.t
tests/test-rebase-conflicts.t
tests/test-shelve.t
tests/test-strip.t
tests/test-transplant.t
CHANGE DETAILS
diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -40,8 +40,7 @@
(branch merge, don't forget to commit)
$ hg transplant 1
abort: merge in progress
- (To continue:hg commit
- To abort: hg merge --abort)
+ (use 'hg commit' or 'hg merge --abort')
[255]
$ hg up -qC tip
$ echo b0 > b1
@@ -489,7 +488,8 @@
? foo.rej
# The repository is in an unfinished *transplant* state.
- # use 'hg transplant --continue' or 'hg update' to abort
+ # To continue:hg transplant --continue
+ # To abort: hg update
$ echo fixed > baz
$ hg transplant --continue
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -275,8 +275,7 @@
##strip not allowed with merge in progress
$ hg strip 4
abort: merge in progress
- (To continue:hg commit
- To abort: hg merge --abort)
+ (use 'hg commit' or 'hg merge --abort')
[255]
##strip allowed --force with merge in progress
$ hg strip 4 --force
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -375,7 +375,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # use 'hg unshelve --continue' or 'hg unshelve --abort'
+ # To continue:hg unshelve --continue
+ # To abort: hg unshelve --abort
ensure that we have a merge with unresolved conflicts
@@ -1153,8 +1154,7 @@
-- unshelve should abort otherwise, it'll eat my second parent.
$ hg unshelve
abort: merge in progress
- (To continue:hg commit
- To abort: hg merge --abort)
+ (use 'hg commit' or 'hg merge --abort')
[255]
$ cd ..
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -80,7 +80,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # use 'hg rebase --continue' or 'hg rebase --abort'
+ # To continue:hg rebase --continue
+ # To abort: hg rebase --abort
Try to continue without solving the conflict:
diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -306,7 +306,8 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # use 'hg histedit --continue' or 'hg histedit --abort'
+ # To continue:hg histedit --continue
+ # To abort: hg histedit --abort
$ hg resolve -l
U file
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -279,7 +279,9 @@
#
# To mark files as resolved: hg resolve --mark FILE
- # use 'hg graft --continue' or 'hg graft --stop' to stop
+ # To continue:hg graft --continue
+ # To abort: hg graft --abort
+ # To stop:hg graft --stop
Commit while interrupted should fail:
diff --git a/mercurial/state.py b/mercurial/state.py
--- a/mercurial/state.py
+++ b/mercurial/state.py
@@ -98,7 +98,7 @@
"""
def __init__(self, opname, fname, clearable=False, allowcommit=False,
- cmdmsg="", cmdhint=""):
+ cmdmsg="", cmdhint="", statushint="", stopflag=False):
"""opname is the name the command or operation
fname is the file name in which data should be stored in .hg directory.
It is None for merge command.
@@ -110,22 +110,40 @@
cmdmsg is used to pass a different status message in case standard
message of the format "abort: cmdname in progress" is not desired.
cmdhint is used to pass a different hint message in case standard
-message of the format use 'hg cmdname --continue' or
-'hg cmdname --abort'" is not desired.
+message of the format "To continue: hg cmdname --continue
+To abort: hg cmdname --abort" is not desired.
+status hint is used to pass a different status message in case standard
+message of the format ('To continue:hg cmdname --continue'
+'To abort: hg cmdname --abort') is not desired
+stopflag is a boolean that determines whether or not a command supports
+--stop flag
"""
self._opname = opname
self._fname = fname
self._clearable = clearable
self._allowcommit = allowcommit
self._cmdhint = cmdhint
+self._statushint = statushint
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15554. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15542=15554 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -481,7 +481,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ hg status -v A bar @@ -489,7 +490,8 @@ ? foo.rej # The repository is in an unfinished *transplant* state. - # use 'hg transplant --continue' or 'hg update' to abort + # To continue:hg transplant --continue + # To abort: hg update $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15542. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15540=15542 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -481,7 +481,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ hg status -v A bar @@ -489,7 +490,8 @@ ? foo.rej # The repository is in an unfinished *transplant* state. - # use 'hg transplant --continue' or 'hg update' to abort + # To continue:hg transplant --continue + # To abort: hg update $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15540. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15538=15540 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -481,7 +481,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15538. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15530=15538 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -481,7 +481,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15530. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15507=15530 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -481,7 +481,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15507. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15504=15507 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -481,7 +481,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15504. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15502=15504 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -481,7 +481,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15502. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15500=15502 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -481,7 +481,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15500. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15498=15500 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -479,7 +479,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15498. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15481=15498 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -479,7 +479,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15481. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15441=15481 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6504/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -479,7 +479,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15441. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15430=15441 REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -479,7 +479,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t --- a/tests/test-histedit-no-change.t +++
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15430. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15427=15430 REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/histedit.py hgext/rebase.py hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -479,7 +479,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t ---
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15427. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15415=15427 REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/histedit.py hgext/rebase.py hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -479,7 +479,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t ---
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15415. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15409=15415 REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/histedit.py hgext/rebase.py hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -479,7 +479,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t ---
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15409. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15406=15409 REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/histedit.py hgext/rebase.py hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -479,7 +479,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t ---
D6504: statecheck: changed hint message format
taapas1128 updated this revision to Diff 15406. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6504?vs=15396=15406 REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/histedit.py hgext/rebase.py hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -479,7 +479,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') - [255] + (To continue:hg histedit --continue + To abort: hg histedit --abort) + [255] diff --git a/tests/test-histedit-no-change.t b/tests/test-histedit-no-change.t ---
D6504: statecheck: changed hint message format
taapas1128 created this revision. Herald added a reviewer: durin42. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This changes the old message format used by `unfinishedstates` to the format which was used by `STATES`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6504 AFFECTED FILES hgext/histedit.py hgext/rebase.py hgext/shelve.py hgext/transplant.py mercurial/state.py tests/test-absorb-unfinished.t tests/test-fix.t tests/test-graft.t tests/test-histedit-arguments.t tests/test-histedit-edit.t tests/test-histedit-fold.t tests/test-histedit-no-change.t tests/test-qrecord.t tests/test-rebase-abort.t tests/test-rebase-conflicts.t tests/test-rebase-obsolete.t tests/test-rebase-pull.t tests/test-shelve.t tests/test-transplant.t CHANGE DETAILS diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -479,7 +479,8 @@ [255] $ hg transplant 1:3 abort: transplant in progress - (use 'hg transplant --continue' or 'hg update' to abort) + (To continue:hg transplant --continue + To abort: hg update) [255] $ echo fixed > baz $ hg transplant --continue diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -375,7 +375,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg unshelve --continue' or 'hg unshelve --abort' + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort ensure that we have a merge with unresolved conflicts @@ -426,7 +427,8 @@ $ hg shelve abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] abort the unshelve and be happy @@ -484,7 +486,8 @@ $ hg commit -m 'commit while unshelve in progress' abort: unshelve already in progress - (use 'hg unshelve --continue' or 'hg unshelve --abort') + (To continue:hg unshelve --continue + To abort: hg unshelve --abort) [255] $ hg graft --continue diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t --- a/tests/test-rebase-pull.t +++ b/tests/test-rebase-pull.t @@ -93,7 +93,8 @@ [1] $ hg pull --rebase abort: histedit in progress - (use 'hg histedit --continue' or 'hg histedit --abort') + (To continue:hg histedit --continue + To abort: hg histedit --abort) [255] $ hg histedit --abort --quiet diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t --- a/tests/test-rebase-obsolete.t +++ b/tests/test-rebase-obsolete.t @@ -2054,7 +2054,8 @@ $ hg rebase -s 3 -d 5 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --stop --continue abort: cannot use --stop with --continue diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -80,7 +80,8 @@ # # To mark files as resolved: hg resolve --mark FILE - # use 'hg rebase --continue' or 'hg rebase --abort' + # To continue:hg rebase --continue + # To abort: hg rebase --abort Try to continue without solving the conflict: 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 @@ -319,7 +319,8 @@ $ echo new > a $ hg up 1 # user gets an error saying to run hg rebase --abort abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ cat a @@ -389,20 +390,24 @@ $ hg rebase -s 3 -d tip abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg up -C . abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg graft 3 abort: rebase in progress - (use 'hg rebase --continue' or 'hg rebase --abort') + (To continue:hg rebase --continue + To abort: hg rebase --abort) [255] $ hg rebase --abort diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -459,5 +459,6 @@ > n > EOF abort: histedit in progress - (use 'hg histedit --continue' or
