This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8765

absorb: improve message for the case when changeset became empty
ClosedPublic

Authored by mjacob on Jul 17 2020, 2:25 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc87bd1fe3da2: absorb: improve message for the case when changeset became empty
Summary

In changeset f55099982bc5, I introduced the message "became empty and became
...", which I was never very happy with. Raphaël Gomès suggested "became empty
as ...". That sounds much nicer.

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.

Revision Contents
Changeset List

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

Diff 21982

hgext/absorb.py

else: else:
# changeset needs re-commit # changeset needs re-commit
nodestr = self._commitsingle(memworkingcopy, ctx, p1=nextp1) nodestr = self._commitsingle(memworkingcopy, ctx, p1=nextp1)
lastcommitted = self.repo[nodestr] lastcommitted = self.repo[nodestr]
nextp1 = lastcommitted nextp1 = lastcommitted
self.replacemap[ctx.node()] = lastcommitted.node() self.replacemap[ctx.node()] = lastcommitted.node()
if memworkingcopy: if memworkingcopy:
if willbecomenoop: if willbecomenoop:
msg = _( msg = _(b'%d file(s) changed, became empty as %s')
b'%d file(s) changed, became empty '
b'and became %s'
)
else: else:
msg = _(b'%d file(s) changed, became %s') msg = _(b'%d file(s) changed, became %s')
msg = msg % ( msg = msg % (
len(memworkingcopy), len(memworkingcopy),
self._ctx2str(lastcommitted), self._ctx2str(lastcommitted),
) )
else: else:
msg = _(b'became %s') % self._ctx2str(lastcommitted) msg = _(b'became %s') % self._ctx2str(lastcommitted)

tests/test-absorb.t

4 changesets affected 4 changesets affected
a393a58 b4 a393a58 b4
30970db b3 30970db b3
1154859 b12 1154859 b12
bfafb49 a12 bfafb49 a12
$ hg absorb -av --config rewrite.empty-successor=keep | grep became $ hg absorb -av --config rewrite.empty-successor=keep | grep became
0:bfafb49242db: 1 file(s) changed, became 5:1a2de97fc652 0:bfafb49242db: 1 file(s) changed, became 5:1a2de97fc652
1:115485984805: 2 file(s) changed, became 6:0c930dfab74c 1:115485984805: 2 file(s) changed, became 6:0c930dfab74c
2:30970dbf7b40: 2 file(s) changed, became empty and became 7:df6574ae635c 2:30970dbf7b40: 2 file(s) changed, became empty as 7:df6574ae635c
3:a393a58b9a85: 2 file(s) changed, became empty and became 8:ad4bd3462c9e 3:a393a58b9a85: 2 file(s) changed, became empty as 8:ad4bd3462c9e
4:1bb0e8cff87a: 2 file(s) changed, became 9:2dbed75af996 4:1bb0e8cff87a: 2 file(s) changed, became 9:2dbed75af996
$ hg log -T '{rev} {desc}\n' -Gp $ hg log -T '{rev} {desc}\n' -Gp
@ 9 empty @ 9 empty
| |
o 8 b4 o 8 b4
| |
o 7 b3 o 7 b3
| |