This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10286

mergestate: simplify
AbandonedPublic

Authored by joerg.sonnenberger on Mar 28 2021, 7:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (3 lines)

Diff 26618

mercurial/mergestate.py

from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import errno import errno
import shutil import shutil
import struct import struct
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin, bin,
hex, hex,
nullhex, nullhex,
nullid, nullid,
nullrev,
) )
from . import ( from . import (
error, error,
filemerge, filemerge,
pycompat, pycompat,
util, util,
) )
from .utils import hashutil from .utils import hashutil
fcd = _filectxorabsent(localkey, wctx, dfile) fcd = _filectxorabsent(localkey, wctx, dfile)
fco = _filectxorabsent(onode, octx, ofile) fco = _filectxorabsent(onode, octx, ofile)
# TODO: move this to filectxorabsent # TODO: move this to filectxorabsent
fca = self._repo.filectx(afile, fileid=anode, changectx=actx) fca = self._repo.filectx(afile, fileid=anode, changectx=actx)
# "premerge" x flags # "premerge" x flags
flo = fco.flags() flo = fco.flags()
fla = fca.flags() fla = fca.flags()
if b'x' in flags + flo + fla and b'l' not in flags + flo + fla: if b'x' in flags + flo + fla and b'l' not in flags + flo + fla:
if fca.node() == nullid and flags != flo: if fca.rev() == nullrev and flags != flo:
if preresolve: if preresolve:
self._repo.ui.warn( self._repo.ui.warn(
_( _(
b'warning: cannot merge flags for %s ' b'warning: cannot merge flags for %s '
b'without common ancestor - keeping local flags\n' b'without common ancestor - keeping local flags\n'
) )
% afile % afile
) )