( )⚙ D5022 absorb: update help text

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5022

absorb: update help text
ClosedPublic

Authored by mbthomas on Oct 12 2018, 4:04 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8f192f2c4a1e: absorb: update help text
Summary

Update the help text to reflect the recent changes to absorb in D4999.

The -p option actually only affects the -a option: without -a, the
changes are printed; with -a the changes are only printed if -p is
specified. Reword the help text for -p to reflect this.

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

mbthomas created this revision.Oct 12 2018, 4:04 PM
pulkit accepted this revision.Oct 12 2018, 5:03 PM
Closed by commit rHG8f192f2c4a1e: absorb: update help text (authored by mbthomas). · Explain WhyOct 12 2018, 5:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (8 lines)

Diff 11956

hgext/absorb.py

elif not ui.quiet: elif not ui.quiet:
ui.write(_('nothing applied\n')) ui.write(_('nothing applied\n'))
return state return state
@command('^absorb', @command('^absorb',
[('a', 'apply-changes', None, [('a', 'apply-changes', None,
_('apply changes without prompting for confirmation')), _('apply changes without prompting for confirmation')),
('p', 'print-changes', None, ('p', 'print-changes', None,
_('just print which changesets are modified by which changes')), _('always print which changesets are modified by which changes')),
('i', 'interactive', None, ('i', 'interactive', None,
_('interactively select which chunks to apply (EXPERIMENTAL)')), _('interactively select which chunks to apply (EXPERIMENTAL)')),
('e', 'edit-lines', None, ('e', 'edit-lines', None,
_('edit what lines belong to which changesets before commit ' _('edit what lines belong to which changesets before commit '
'(EXPERIMENTAL)')), '(EXPERIMENTAL)')),
] + commands.dryrunopts + commands.templateopts + commands.walkopts, ] + commands.dryrunopts + commands.templateopts + commands.walkopts,
_('hg absorb [OPTION] [FILE]...')) _('hg absorb [OPTION] [FILE]...'))
def absorbcmd(ui, repo, *pats, **opts): def absorbcmd(ui, repo, *pats, **opts):
"""incorporate corrections into the stack of draft changesets """incorporate corrections into the stack of draft changesets
absorb analyzes each change in your working directory and attempts to absorb analyzes each change in your working directory and attempts to
amend the changed lines into the changesets in your stack that first amend the changed lines into the changesets in your stack that first
introduced those lines. introduced those lines.
If absorb cannot find an unambiguous changeset to amend for a change, If absorb cannot find an unambiguous changeset to amend for a change,
that change will be left in the working directory, untouched. They can be that change will be left in the working directory, untouched. They can be
observed by :hg:`status` or :hg:`diff` afterwards. In other words, observed by :hg:`status` or :hg:`diff` afterwards. In other words,
absorb does not write to the working directory. absorb does not write to the working directory.
Changesets outside the revset `::. and not public() and not merge()` will Changesets outside the revset `::. and not public() and not merge()` will
not be changed. not be changed.
Changesets that become empty after applying the changes will be deleted. Changesets that become empty after applying the changes will be deleted.
If in doubt, run :hg:`absorb -pn` to preview what changesets will By default, absorb will show what it plans to do and prompt for
be amended by what changed lines, without actually changing anything. confirmation. If you are confident that the changes will be absorbed
to the correct place, run :hg:`absorb -a` to apply the changes
immediately.
Returns 0 on success, 1 if all chunks were ignored and nothing amended. Returns 0 on success, 1 if all chunks were ignored and nothing amended.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
state = absorb(ui, repo, pats=pats, opts=opts) state = absorb(ui, repo, pats=pats, opts=opts)
if sum(s[0] for s in state.chunkstats.values()) == 0: if sum(s[0] for s in state.chunkstats.values()) == 0:
return 1 return 1