This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10288

simplemerge: simplify
AbandonedPublic

Authored by joerg.sonnenberger on Mar 28 2021, 8:06 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 added a subscriber: durin42.Mar 29 2021, 3:32 PM

I hate to be That Guy but can you replace "simplify" in all these with some boilerplate about "compare revs and not ids because $REASON"? otherwise some enthusiastic architecture astronaut (probably me) is going to come back in the not-too-distant future and make it more generic and phrase things in terms of nodes rather than IDs.

(Generally my opinion is that we should be trying to hide revision numbers inside the repo storage layer, and try to traffic almost exclusively in nodes...)

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (4 lines)

Diff 26620

mercurial/simplemerge.py

# along with this program; if not, see <http://www.gnu.org/licenses/>. # along with this program; if not, see <http://www.gnu.org/licenses/>.
# mbp: "you know that thing where cvs gives you conflict markers?" # mbp: "you know that thing where cvs gives you conflict markers?"
# s: "i hate that." # s: "i hate that."
from __future__ import absolute_import from __future__ import absolute_import
from .i18n import _ from .i18n import _
from .node import nullid from .node import nullrev
from . import ( from . import (
error, error,
mdiff, mdiff,
pycompat, pycompat,
util, util,
) )
from .utils import stringutil from .utils import stringutil
for i, override in enumerate(overrides): for i, override in enumerate(overrides):
result[i] = override result[i] = override
return result return result
def is_not_null(ctx): def is_not_null(ctx):
if not util.safehasattr(ctx, "node"): if not util.safehasattr(ctx, "node"):
return False return False
return ctx.node() != nullid return ctx.rev() != nullrev
def _mergediff(m3, name_a, name_b, name_base): def _mergediff(m3, name_a, name_b, name_base):
lines = [] lines = []
conflicts = False conflicts = False
for group in m3.merge_groups(): for group in m3.merge_groups():
if group[0] == b'conflict': if group[0] == b'conflict':
base_lines, a_lines, b_lines = group[1:] base_lines, a_lines, b_lines = group[1:]