This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8055

absorb: graduate -i flag from experimental
ClosedPublic

Authored by martinvonz on Jan 31 2020, 12:26 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe1ecfc7c84be: absorb: graduate -i flag from experimental
Summary

The interactive mode seems to work well. I have previously thought
that -i should be what -e does, but the current behavior matches
what other -i flags do (select a subset of the hunks), so I think
that is what we want.

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

martinvonz created this revision.Jan 31 2020, 12:26 PM
pulkit accepted this revision.Jan 31 2020, 6:31 PM
pulkit added a subscriber: pulkit.

The whole absorb extension is experimental, so even if we want to change -i somehow in future, this looks fine.

This revision is now accepted and ready to land.Jan 31 2020, 6:31 PM
martinvonz added a commit: rHGe1ecfc7c84be: absorb: graduate -i flag from experimental.Feb 3 2020, 8:48 AM
Closed by commit rHGe1ecfc7c84be: absorb: graduate -i flag from experimental (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (2 lines)

Diff 19850

hgext/absorb.py

b'print-changes', b'print-changes',
None, None,
_(b'always print which changesets are modified by which changes'), _(b'always print which changesets are modified by which changes'),
), ),
( (
b'i', b'i',
b'interactive', b'interactive',
None, None,
_(b'interactively select which chunks to apply (EXPERIMENTAL)'), _(b'interactively select which chunks to apply'),
), ),
( (
b'e', b'e',
b'edit-lines', b'edit-lines',
None, None,
_( _(
b'edit what lines belong to which changesets before commit ' b'edit what lines belong to which changesets before commit '
b'(EXPERIMENTAL)' b'(EXPERIMENTAL)'