##// END OF EJS Templates
rewriteutil: relax the sha1 hash references to handle future hash types...
rewriteutil: relax the sha1 hash references to handle future hash types Per discussion with nbjoerg in IRC. Differential Revision: https://phab.mercurial-scm.org/D8951

File last commit:

r45985:0babbc33 default
r45985:0babbc33 default
Show More
rewriteutil.py
125 lines | 3.9 KiB | text/x-python | PythonLexer
Pulkit Goyal
rewriteutil: add utility function to check if we can create new unstable cset...
r35242 # 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
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982 import re
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
r35243 from .i18n import _
Pulkit Goyal
rewriteutil: add utility function to check if we can create new unstable cset...
r35242 from . import (
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
r35243 error,
node,
Pulkit Goyal
rewriteutil: add utility function to check if we can create new unstable cset...
r35242 obsolete,
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982 obsutil,
Pulkit Goyal
rewriteutil: add utility function to check if we can create new unstable cset...
r35242 revset,
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982 scmutil,
Pulkit Goyal
rewriteutil: add utility function to check if we can create new unstable cset...
r35242 )
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Harbison
rewriteutil: relax the sha1 hash references to handle future hash types...
r45985 NODE_RE = re.compile(br'\b[0-9a-f]{6,64}\b')
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 def precheck(repo, revs, action=b'rewrite'):
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
r35243 """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:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = _(b"cannot %s null changeset") % action
hint = _(b"no changeset checked out")
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
r35243 raise error.Abort(msg, hint=hint)
if len(repo[None].parents()) > 1:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b"cannot %s while merging") % action)
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
r35243
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 publicrevs = repo.revs(b'%ld and public()', revs)
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
r35243 if publicrevs:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = _(b"cannot %s public changesets") % action
hint = _(b"see 'hg help phases' for details")
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
r35243 raise error.Abort(msg, hint=hint)
newunstable = disallowednewunstable(repo, revs)
if newunstable:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b"cannot %s changeset with children") % action)
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
r35243
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Pulkit Goyal
rewriteutil: add utility function to check if we can create new unstable cset...
r35242 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()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return repo.revs(b"(%ld::) - %ld", revs, revs)
Manuel Jacob
rewriteutil: add utility to check whether empty successors should be skipped
r45682
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)
)
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982
Matt Harbison
rewriteutil: also consider pending obsoletes when updating hashes in messages...
r45983 def update_hash_refs(repo, commitmsg, pending=None):
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982 """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.
Matt Harbison
rewriteutil: also consider pending obsoletes when updating hashes in messages...
r45983
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,..]``.
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982 """
Matt Harbison
rewriteutil: also consider pending obsoletes when updating hashes in messages...
r45983 if not pending:
pending = {}
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982 cache = {}
Matt Harbison
rewriteutil: relax the sha1 hash references to handle future hash types...
r45985 hashes = re.findall(NODE_RE, commitmsg)
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982 unfi = repo.unfiltered()
Matt Harbison
rewriteutil: relax the sha1 hash references to handle future hash types...
r45985 for h in hashes:
fullnode = scmutil.resolvehexnodeidprefix(unfi, h)
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982 if fullnode is None:
continue
ctx = unfi[fullnode]
if not ctx.obsolete():
Matt Harbison
rewriteutil: also consider pending obsoletes when updating hashes in messages...
r45983 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)
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982
# 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:
Matt Harbison
rewriteutil: relax the sha1 hash references to handle future hash types...
r45985 newhash = node.hex(successors[0][0])
commitmsg = commitmsg.replace(h, newhash[: len(h)])
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982 else:
repo.ui.note(
_(
b'The stale commit message reference to %s could '
b'not be updated\n'
)
Matt Harbison
rewriteutil: relax the sha1 hash references to handle future hash types...
r45985 % h
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45982 )
return commitmsg