This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9181

rewriteutil: handle dropped commits when updating description hashes
ClosedPublic

Authored by mharbison72 on Oct 9 2020, 12:22 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3d68b47e461b: rewriteutil: handle dropped commits when updating description hashes
Summary

In looking to leverage this with the absorb extension, the old -> new mapping
there allows the new value to be None. We could filter that out and not pass it
to this method, but it seems worth a message to the user. (I wonder if these
should be an info or warning, because it's unlikely people are using -v
regularly.)

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
Mmercurial/rewriteutil.py (14 lines)

Diff 23198

mercurial/rewriteutil.py

# obsutil.successorssets() returns a list of list of nodes # obsutil.successorssets() returns a list of list of nodes
successors = [successors] successors = [successors]
else: 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:
newhash = node.hex(successors[0][0]) successor = successors[0][0]
if successor is not None:
newhash = node.hex(successor)
commitmsg = commitmsg.replace(h, newhash[: len(h)]) commitmsg = commitmsg.replace(h, newhash[: len(h)])
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(The referenced commit was dropped)\n'
)
% h
)
else:
repo.ui.note(
_(
b'The stale commit message reference to %s could '
b'not be updated\n' b'not be updated\n'
) )
% h % h
) )
return commitmsg return commitmsg