##// END OF EJS Templates
mergetools: add new conflict marker format with diffs in...
mergetools: add new conflict marker format with diffs in I use 3-way conflict markers. Often when I resolve them, I manually compare one the base with one side and apply the differences to the other side. That can be hard when the conflict marker is large. This patch introduces a new type of conflict marker, which I'm hoping will make it easier to resolve conflicts. The new format uses `<<<<<<<` and `>>>>>>>` to open and close the markers, just like our existing 2-way and 3-way conflict markers. Instead of having 2 or 3 snapshots (left+right or left+base+right), it has a sequence of diffs. A diff looks like this: ``` ------- base +++++++ left a -b +c d ``` A diff that adds one side ("diff from nothing") has a `=======` header instead and does not have have `+` prefixed on its lines. A regular 3-way merge can be viewed as adding one side plus a diff between the base and the other side. It thus has two ways of being represented, depending on which side is being diffed: ``` <<<<<<< ======= left contents on left ------- base +++++++ right contents on -left +right >>>>>>> ``` or ``` <<<<<<< ------- base +++++++ left contents on -right +left ======= right contents on right >>>>>>> ``` I've made it so the new merge tool tries to pick a version that has the most common lines (no difference in the example above). I've called the new tool "mergediff" to stick to the convention of starting with "merge" if the tool tries a regular 3-way merge. The idea came from my pet VCS (placeholder name `jj`), which has support for octopus merges and other ways of ending up with merges of more than 3 versions. I wanted to be able to represent such conflicts in the working copy and therefore thought of this format (although I have not yet implemented it in my VCS). I then attended a meeting with Larry McVoy, who said BitKeeper has an option (`bk smerge -g`) for showing a similar format, which reminded me to actually attempt this in Mercurial. Differential Revision: https://phab.mercurial-scm.org/D9551

File last commit:

r46457:b4694ef4 default
r46724:bdc2bf68 default
Show More
rewriteutil.py
135 lines | 4.2 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...
r45993 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...
r45993 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...
r45993 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...
r45996 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...
r45993
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")
Martin von Zweigbergk
errors: raise more specific errors from rewriteutil...
r46457 raise error.InputError(msg, hint=hint)
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
r35243
if len(repo[None].parents()) > 1:
Martin von Zweigbergk
errors: raise more specific errors from rewriteutil...
r46457 raise error.StateError(_(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")
Martin von Zweigbergk
errors: raise more specific errors from rewriteutil...
r46457 raise error.InputError(msg, hint=hint)
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
r35243
newunstable = disallowednewunstable(repo, revs)
if newunstable:
Martin von Zweigbergk
errors: raise more specific errors from rewriteutil...
r46457 raise error.InputError(_(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...
r45993
Matt Harbison
rewriteutil: also consider pending obsoletes when updating hashes in messages...
r45994 def update_hash_refs(repo, commitmsg, pending=None):
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45993 """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...
r45994
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...
r45993 """
Matt Harbison
rewriteutil: also consider pending obsoletes when updating hashes in messages...
r45994 if not pending:
pending = {}
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45993 cache = {}
Matt Harbison
rewriteutil: relax the sha1 hash references to handle future hash types...
r45996 hashes = re.findall(NODE_RE, commitmsg)
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45993 unfi = repo.unfiltered()
Matt Harbison
rewriteutil: relax the sha1 hash references to handle future hash types...
r45996 for h in hashes:
fullnode = scmutil.resolvehexnodeidprefix(unfi, h)
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45993 if fullnode is None:
continue
ctx = unfi[fullnode]
if not ctx.obsolete():
Matt Harbison
rewriteutil: also consider pending obsoletes when updating hashes in messages...
r45994 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...
r45993
# 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: handle dropped commits when updating description hashes...
r46303 successor = successors[0][0]
if successor is not None:
newhash = node.hex(successor)
commitmsg = commitmsg.replace(h, newhash[: len(h)])
else:
repo.ui.note(
_(
b'The stale commit message reference to %s could '
b'not be updated\n(The referenced commit was dropped)\n'
)
% h
)
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45993 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...
r45996 % h
Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits...
r45993 )
return commitmsg