Mercurial > hg
view mercurial/rewriteutil.py @ 45425:f7e293e0475f
rewriteutil: also consider pending obsoletes when updating hashes in messages
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.
Differential Revision: https://phab.mercurial-scm.org/D8949
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 24 Aug 2020 18:44:15 -0400 |
parents | 0a57ef4b3bdb |
children | 78861610ded8 |
line wrap: on
line source
# rewriteutil.py - utility functions for rewriting changesets # # Copyright 2017 Octobus <contact@octobus.net> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import import re from .i18n import _ from . import ( error, node, obsolete, obsutil, revset, scmutil, ) sha1re = re.compile(br'\b[0-9a-f]{6,40}\b') def precheck(repo, revs, action=b'rewrite'): """check if revs can be rewritten action is used to control the error message. Make sure this function is called after taking the lock. """ if node.nullrev in revs: msg = _(b"cannot %s null changeset") % action hint = _(b"no changeset checked out") raise error.Abort(msg, hint=hint) if len(repo[None].parents()) > 1: raise error.Abort(_(b"cannot %s while merging") % action) publicrevs = repo.revs(b'%ld and public()', revs) if publicrevs: msg = _(b"cannot %s public changesets") % action hint = _(b"see 'hg help phases' for details") raise error.Abort(msg, hint=hint) newunstable = disallowednewunstable(repo, revs) if newunstable: raise error.Abort(_(b"cannot %s changeset with children") % action) def disallowednewunstable(repo, revs): """Checks whether editing the revs will create new unstable changesets and are we allowed to create them. To allow new unstable changesets, set the config: `experimental.evolution.allowunstable=True` """ allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) if allowunstable: return revset.baseset() return repo.revs(b"(%ld::) - %ld", revs, revs) def skip_empty_successor(ui, command): empty_successor = ui.config(b'rewrite', b'empty-successor') if empty_successor == b'skip': return True elif empty_successor == b'keep': return False else: raise error.ConfigError( _( b"%s doesn't know how to handle config " b"rewrite.empty-successor=%s (only 'skip' and 'keep' are " b"supported)" ) % (command, empty_successor) ) def update_hash_refs(repo, commitmsg, pending=None): """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 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 = {} sha1s = re.findall(sha1re, commitmsg) unfi = repo.unfiltered() for sha1 in sha1s: fullnode = scmutil.resolvehexnodeidprefix(unfi, sha1) if fullnode is None: continue ctx = unfi[fullnode] if not ctx.obsolete(): successors = pending.get(fullnode) if successors is None: continue # obsutil.successorssets() returns a list of list of nodes successors = [successors] else: successors = obsutil.successorssets(repo, ctx.node(), cache=cache) # We can't make any assumptions about how to update the hash if the # cset in question was split or diverged. if len(successors) == 1 and len(successors[0]) == 1: newsha1 = node.hex(successors[0][0]) commitmsg = commitmsg.replace(sha1, newsha1[: len(sha1)]) else: repo.ui.note( _( b'The stale commit message reference to %s could ' b'not be updated\n' ) % sha1 ) return commitmsg