Mercurial > hg
comparison hgext/absorb.py @ 40210:8f192f2c4a1e
absorb: update help text
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.
Differential Revision: https://phab.mercurial-scm.org/D5022
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Fri, 12 Oct 2018 20:03:29 +0000 |
parents | 31dfa7dac4c9 |
children | c303d65d2e34 |
comparison
equal
deleted
inserted
replaced
40209:6b1a8c396b05 | 40210:8f192f2c4a1e |
---|---|
984 | 984 |
985 @command('^absorb', | 985 @command('^absorb', |
986 [('a', 'apply-changes', None, | 986 [('a', 'apply-changes', None, |
987 _('apply changes without prompting for confirmation')), | 987 _('apply changes without prompting for confirmation')), |
988 ('p', 'print-changes', None, | 988 ('p', 'print-changes', None, |
989 _('just print which changesets are modified by which changes')), | 989 _('always print which changesets are modified by which changes')), |
990 ('i', 'interactive', None, | 990 ('i', 'interactive', None, |
991 _('interactively select which chunks to apply (EXPERIMENTAL)')), | 991 _('interactively select which chunks to apply (EXPERIMENTAL)')), |
992 ('e', 'edit-lines', None, | 992 ('e', 'edit-lines', None, |
993 _('edit what lines belong to which changesets before commit ' | 993 _('edit what lines belong to which changesets before commit ' |
994 '(EXPERIMENTAL)')), | 994 '(EXPERIMENTAL)')), |
1009 Changesets outside the revset `::. and not public() and not merge()` will | 1009 Changesets outside the revset `::. and not public() and not merge()` will |
1010 not be changed. | 1010 not be changed. |
1011 | 1011 |
1012 Changesets that become empty after applying the changes will be deleted. | 1012 Changesets that become empty after applying the changes will be deleted. |
1013 | 1013 |
1014 If in doubt, run :hg:`absorb -pn` to preview what changesets will | 1014 By default, absorb will show what it plans to do and prompt for |
1015 be amended by what changed lines, without actually changing anything. | 1015 confirmation. If you are confident that the changes will be absorbed |
1016 to the correct place, run :hg:`absorb -a` to apply the changes | |
1017 immediately. | |
1016 | 1018 |
1017 Returns 0 on success, 1 if all chunks were ignored and nothing amended. | 1019 Returns 0 on success, 1 if all chunks were ignored and nothing amended. |
1018 """ | 1020 """ |
1019 opts = pycompat.byteskwargs(opts) | 1021 opts = pycompat.byteskwargs(opts) |
1020 state = absorb(ui, repo, pats=pats, opts=opts) | 1022 state = absorb(ui, repo, pats=pats, opts=opts) |