Patchwork D3735: cmdutil: say that `graft --stop` stops the graft instead of aborting

login
register
mail settings
Submitter phabricator
Date June 14, 2018, 8:40 p.m.
Message ID <differential-rev-PHID-DREV-b7aphvxblojavwxmwefr-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/32143/
State Superseded
Headers show

Comments

phabricator - June 14, 2018, 8:40 p.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I am going to add a --abort flag to graft soon, so we make sure we differentiate
  between the what --stop flag does and what --abort does and don't use the words
  interchangeably.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3735

AFFECTED FILES
  mercurial/cmdutil.py
  tests/test-graft.t

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -244,7 +244,7 @@ 
 
   $ hg ci -m 'commit interrupted graft'
   abort: graft in progress
-  (use 'hg graft --continue' or 'hg graft --stop' to abort)
+  (use 'hg graft --continue' or 'hg graft --stop' to stop)
   [255]
 
 Abort the graft and try committing:
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -3173,7 +3173,7 @@ 
 # (state file, clearable, allowcommit, error, hint)
 unfinishedstates = [
     ('graftstate', True, False, _('graft in progress'),
-     _("use 'hg graft --continue' or 'hg graft --stop' to abort")),
+     _("use 'hg graft --continue' or 'hg graft --stop' to stop")),
     ('updatestate', True, False, _('last update was interrupted'),
      _("use 'hg update' to get a consistent checkout"))
     ]