This is an archive of the discontinued Mercurial Phabricator instance.

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

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

Details

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.
This revision was automatically updated to reflect the committed changes.