This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1214

merge: don't check for unknown files in IMM
ClosedPublic

Authored by phillco on Oct 23 2017, 3:44 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5db3c748ce8f: merge: don't check for unknown files in IMM
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz added a subscriber: martinvonz.Oct 26 2017, 5:28 PM
martinvonz added inline comments.
mercurial/merge.py
664

Should this also short-circuit?

phillco added a reviewer: hg-reviewers.Nov 15 2017, 10:47 PM
phillco set the repository for this revision to rHG Mercurial.
phillco updated this revision to Diff 3554.Nov 16 2017, 1:00 AM
phillco marked an inline comment as done.Nov 16 2017, 1:03 AM
phillco added inline comments.
mercurial/merge.py
664

Good catch, thanks.

phillco marked an inline comment as done.Nov 16 2017, 1:03 AM
phillco updated this revision to Diff 3559.
phillco set the repository for this revision to rHG Mercurial.Nov 16 2017, 1:14 AM
durin42 accepted this revision.Dec 7 2017, 2:51 PM
This revision is now accepted and ready to land.Dec 7 2017, 2:51 PM
durin42 added a comment.Dec 7 2017, 2:58 PM

This and one other one are marked accepted by me, but the rebase was trickier than I have time for right now. Could you rebase them and reupload? Thanks!

phillco updated this revision to Diff 4176.Dec 7 2017, 4:22 PM
Closed by commit rHG5db3c748ce8f: merge: don't check for unknown files in IMM (authored by phillco). · Explain WhyDec 7 2017, 5:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (16 lines)

Diff 4218

mercurial/merge.py

if config not in valid: if config not in valid:
validstr = ', '.join(["'" + v + "'" for v in valid]) validstr = ', '.join(["'" + v + "'" for v in valid])
raise error.ConfigError(_("%s.%s not valid " raise error.ConfigError(_("%s.%s not valid "
"('%s' is none of %s)") "('%s' is none of %s)")
% (section, name, config, validstr)) % (section, name, config, validstr))
return config return config
def _checkunknownfile(repo, wctx, mctx, f, f2=None): def _checkunknownfile(repo, wctx, mctx, f, f2=None):
if wctx.isinmemory():
# Nothing to do in IMM because nothing in the "working copy" can be an
# unknown file.
#
# Note that we should bail out here, not in ``_checkunknownfiles()``,
# because that function does other useful work.
return False
if f2 is None: if f2 is None:
f2 = f f2 = f
return (repo.wvfs.audit.check(f) return (repo.wvfs.audit.check(f)
and repo.wvfs.isfileorlink(f) and repo.wvfs.isfileorlink(f)
and repo.dirstate.normalize(f) not in repo.dirstate and repo.dirstate.normalize(f) not in repo.dirstate
and mctx[f2].cmp(wctx[f])) and mctx[f2].cmp(wctx[f]))
class _unknowndirschecker(object): class _unknowndirschecker(object):
martinvonzUnsubmitted
Done

Should this also short-circuit?

martinvonz: Should this also short-circuit?
phillcoAuthorUnsubmitted
Not Done

Good catch, thanks.

phillco: Good catch, thanks.
""" """
Look for any unknown files or directories that may have a path conflict Look for any unknown files or directories that may have a path conflict
with a file. If any path prefix of the file exists as a file or link, with a file. If any path prefix of the file exists as a file or link,
then it conflicts. If the file itself is a directory that contains any then it conflicts. If the file itself is a directory that contains any
file that is not tracked, then it conflicts. file that is not tracked, then it conflicts.
Returns the shortest path at which a conflict occurs, or None if there is Returns the shortest path at which a conflict occurs, or None if there is
no conflict. no conflict.
""" """
def __init__(self): def __init__(self):
# A set of paths known to be good. This prevents repeated checking of # A set of paths known to be good. This prevents repeated checking of
# dirs. It will be updated with any new dirs that are checked and found # dirs. It will be updated with any new dirs that are checked and found
# to be safe. # to be safe.
self._unknowndircache = set() self._unknowndircache = set()
# A set of paths that are known to be absent. This prevents repeated # A set of paths that are known to be absent. This prevents repeated
# checking of subdirectories that are known not to exist. It will be # checking of subdirectories that are known not to exist. It will be
# updated with any new dirs that are checked and found to be absent. # updated with any new dirs that are checked and found to be absent.
self._missingdircache = set() self._missingdircache = set()
def __call__(self, repo, f): def __call__(self, repo, wctx, f):
if wctx.isinmemory():
# Nothing to do in IMM for the same reason as ``_checkunknownfile``.
return False
# Check for path prefixes that exist as unknown files. # Check for path prefixes that exist as unknown files.
for p in reversed(list(util.finddirs(f))): for p in reversed(list(util.finddirs(f))):
if p in self._missingdircache: if p in self._missingdircache:
return return
if p in self._unknowndircache: if p in self._unknowndircache:
continue continue
if repo.wvfs.audit.check(p): if repo.wvfs.audit.check(p):
if (repo.wvfs.isfileorlink(p) if (repo.wvfs.isfileorlink(p)
warnconflicts.update(conflicts) warnconflicts.update(conflicts)
checkunknowndirs = _unknowndirschecker() checkunknowndirs = _unknowndirschecker()
for f, (m, args, msg) in actions.iteritems(): for f, (m, args, msg) in actions.iteritems():
if m in ('c', 'dc'): if m in ('c', 'dc'):
if _checkunknownfile(repo, wctx, mctx, f): if _checkunknownfile(repo, wctx, mctx, f):
fileconflicts.add(f) fileconflicts.add(f)
elif pathconfig and f not in wctx: elif pathconfig and f not in wctx:
path = checkunknowndirs(repo, f) path = checkunknowndirs(repo, wctx, f)
if path is not None: if path is not None:
pathconflicts.add(path) pathconflicts.add(path)
elif m == 'dg': elif m == 'dg':
if _checkunknownfile(repo, wctx, mctx, f, args[0]): if _checkunknownfile(repo, wctx, mctx, f, args[0]):
fileconflicts.add(f) fileconflicts.add(f)
allconflicts = fileconflicts | pathconflicts allconflicts = fileconflicts | pathconflicts
ignoredconflicts = set([c for c in allconflicts ignoredconflicts = set([c for c in allconflicts