This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8643

absorb: make it clear what happens when no input
ClosedPublic

Authored by khanchi97 on Jun 20 2020, 2:20 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG65d19d9c8e76: absorb: make it clear what happens when no input

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

khanchi97 created this revision.Jun 20 2020, 2:20 AM
pulkit accepted this revision.Jun 22 2020, 5:42 AM
This revision is now accepted and ready to land.Jun 22 2020, 5:42 AM
khanchi97 added a commit: rHG65d19d9c8e76: absorb: make it clear what happens when no input.Jun 22 2020, 6:21 AM
Closed by commit rHG65d19d9c8e76: absorb: make it clear what happens when no input (authored by khanchi97). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (2 lines)
Mtests/test-absorb.t (2 lines)

Diff 21670

hgext/absorb.py

label=b'absorb.description', label=b'absorb.description',
) )
fm.end() fm.end()
if not opts.get(b'dry_run'): if not opts.get(b'dry_run'):
if ( if (
not opts.get(b'apply_changes') not opts.get(b'apply_changes')
and state.ctxaffected and state.ctxaffected
and ui.promptchoice( and ui.promptchoice(
b"apply changes (yn)? $$ &Yes $$ &No", default=1 b"apply changes (y/N)? $$ &Yes $$ &No", default=1
) )
): ):
raise error.Abort(_(b'absorb cancelled\n')) raise error.Abort(_(b'absorb cancelled\n'))
state.apply() state.apply()
if state.commit(): if state.commit():
state.printchunkstats() state.printchunkstats()
elif not ui.quiet: elif not ui.quiet:

tests/test-absorb.t

ff5d556 -3 ff5d556 -3
@@ -4,1 +2,0 @@ @@ -4,1 +2,0 @@
84e5416 -5e 84e5416 -5e
3 changesets affected 3 changesets affected
84e5416 commit 5 84e5416 commit 5
ff5d556 commit 3 ff5d556 commit 3
f548282 commit 1 f548282 commit 1
apply changes (yn)? y apply changes (y/N)? y
saved backup bundle to * (glob) saved backup bundle to * (glob)
3 of 3 chunk(s) applied 3 of 3 chunk(s) applied
$ hg annotate a $ hg annotate a
1: 2b 1: 2b
2: 4d 2: 4d
$ hg log -T '{rev} {desc}\n' -Gp $ hg log -T '{rev} {desc}\n' -Gp
@ 2 commit 4 @ 2 commit 4
| diff -r 1cae118c7ed8 -r 58a62bade1c6 a | diff -r 1cae118c7ed8 -r 58a62bade1c6 a