This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3667

graft: fix the help text to say `graft reapplies previous options`
ClosedPublic

Authored by pulkit on May 28 2018, 11:26 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa8e7ea176437: graft: fix the help text to say `graft reapplies previous options`
rHGad4c5c0af6b5: graft: fix the help text to say `graft reapplies previous options`
Summary

The options which graft accepts are:

  • rev
  • continue
  • edit
  • log
  • force
  • currentdate
  • currentuser
  • date
  • user
  • tool
  • dryrun

Out of these following should be reapplied in case conflicts occur and user does
hg graft --continue:

  • rev
  • log
  • force
  • currentuser
  • currentdate
  • date
  • user

rev and force were already reapplied by --continue. Some recent refactors made
graft to store the values of other options in graftstate and reapplies them at
hg graft --continue.

Now all the options which should be reapplied are taken care of, we can easily
remove the help note which says that `--continue does not reapply earlier
options` and help text saying that we reapplies earlier options.

.. feature:: hg graft --continue now reapplies all the earlier options

`hg graft` now preserves the value of all the flags and reapplies them in
case of `hg graft --continue`.

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.May 28 2018, 11:26 AM
pulkit edited the summary of this revision. (Show Details)Jun 11 2018, 5:11 PM
pulkit retitled this revision from graft: drop help note saying "--continue does not reapply earlier options" to graft: fix the help text to say `graft reapplies previous options`.
pulkit updated this revision to Diff 9014.
Closed by commit rHGad4c5c0af6b5: graft: fix the help text to say `graft reapplies previous options` (authored by pulkit). · Explain WhyJun 12 2018, 8:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)

Diff 9021

mercurial/commands.py

are already ancestors of, or have been grafted to, the destination. are already ancestors of, or have been grafted to, the destination.
This is useful when the revisions have since been backed out. This is useful when the revisions have since been backed out.
If a graft merge results in conflicts, the graft process is If a graft merge results in conflicts, the graft process is
interrupted so that the current merge can be manually resolved. interrupted so that the current merge can be manually resolved.
Once all conflicts are addressed, the graft process can be Once all conflicts are addressed, the graft process can be
continued with the -c/--continue option. continued with the -c/--continue option.
.. note:: The -c/--continue option does reapply all the earlier options.
The -c/--continue option does not reapply earlier options, except
for --force, --user and --date.
.. container:: verbose .. container:: verbose
Examples: Examples:
- copy a single change to the stable branch and edit its description:: - copy a single change to the stable branch and edit its description::
hg update stable hg update stable