This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8949

rewriteutil: also consider pending obsoletes when updating hashes in messages
ClosedPublic

Authored by mharbison72 on Aug 24 2020, 7:08 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf7e293e0475f: rewriteutil: also consider pending obsoletes when updating hashes in messages
rHGb65a3d50aa7b: rewriteutil: also consider pending obsoletes when updating hashes in messages
Summary

Phabricator builds up the replacement commits and mapping in a single
transaction, and then finalizes everything once the commits have been rewritten.
That's too late when trying to update the messages for those commits.

I'm a little concerned that this isn't a generic enough interface, since it
doesn't mimic the list of list return of obsutil.successorssets(). But this
is the type of mapping that phabricator maintains, and I don't think the methods
that would be interested in calling this need to worry about split and
divergence. We can fix that later if the need arises.

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

mharbison72 created this revision.Aug 24 2020, 7:08 PM
marmoute accepted this revision.Aug 26 2020, 3:11 PM
marmoute added a subscriber: marmoute.

Sounds fine, Maybe mention pending semantic and intended usage into the function docstring?

mercurial/utils/rewriteutil.py
52 ↗(On Diff #22441)

nits: None is already the default for .get(key)

mharbison72 updated this revision to Diff 22541.Sep 4 2020, 2:19 PM
pulkit accepted this revision.Sep 8 2020, 3:29 AM
This revision is now accepted and ready to land.Sep 8 2020, 3:29 AM

Revision Contents
Changeset List

Diff 22576

mercurial/rewriteutil.py

b"%s doesn't know how to handle config " b"%s doesn't know how to handle config "
b"rewrite.empty-successor=%s (only 'skip' and 'keep' are " b"rewrite.empty-successor=%s (only 'skip' and 'keep' are "
b"supported)" b"supported)"
) )
% (command, empty_successor) % (command, empty_successor)
) )
def update_hash_refs(repo, commitmsg): def update_hash_refs(repo, commitmsg, pending=None):
"""Replace all obsolete commit hashes in the message with the current hash. """Replace all obsolete commit hashes in the message with the current hash.
If the obsolete commit was split or is divergent, the hash is not replaced If the obsolete commit was split or is divergent, the hash is not replaced
as there's no way to know which successor to choose. as there's no way to know which successor to choose.
For commands that update a series of commits in the current transaction, the
new obsolete markers can be considered by setting ``pending`` to a mapping
of ``pending[oldnode] = [successor_node1, successor_node2,..]``.
""" """
if not pending:
pending = {}
cache = {} cache = {}
sha1s = re.findall(sha1re, commitmsg) sha1s = re.findall(sha1re, commitmsg)
unfi = repo.unfiltered() unfi = repo.unfiltered()
for sha1 in sha1s: for sha1 in sha1s:
fullnode = scmutil.resolvehexnodeidprefix(unfi, sha1) fullnode = scmutil.resolvehexnodeidprefix(unfi, sha1)
if fullnode is None: if fullnode is None:
continue continue
ctx = unfi[fullnode] ctx = unfi[fullnode]
if not ctx.obsolete(): if not ctx.obsolete():
successors = pending.get(fullnode)
if successors is None:
continue continue
# obsutil.successorssets() returns a list of list of nodes
successors = [successors]
else:
successors = obsutil.successorssets(repo, ctx.node(), cache=cache) successors = obsutil.successorssets(repo, ctx.node(), cache=cache)
# We can't make any assumptions about how to update the hash if the # We can't make any assumptions about how to update the hash if the
# cset in question was split or diverged. # cset in question was split or diverged.
if len(successors) == 1 and len(successors[0]) == 1: if len(successors) == 1 and len(successors[0]) == 1:
newsha1 = node.hex(successors[0][0]) newsha1 = node.hex(successors[0][0])
commitmsg = commitmsg.replace(sha1, newsha1[: len(sha1)]) commitmsg = commitmsg.replace(sha1, newsha1[: len(sha1)])
else: else:
repo.ui.note( repo.ui.note(
_( _(
b'The stale commit message reference to %s could ' b'The stale commit message reference to %s could '
b'not be updated\n' b'not be updated\n'
) )
% sha1 % sha1
) )
return commitmsg return commitmsg