Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: say that `graft --stop` stops the graft instead of aborting
authorPulkit Goyal <7895pulkit@gmail.com>
Fri, 15 Jun 2018 02:07:39 +0530
changeset 38311 47f5454a30ed
parent 38310 2049a21c8396
child 38312 79dd61a4554f
cmdutil: say that `graft --stop` stops the graft instead of aborting 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. Differential Revision: https://phab.mercurial-scm.org/D3735
mercurial/cmdutil.py file | annotate | diff | comparison | revisions
tests/test-graft.t file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Thu Jun 14 16:51:39 2018 -0400
+++ b/mercurial/cmdutil.py	Fri Jun 15 02:07:39 2018 +0530
@@ -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"))
     ]
--- a/tests/test-graft.t	Thu Jun 14 16:51:39 2018 -0400
+++ b/tests/test-graft.t	Fri Jun 15 02:07:39 2018 +0530
@@ -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:
Mercurial