This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8749

absorb: make it explicit if empty changeset was created
ClosedPublic

Authored by mjacob on Jul 14 2020, 11:33 AM.

Details

Reviewers
martinvonz
marmoute
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf55099982bc5: absorb: make it explicit if empty changeset was created
Summary

If the config rewrite.empty-successor=skip is set, a message "became empty and
was dropped" is shown if the changeset became empty. If the config
rewrite.empty-successor=keep is set, absorb may create changesets even if they
became empty. It’s probably a good idea to make that explicit. Therefore the
message is changed to be a combination of both: "became empty and became ...".

Repeating the word "became" is not very elegant. This results from the fact
that "became" was and is overloaded to indicate both the change from non-empty
to empty and the successor relation. In the combinated message, both meanings
are used in one sentence.

Diff Detail

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

Event Timeline

mjacob created this revision.Jul 14 2020, 11:33 AM
Alphare accepted this revision.Jul 15 2020, 11:36 AM
Alphare added a subscriber: Alphare.

Not a fan of the wording, as you said... Maybe "became empty as <rev>:<hash>"?

martinvonz added a comment.Jul 15 2020, 12:34 PM
In D8749#130585, @Alphare wrote:

Not a fan of the wording, as you said... Maybe "became empty as <rev>:<hash>"?

That sounds better to me.

mjacob added a subscriber: durin42.Jul 17 2020, 2:26 PM

@durin42 suggested "N:deadbeef: N file(s) changed, became M:f005ba11 (empty change)" on the mailing list. That doesn’t quite nail it, as the message should only be shown if there was a change from non-empty to empty.

@Alphare’s suggestion "became empty as <rev>:<hash>" is better, and I’ve created D8765 for that. Thanks for the suggestion!

pulkit accepted this revision.Jul 17 2020, 2:35 PM
This revision is now accepted and ready to land.Jul 17 2020, 2:35 PM
mjacob closed this revision.Jul 17 2020, 2:36 PM

Revision Contents
Changeset List

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

Diff 21901

hgext/absorb.py

# the original parent unchanged # the original parent unchanged
nextp1 = None nextp1 = None
for ctx in self.stack: for ctx in self.stack:
memworkingcopy = self._getnewfilecontents(ctx) memworkingcopy = self._getnewfilecontents(ctx)
if not memworkingcopy and not lastcommitted: if not memworkingcopy and not lastcommitted:
# nothing changed, nothing commited # nothing changed, nothing commited
nextp1 = ctx nextp1 = ctx
continue continue
if ( willbecomenoop = ctx.files() and self._willbecomenoop(
self.skip_empty_successor memworkingcopy, ctx, nextp1
and ctx.files() )
and self._willbecomenoop(memworkingcopy, ctx, nextp1) if self.skip_empty_successor and willbecomenoop:
):
# changeset is no longer necessary # changeset is no longer necessary
self.replacemap[ctx.node()] = None self.replacemap[ctx.node()] = None
msg = _(b'became empty and was dropped') msg = _(b'became empty and was dropped')
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:
msg = _(b'%d file(s) changed, became %s') % ( if willbecomenoop:
msg = _(
b'%d file(s) changed, became empty '
b'and became %s'
)
else:
msg = _(b'%d file(s) changed, became %s')
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)
if self.ui.verbose and msg: if self.ui.verbose and msg:
self.ui.write(_(b'%s: %s\n') % (self._ctx2str(ctx), msg)) self.ui.write(_(b'%s: %s\n') % (self._ctx2str(ctx), msg))
self.finalnode = lastcommitted and lastcommitted.node() self.finalnode = lastcommitted and lastcommitted.node()

tests/test-absorb.t

> 1 > 1
> 2 > 2
> EOF > EOF
$ hg commit -m b12 -A b $ hg commit -m b12 -A b
$ echo 3 >> b $ echo 3 >> b
$ hg commit -m b3 $ hg commit -m b3
$ echo 4 >> b $ echo 4 >> b
$ hg commit -m b4 $ hg commit -m b4
$ hg commit -m empty --config ui.allowemptycommit=True
$ echo 1 > b $ echo 1 > b
$ echo 3 >> a $ echo 3 >> a
$ hg absorb -pn $ hg absorb -pn
showing changes for a showing changes for a
@@ -2,0 +2,1 @@ @@ -2,0 +2,1 @@
bfafb49 +3 bfafb49 +3
showing changes for b showing changes for b
@@ -1,3 +1,0 @@ @@ -1,3 +1,0 @@
1154859 -2 1154859 -2
30970db -3 30970db -3
a393a58 -4 a393a58 -4
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 4:1a2de97fc652 0:bfafb49242db: 1 file(s) changed, became 5:1a2de97fc652
1:115485984805: 2 file(s) changed, became 5:0c930dfab74c 1:115485984805: 2 file(s) changed, became 6:0c930dfab74c
2:30970dbf7b40: 2 file(s) changed, became 6:df6574ae635c 2:30970dbf7b40: 2 file(s) changed, became empty and became 7:df6574ae635c
3:a393a58b9a85: 2 file(s) changed, became 7:ad4bd3462c9e 3:a393a58b9a85: 2 file(s) changed, became empty and became 8:ad4bd3462c9e
4:1bb0e8cff87a: 2 file(s) changed, became 9:2dbed75af996
$ hg log -T '{rev} {desc}\n' -Gp $ hg log -T '{rev} {desc}\n' -Gp
@ 7 b4 @ 9 empty
| |
o 6 b3 o 8 b4
| |
o 5 b12 o 7 b3
|
o 6 b12
| diff --git a/b b/b | diff --git a/b b/b
| new file mode 100644 | new file mode 100644
| --- /dev/null | --- /dev/null
| +++ b/b | +++ b/b
| @@ -0,0 +1,1 @@ | @@ -0,0 +1,1 @@
| +1 | +1
| |
o 4 a12 o 5 a12
diff --git a/a b/a diff --git a/a b/a
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/a +++ b/a
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+1 +1
+2 +2
+3 +3