This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3735

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

Authored by pulkit on Jun 14 2018, 4:40 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG47f5454a30ed: cmdutil: say that `graft --stop` stops the graft instead of aborting
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Jun 14 2018, 4:40 PM
Closed by commit rHG47f5454a30ed: cmdutil: say that `graft --stop` stops the graft instead of aborting (authored by pulkit). · Explain WhyJun 15 2018, 8:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)
Mtests/test-graft.t (2 lines)

Diff 9078

mercurial/cmdutil.py

summaryremotehooks = util.hooks() summaryremotehooks = util.hooks()
# A list of state files kept by multistep operations like graft. # A list of state files kept by multistep operations like graft.
# Since graft cannot be aborted, it is considered 'clearable' by update. # Since graft cannot be aborted, it is considered 'clearable' by update.
# note: bisect is intentionally excluded # note: bisect is intentionally excluded
# (state file, clearable, allowcommit, error, hint) # (state file, clearable, allowcommit, error, hint)
unfinishedstates = [ unfinishedstates = [
('graftstate', True, False, _('graft in progress'), ('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'), ('updatestate', True, False, _('last update was interrupted'),
_("use 'hg update' to get a consistent checkout")) _("use 'hg update' to get a consistent checkout"))
] ]
def checkunfinished(repo, commit=False): def checkunfinished(repo, commit=False):
'''Look for an unfinished multistep operation, like graft, and abort '''Look for an unfinished multistep operation, like graft, and abort
if found. It's probably good to check this right before if found. It's probably good to check this right before
bailifchanged(). bailifchanged().

tests/test-graft.t

# To continue: hg graft --continue # To continue: hg graft --continue
# To abort: hg update --clean . (warning: this will discard uncommitted changes) # To abort: hg update --clean . (warning: this will discard uncommitted changes)
Commit while interrupted should fail: Commit while interrupted should fail:
$ hg ci -m 'commit interrupted graft' $ hg ci -m 'commit interrupted graft'
abort: graft in progress 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] [255]
Abort the graft and try committing: Abort the graft and try committing:
$ hg up -C . $ hg up -C .
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c >> e $ echo c >> e
$ hg ci -mtest $ hg ci -mtest