mercurial-scm/hg-stable: mercurial/sparse.py annotate

annotate mercurial/sparse.py @ 33324:33d0859c37bd

sparse: move working directory refreshing into core This is a pretty straightforward move of the code. I converted the "force" argument to a keyword argument. Like other recent changes, this code is tightly coupled with working directory update code in merge.py. I suspect the code will become more tightly coupled over time, possibly even moved to merge.py. For now, let's get the code in core.

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Thu, 06 Jul 2017 14:53:08 -0700
parents	252500520d60
children	38df146d0697

rev	line source
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1 # sparse.py - functionality for sparse checkouts
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	2 #
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	3 # Copyright 2014 Facebook, Inc.
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	4 #
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	7
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	8 from __future__ import absolute_import
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	9
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	10 import collections
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	11 import hashlib
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	12 import os
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	13
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	14 from .i18n import _
33301 ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	15 from .node import nullid
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	16 from . import (
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	17 error,
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	18 match as matchmod,
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	19 merge as mergemod,
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	20 pycompat,
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	21 )
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	22
33299 41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	23 # Whether sparse features are enabled. This variable is intended to be
41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	24 # temporary to facilitate porting sparse to core. It should eventually be
41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	25 # a per-repo option, possibly a repo requirement.
41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	26 enabled = False
41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	27
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	28 def parseconfig(ui, raw):
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	29 """Parse sparse config file content.
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	30
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	31 Returns a tuple of includes, excludes, and profiles.
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	32 """
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	33 includes = set()
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	34 excludes = set()
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	35 current = includes
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	36 profiles = []
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	37 for line in raw.split('\n'):
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	38 line = line.strip()
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	39 if not line or line.startswith('#'):
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	40 # empty or comment line, skip
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	41 continue
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	42 elif line.startswith('%include '):
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	43 line = line[9:].strip()
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	44 if line:
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	45 profiles.append(line)
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	46 elif line == '[include]':
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	47 if current != includes:
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	48 # TODO pass filename into this API so we can report it.
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	49 raise error.Abort(_('sparse config cannot have includes ' +
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	50 'after excludes'))
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	51 continue
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	52 elif line == '[exclude]':
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	53 current = excludes
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	54 elif line:
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	55 if line.strip().startswith('/'):
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	56 ui.warn(_('warning: sparse profile cannot use' +
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	57 ' paths starting with /, ignoring %s\n') % line)
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	58 continue
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	59 current.add(line)
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	60
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	61 return includes, excludes, profiles
33298 f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	62
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	63 # Exists as separate function to facilitate monkeypatching.
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	64 def readprofile(repo, profile, changeid):
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	65 """Resolve the raw content of a sparse profile file."""
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	66 # TODO add some kind of cache here because this incurs a manifest
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	67 # resolve and can be slow.
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	68 return repo.filectx(profile, changeid=changeid).data()
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	69
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	70 def patternsforrev(repo, rev):
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	71 """Obtain sparse checkout patterns for the given rev.
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	72
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	73 Returns a tuple of iterables representing includes, excludes, and
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	74 patterns.
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	75 """
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	76 # Feature isn't enabled. No-op.
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	77 if not enabled:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	78 return set(), set(), []
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	79
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	80 raw = repo.vfs.tryread('sparse')
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	81 if not raw:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	82 return set(), set(), []
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	83
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	84 if rev is None:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	85 raise error.Abort(_('cannot parse sparse patterns from working '
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	86 'directory'))
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	87
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	88 includes, excludes, profiles = parseconfig(repo.ui, raw)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	89 ctx = repo[rev]
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	90
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	91 if profiles:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	92 visited = set()
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	93 while profiles:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	94 profile = profiles.pop()
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	95 if profile in visited:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	96 continue
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	97
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	98 visited.add(profile)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	99
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	100 try:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	101 raw = readprofile(repo, profile, rev)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	102 except error.ManifestLookupError:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	103 msg = (
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	104 "warning: sparse profile '%s' not found "
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	105 "in rev %s - ignoring it\n" % (profile, ctx))
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	106 # experimental config: sparse.missingwarning
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	107 if repo.ui.configbool(
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	108 'sparse', 'missingwarning', True):
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	109 repo.ui.warn(msg)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	110 else:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	111 repo.ui.debug(msg)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	112 continue
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	113
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	114 pincludes, pexcludes, subprofs = parseconfig(repo.ui, raw)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	115 includes.update(pincludes)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	116 excludes.update(pexcludes)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	117 for subprofile in subprofs:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	118 profiles.append(subprofile)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	119
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	120 profiles = visited
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	121
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	122 if includes:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	123 includes.add('.hg*')
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	124
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	125 return includes, excludes, profiles
33301 ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	126
ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	127 def activeprofiles(repo):
ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	128 revs = [repo.changelog.rev(node) for node in
ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	129 repo.dirstate.parents() if node != nullid]
ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	130
ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	131 profiles = set()
ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	132 for rev in revs:
ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	133 profiles.update(patternsforrev(repo, rev)[2])
ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	134
ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	135 return profiles
33302 36a415b5a4b2 localrepo: add sparse caches Gregory Szorc <gregory.szorc@gmail.com> parents: 33301 diff changeset	136
36a415b5a4b2 localrepo: add sparse caches Gregory Szorc <gregory.szorc@gmail.com> parents: 33301 diff changeset	137 def invalidatesignaturecache(repo):
36a415b5a4b2 localrepo: add sparse caches Gregory Szorc <gregory.szorc@gmail.com> parents: 33301 diff changeset	138 repo._sparsesignaturecache.clear()
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	139
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	140 def configsignature(repo, includetemp=True):
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	141 """Obtain the signature string for the current sparse configuration.
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	142
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	143 This is used to construct a cache key for matchers.
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	144 """
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	145 cache = repo._sparsesignaturecache
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	146
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	147 signature = cache.get('signature')
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	148
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	149 if includetemp:
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	150 tempsignature = cache.get('tempsignature')
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	151 else:
33318 526255fe7899 sparse: clean up config signature code Gregory Szorc <gregory.szorc@gmail.com> parents: 33317 diff changeset	152 tempsignature = '0'
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	153
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	154 if signature is None or (includetemp and tempsignature is None):
33318 526255fe7899 sparse: clean up config signature code Gregory Szorc <gregory.szorc@gmail.com> parents: 33317 diff changeset	155 signature = hashlib.sha1(repo.vfs.tryread('sparse')).hexdigest()
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	156 cache['signature'] = signature
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	157
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	158 if includetemp:
33318 526255fe7899 sparse: clean up config signature code Gregory Szorc <gregory.szorc@gmail.com> parents: 33317 diff changeset	159 raw = repo.vfs.tryread('tempsparse')
526255fe7899 sparse: clean up config signature code Gregory Szorc <gregory.szorc@gmail.com> parents: 33317 diff changeset	160 tempsignature = hashlib.sha1(raw).hexdigest()
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	161 cache['tempsignature'] = tempsignature
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	162
33318 526255fe7899 sparse: clean up config signature code Gregory Szorc <gregory.szorc@gmail.com> parents: 33317 diff changeset	163 return '%s %s' % (signature, tempsignature)
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	164
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	165 def writeconfig(repo, includes, excludes, profiles):
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	166 """Write the sparse config file given a sparse configuration."""
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	167 with repo.vfs('sparse', 'wb') as fh:
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	168 for p in sorted(profiles):
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	169 fh.write('%%include %s\n' % p)
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	170
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	171 if includes:
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	172 fh.write('[include]\n')
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	173 for i in sorted(includes):
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	174 fh.write(i)
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	175 fh.write('\n')
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	176
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	177 if excludes:
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	178 fh.write('[exclude]\n')
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	179 for e in sorted(excludes):
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	180 fh.write(e)
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	181 fh.write('\n')
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	182
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	183 invalidatesignaturecache(repo)
33304 3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	184
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	185 def readtemporaryincludes(repo):
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	186 raw = repo.vfs.tryread('tempsparse')
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	187 if not raw:
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	188 return set()
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	189
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	190 return set(raw.split('\n'))
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	191
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	192 def writetemporaryincludes(repo, includes):
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	193 repo.vfs.write('tempsparse', '\n'.join(sorted(includes)))
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	194 invalidatesignaturecache(repo)
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	195
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	196 def addtemporaryincludes(repo, additional):
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	197 includes = readtemporaryincludes(repo)
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	198 for i in additional:
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	199 includes.add(i)
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	200 writetemporaryincludes(repo, includes)
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	201
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	202 def prunetemporaryincludes(repo):
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	203 if not enabled or not repo.vfs.exists('tempsparse'):
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	204 return
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	205
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	206 origstatus = repo.status()
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	207 modified, added, removed, deleted, a, b, c = origstatus
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	208 if modified or added or removed or deleted:
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	209 # Still have pending changes. Don't bother trying to prune.
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	210 return
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	211
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	212 sparsematch = matcher(repo, includetemp=False)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	213 dirstate = repo.dirstate
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	214 actions = []
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	215 dropped = []
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	216 tempincludes = readtemporaryincludes(repo)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	217 for file in tempincludes:
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	218 if file in dirstate and not sparsematch(file):
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	219 message = _('dropping temporarily included sparse files')
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	220 actions.append((file, None, message))
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	221 dropped.append(file)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	222
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	223 typeactions = collections.defaultdict(list)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	224 typeactions['r'] = actions
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	225 mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	226
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	227 # Fix dirstate
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	228 for file in dropped:
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	229 dirstate.drop(file)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	230
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	231 repo.vfs.unlink('tempsparse')
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	232 invalidatesignaturecache(repo)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	233 msg = _('cleaned up %d temporarily added file(s) from the '
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	234 'sparse checkout\n')
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	235 repo.ui.status(msg % len(tempincludes))
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	236
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	237 def matcher(repo, revs=None, includetemp=True):
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	238 """Obtain a matcher for sparse working directories for the given revs.
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	239
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	240 If multiple revisions are specified, the matcher is the union of all
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	241 revs.
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	242
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	243 ``includetemp`` indicates whether to use the temporary sparse profile.
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	244 """
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	245 # If sparse isn't enabled, sparse matcher matches everything.
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	246 if not enabled:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	247 return matchmod.always(repo.root, '')
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	248
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	249 if not revs or revs == [None]:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	250 revs = [repo.changelog.rev(node)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	251 for node in repo.dirstate.parents() if node != nullid]
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	252
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	253 signature = configsignature(repo, includetemp=includetemp)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	254
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	255 key = '%s %s' % (signature, ' '.join(map(pycompat.bytestr, revs)))
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	256
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	257 result = repo._sparsematchercache.get(key)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	258 if result:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	259 return result
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	260
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	261 matchers = []
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	262 for rev in revs:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	263 try:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	264 includes, excludes, profiles = patternsforrev(repo, rev)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	265
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	266 if includes or excludes:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	267 # Explicitly include subdirectories of includes so
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	268 # status will walk them down to the actual include.
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	269 subdirs = set()
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	270 for include in includes:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	271 # TODO consider using posix path functions here so Windows
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	272 # \ directory separators don't come into play.
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	273 dirname = os.path.dirname(include)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	274 # basename is used to avoid issues with absolute
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	275 # paths (which on Windows can include the drive).
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	276 while os.path.basename(dirname):
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	277 subdirs.add(dirname)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	278 dirname = os.path.dirname(dirname)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	279
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	280 matcher = matchmod.match(repo.root, '', [],
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	281 include=includes, exclude=excludes,
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	282 default='relpath')
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	283 if subdirs:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	284 matcher = matchmod.forceincludematcher(matcher, subdirs)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	285 matchers.append(matcher)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	286 except IOError:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	287 pass
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	288
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	289 if not matchers:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	290 result = matchmod.always(repo.root, '')
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	291 elif len(matchers) == 1:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	292 result = matchers[0]
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	293 else:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	294 result = matchmod.unionmatcher(matchers)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	295
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	296 if includetemp:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	297 tempincludes = readtemporaryincludes(repo)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	298 result = matchmod.forceincludematcher(result, tempincludes)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	299
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	300 repo._sparsematchercache[key] = result
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	301
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	302 return result
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	303
33323 252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33322 diff changeset	304 def filterupdatesactions(repo, wctx, mctx, branchmerge, actions):
252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33322 diff changeset	305 """Filter updates to only lay out files that match the sparse rules."""
252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33322 diff changeset	306 if not enabled:
252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33322 diff changeset	307 return actions
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	308
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	309 oldrevs = [pctx.rev() for pctx in wctx.parents()]
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	310 oldsparsematch = matcher(repo, oldrevs)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	311
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	312 if oldsparsematch.always():
33323 252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33322 diff changeset	313 return actions
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	314
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	315 files = set()
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	316 prunedactions = {}
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	317
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	318 if branchmerge:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	319 # If we're merging, use the wctx filter, since we're merging into
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	320 # the wctx.
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	321 sparsematch = matcher(repo, [wctx.parents()[0].rev()])
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	322 else:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	323 # If we're updating, use the target context's filter, since we're
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	324 # moving to the target context.
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	325 sparsematch = matcher(repo, [mctx.rev()])
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	326
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	327 temporaryfiles = []
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	328 for file, action in actions.iteritems():
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	329 type, args, msg = action
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	330 files.add(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	331 if sparsematch(file):
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	332 prunedactions[file] = action
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	333 elif type == 'm':
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	334 temporaryfiles.append(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	335 prunedactions[file] = action
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	336 elif branchmerge:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	337 if type != 'k':
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	338 temporaryfiles.append(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	339 prunedactions[file] = action
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	340 elif type == 'f':
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	341 prunedactions[file] = action
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	342 elif file in wctx:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	343 prunedactions[file] = ('r', args, msg)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	344
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	345 if len(temporaryfiles) > 0:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	346 repo.ui.status(_('temporarily included %d file(s) in the sparse '
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	347 'checkout for merging\n') % len(temporaryfiles))
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	348 addtemporaryincludes(repo, temporaryfiles)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	349
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	350 # Add the new files to the working copy so they can be merged, etc
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	351 actions = []
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	352 message = 'temporarily adding to sparse checkout'
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	353 wctxmanifest = repo[None].manifest()
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	354 for file in temporaryfiles:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	355 if file in wctxmanifest:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	356 fctx = repo[None][file]
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	357 actions.append((file, (fctx.flags(), False), message))
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	358
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	359 typeactions = collections.defaultdict(list)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	360 typeactions['g'] = actions
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	361 mergemod.applyupdates(repo, typeactions, repo[None], repo['.'],
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	362 False)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	363
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	364 dirstate = repo.dirstate
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	365 for file, flags, msg in actions:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	366 dirstate.normal(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	367
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	368 profiles = activeprofiles(repo)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	369 changedprofiles = profiles & files
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	370 # If an active profile changed during the update, refresh the checkout.
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	371 # Don't do this during a branch merge, since all incoming changes should
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	372 # have been handled by the temporary includes above.
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	373 if changedprofiles and not branchmerge:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	374 mf = mctx.manifest()
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	375 for file in mf:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	376 old = oldsparsematch(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	377 new = sparsematch(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	378 if not old and new:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	379 flags = mf.flags(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	380 prunedactions[file] = ('g', (flags, False), '')
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	381 elif old and not new:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	382 prunedactions[file] = ('r', [], '')
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	383
33323 252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33322 diff changeset	384 return prunedactions
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	385
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	386 def refreshwdir(repo, origstatus, origsparsematch, force=False):
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	387 """Refreshes working directory by taking sparse config into account.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	388
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	389 The old status and sparse matcher is compared against the current sparse
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	390 matcher.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	391
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	392 Will abort if a file with pending changes is being excluded or included
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	393 unless ``force`` is True.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	394 """
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	395 modified, added, removed, deleted, unknown, ignored, clean = origstatus
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	396
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	397 # Verify there are no pending changes
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	398 pending = set()
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	399 pending.update(modified)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	400 pending.update(added)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	401 pending.update(removed)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	402 sparsematch = matcher(repo)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	403 abort = False
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	404
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	405 for f in pending:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	406 if not sparsematch(f):
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	407 repo.ui.warn(_("pending changes to '%s'\n") % f)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	408 abort = not force
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	409
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	410 if abort:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	411 raise error.Abort(_('could not update sparseness due to pending '
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	412 'changes'))
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	413
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	414 # Calculate actions
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	415 dirstate = repo.dirstate
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	416 ctx = repo['.']
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	417 added = []
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	418 lookup = []
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	419 dropped = []
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	420 mf = ctx.manifest()
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	421 files = set(mf)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	422
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	423 actions = {}
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	424
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	425 for file in files:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	426 old = origsparsematch(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	427 new = sparsematch(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	428 # Add files that are newly included, or that don't exist in
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	429 # the dirstate yet.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	430 if (new and not old) or (old and new and not file in dirstate):
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	431 fl = mf.flags(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	432 if repo.wvfs.exists(file):
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	433 actions[file] = ('e', (fl,), '')
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	434 lookup.append(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	435 else:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	436 actions[file] = ('g', (fl, False), '')
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	437 added.append(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	438 # Drop files that are newly excluded, or that still exist in
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	439 # the dirstate.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	440 elif (old and not new) or (not old and not new and file in dirstate):
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	441 dropped.append(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	442 if file not in pending:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	443 actions[file] = ('r', [], '')
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	444
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	445 # Verify there are no pending changes in newly included files
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	446 abort = False
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	447 for file in lookup:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	448 repo.ui.warn(_("pending changes to '%s'\n") % file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	449 abort = not force
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	450 if abort:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	451 raise error.Abort(_('cannot change sparseness due to pending '
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	452 'changes (delete the files or use '
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	453 '--force to bring them back dirty)'))
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	454
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	455 # Check for files that were only in the dirstate.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	456 for file, state in dirstate.iteritems():
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	457 if not file in files:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	458 old = origsparsematch(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	459 new = sparsematch(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	460 if old and not new:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	461 dropped.append(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	462
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	463 # Apply changes to disk
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	464 typeactions = dict((m, []) for m in 'a f g am cd dc r dm dg m e k'.split())
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	465 for f, (m, args, msg) in actions.iteritems():
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	466 if m not in typeactions:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	467 typeactions[m] = []
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	468 typeactions[m].append((f, args, msg))
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	469
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	470 mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	471
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	472 # Fix dirstate
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	473 for file in added:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	474 dirstate.normal(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	475
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	476 for file in dropped:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	477 dirstate.drop(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	478
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	479 for file in lookup:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	480 # File exists on disk, and we're bringing it back in an unknown state.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	481 dirstate.normallookup(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	482
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	483 return added, dropped, lookup

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/sparse.py @ 33324:33d0859c37bd