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

annotate hgext/sparse.py @ 33323:252500520d60

sparse: refactor update actions filtering and call from core merge.calculateupdates() now filters the update actions through sparse by default. The filtering no-ops if sparse isn't enabled or no sparse config is defined. The function has been refactored to behave more like a filter instead of a wrapper of merge.calculateupdates(). We should arguably take sparse into account earlier in merge.calculateupdates(). This patch preserves the old behavior of applying sparse at the end of update calculation, which is the simplest and safest approach.

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Thu, 06 Jul 2017 16:29:31 -0700
parents	fa6c2c3064fd
children	33d0859c37bd

rev	line source
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1 # sparse.py - allow sparse checkouts of the working directory
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	2 #
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	3 # Copyright 2014 Facebook, Inc.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	4 #
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	7
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	8 """allow sparse checkouts of the working directory (EXPERIMENTAL)
33290 cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	9
cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	10 (This extension is not yet protected by backwards compatibility
cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	11 guarantees. Any aspect may break in future releases until this
cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	12 notice is removed.)
cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	13
cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	14 This extension allows the working directory to only consist of a
cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	15 subset of files for the revision. This allows specific files or
cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	16 directories to be explicitly included or excluded. Many repository
cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	17 operations have performance proportional to the number of files in
cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	18 the working directory. So only realizing a subset of files in the
cd1c275c9482 sparse: expand module docstring Gregory Szorc <gregory.szorc@gmail.com> parents: 33289 diff changeset	19 working directory can improve performance.
33294 a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	20
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	21 Sparse Config Files
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	22 -------------------
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	23
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	24 The set of files that are part of a sparse checkout are defined by
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	25 a sparse config file. The file defines 3 things: includes (files to
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	26 include in the sparse checkout), excludes (files to exclude from the
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	27 sparse checkout), and profiles (links to other config files).
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	28
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	29 The file format is newline delimited. Empty lines and lines beginning
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	30 with ``#`` are ignored.
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	31
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	32 Lines beginning with ``%include `` denote another sparse config file
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	33 to include. e.g. ``%include tests.sparse``. The filename is relative
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	34 to the repository root.
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	35
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	36 The special lines ``[include]`` and ``[exclude]`` denote the section
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	37 for includes and excludes that follow, respectively. It is illegal to
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	38 have ``[include]`` after ``[exclude]``. If no sections are defined,
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	39 entries are assumed to be in the ``[include]`` section.
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	40
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	41 Non-special lines resemble file patterns to be added to either includes
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	42 or excludes. The syntax of these lines is documented by :hg:`help patterns`.
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	43 Patterns are interpreted as ``glob:`` by default and match against the
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	44 root of the repository.
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	45
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	46 Exclusion patterns take precedence over inclusion patterns. So even
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	47 if a file is explicitly included, an ``[exclude]`` entry can remove it.
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	48
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	49 For example, say you have a repository with 3 directories, ``frontend/``,
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	50 ``backend/``, and ``tools/``. ``frontend/`` and ``backend/`` correspond
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	51 to different projects and it is uncommon for someone working on one
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	52 to need the files for the other. But ``tools/`` contains files shared
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	53 between both projects. Your sparse config files may resemble::
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	54
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	55 # frontend.sparse
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	56 frontend/**
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	57 tools/**
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	58
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	59 # backend.sparse
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	60 backend/**
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	61 tools/**
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	62
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	63 Say the backend grows in size. Or there's a directory with thousands
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	64 of files you wish to exclude. You can modify the profile to exclude
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	65 certain files::
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	66
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	67 [include]
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	68 backend/**
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	69 tools/**
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	70
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	71 [exclude]
a5921ad2eb99 sparse: document config file format Gregory Szorc <gregory.szorc@gmail.com> parents: 33293 diff changeset	72 tools/tests/**
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	73 """
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	74
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	75 from __future__ import absolute_import
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	76
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	77 from mercurial.i18n import _
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	78 from mercurial.node import nullid
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	79 from mercurial import (
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	80 cmdutil,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	81 commands,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	82 context,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	83 dirstate,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	84 error,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	85 extensions,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	86 hg,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	87 localrepo,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	88 match as matchmod,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	89 merge as mergemod,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	90 registrar,
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33296 diff changeset	91 sparse,
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	92 util,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	93 )
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	94
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	95 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	96 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	97 # be specifying the version(s) of Mercurial they are tested with, or
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	98 # leave the attribute unspecified.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	99 testedwith = 'ships-with-hg-core'
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	100
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	101 cmdtable = {}
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	102 command = registrar.command(cmdtable)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	103
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	104 def uisetup(ui):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	105 _setupcommit(ui)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	106
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	107 def extsetup(ui):
33299 41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	108 sparse.enabled = True
41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	109
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	110 _setupclone(ui)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	111 _setuplog(ui)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	112 _setupadd(ui)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	113 _setupdirstate(ui)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	114
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	115 def reposetup(ui, repo):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	116 if not util.safehasattr(repo, 'dirstate'):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	117 return
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	118
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	119 if 'dirstate' in repo._filecache:
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	120 repo.dirstate.repo = repo
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	121
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	122 def replacefilecache(cls, propname, replacement):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	123 """Replace a filecache property with a new class. This allows changing the
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	124 cache invalidation condition."""
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	125 origcls = cls
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	126 assert callable(replacement)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	127 while cls is not object:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	128 if propname in cls.__dict__:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	129 orig = cls.__dict__[propname]
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	130 setattr(cls, propname, replacement(orig))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	131 break
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	132 cls = cls.__bases__[0]
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	133
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	134 if cls is object:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	135 raise AttributeError(_("type '%s' has no property '%s'") % (origcls,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	136 propname))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	137
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	138 def _setupcommit(ui):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	139 def _refreshoncommit(orig, self, node):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	140 """Refresh the checkout when commits touch .hgsparse
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	141 """
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	142 orig(self, node)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	143 repo = self._repo
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	144
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	145 ctx = repo[node]
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	146 profiles = sparse.patternsforrev(repo, ctx.rev())[2]
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	147
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	148 # profiles will only have data if sparse is enabled.
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	149 if set(profiles) & set(ctx.files()):
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	150 origstatus = repo.status()
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	151 origsparsematch = sparse.matcher(repo)
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	152 _refresh(repo.ui, repo, origstatus, origsparsematch, True)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	153
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	154 sparse.prunetemporaryincludes(repo)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	155
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	156 extensions.wrapfunction(context.committablectx, 'markcommitted',
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	157 _refreshoncommit)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	158
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	159 def _setuplog(ui):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	160 entry = commands.table['^log\|history']
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	161 entry[1].append(('', 'sparse', None,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	162 "limit to changesets affecting the sparse checkout"))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	163
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	164 def _logrevs(orig, repo, opts):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	165 revs = orig(repo, opts)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	166 if opts.get('sparse'):
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	167 sparsematch = sparse.matcher(repo)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	168 def ctxmatch(rev):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	169 ctx = repo[rev]
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	170 return any(f for f in ctx.files() if sparsematch(f))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	171 revs = revs.filter(ctxmatch)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	172 return revs
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	173 extensions.wrapfunction(cmdutil, '_logrevs', _logrevs)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	174
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	175 def _clonesparsecmd(orig, ui, repo, args, *opts):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	176 include_pat = opts.get('include')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	177 exclude_pat = opts.get('exclude')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	178 enableprofile_pat = opts.get('enable_profile')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	179 include = exclude = enableprofile = False
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	180 if include_pat:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	181 pat = include_pat
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	182 include = True
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	183 if exclude_pat:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	184 pat = exclude_pat
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	185 exclude = True
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	186 if enableprofile_pat:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	187 pat = enableprofile_pat
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	188 enableprofile = True
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	189 if sum([include, exclude, enableprofile]) > 1:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	190 raise error.Abort(_("too many flags specified."))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	191 if include or exclude or enableprofile:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	192 def clonesparse(orig, self, node, overwrite, args, *kwargs):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	193 _config(self.ui, self.unfiltered(), pat, {}, include=include,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	194 exclude=exclude, enableprofile=enableprofile)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	195 return orig(self, node, overwrite, args, *kwargs)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	196 extensions.wrapfunction(hg, 'updaterepo', clonesparse)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	197 return orig(ui, repo, args, *opts)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	198
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	199 def _setupclone(ui):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	200 entry = commands.table['^clone']
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	201 entry[1].append(('', 'enable-profile', [],
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	202 'enable a sparse profile'))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	203 entry[1].append(('', 'include', [],
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	204 'include sparse pattern'))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	205 entry[1].append(('', 'exclude', [],
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	206 'exclude sparse pattern'))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	207 extensions.wrapcommand(commands.table, 'clone', _clonesparsecmd)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	208
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	209 def _setupadd(ui):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	210 entry = commands.table['^add']
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	211 entry[1].append(('s', 'sparse', None,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	212 'also include directories of added files in sparse config'))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	213
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	214 def _add(orig, ui, repo, pats, *opts):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	215 if opts.get('sparse'):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	216 dirs = set()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	217 for pat in pats:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	218 dirname, basename = util.split(pat)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	219 dirs.add(dirname)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	220 _config(ui, repo, list(dirs), opts, include=True)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	221 return orig(ui, repo, pats, *opts)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	222
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	223 extensions.wrapcommand(commands.table, 'add', _add)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	224
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	225 def _setupdirstate(ui):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	226 """Modify the dirstate to prevent stat'ing excluded files,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	227 and to prevent modifications to files outside the checkout.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	228 """
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	229
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	230 def _dirstate(orig, repo):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	231 dirstate = orig(repo)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	232 dirstate.repo = repo
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	233 return dirstate
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	234 extensions.wrapfunction(
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	235 localrepo.localrepository.dirstate, 'func', _dirstate)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	236
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	237 # The atrocity below is needed to wrap dirstate._ignore. It is a cached
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	238 # property, which means normal function wrapping doesn't work.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	239 class ignorewrapper(object):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	240 def __init__(self, orig):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	241 self.orig = orig
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	242 self.origignore = None
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	243 self.func = None
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	244 self.sparsematch = None
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	245
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	246 def __get__(self, obj, type=None):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	247 repo = obj.repo
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	248 origignore = self.orig.__get__(obj)
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	249
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	250 sparsematch = sparse.matcher(repo)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	251 if sparsematch.always():
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	252 return origignore
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	253
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	254 if self.sparsematch != sparsematch or self.origignore != origignore:
33319 3c84591e7321 match: move matchers from sparse into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33317 diff changeset	255 self.func = matchmod.unionmatcher([
3c84591e7321 match: move matchers from sparse into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33317 diff changeset	256 origignore, matchmod.negatematcher(sparsematch)])
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	257 self.sparsematch = sparsematch
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	258 self.origignore = origignore
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	259 return self.func
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	260
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	261 def __set__(self, obj, value):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	262 return self.orig.__set__(obj, value)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	263
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	264 def __delete__(self, obj):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	265 return self.orig.__delete__(obj)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	266
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	267 replacefilecache(dirstate.dirstate, '_ignore', ignorewrapper)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	268
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	269 # dirstate.rebuild should not add non-matching files
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	270 def _rebuild(orig, self, parent, allfiles, changedfiles=None):
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	271 matcher = sparse.matcher(self.repo)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	272 if not matcher.always():
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	273 allfiles = allfiles.matches(matcher)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	274 if changedfiles:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	275 changedfiles = [f for f in changedfiles if matcher(f)]
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	276
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	277 if changedfiles is not None:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	278 # In _rebuild, these files will be deleted from the dirstate
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	279 # when they are not found to be in allfiles
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	280 dirstatefilestoremove = set(f for f in self if not matcher(f))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	281 changedfiles = dirstatefilestoremove.union(changedfiles)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	282
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	283 return orig(self, parent, allfiles, changedfiles)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	284 extensions.wrapfunction(dirstate.dirstate, 'rebuild', _rebuild)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	285
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	286 # Prevent adding files that are outside the sparse checkout
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	287 editfuncs = ['normal', 'add', 'normallookup', 'copy', 'remove', 'merge']
33293 c9cbf4de27ba sparse: rename command to debugsparse Gregory Szorc <gregory.szorc@gmail.com> parents: 33292 diff changeset	288 hint = _('include file with `hg debugsparse --include <pattern>` or use ' +
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	289 '`hg add -s <file>` to include file directory while adding')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	290 for func in editfuncs:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	291 def _wrapper(orig, self, *args):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	292 repo = self.repo
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	293 sparsematch = sparse.matcher(repo)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	294 if not sparsematch.always():
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	295 dirstate = repo.dirstate
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	296 for f in args:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	297 if (f is not None and not sparsematch(f) and
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	298 f not in dirstate):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	299 raise error.Abort(_("cannot add '%s' - it is outside "
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	300 "the sparse checkout") % f,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	301 hint=hint)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	302 return orig(self, *args)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	303 extensions.wrapfunction(dirstate.dirstate, func, _wrapper)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	304
33293 c9cbf4de27ba sparse: rename command to debugsparse Gregory Szorc <gregory.szorc@gmail.com> parents: 33292 diff changeset	305 @command('^debugsparse', [
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	306 ('I', 'include', False, _('include files in the sparse checkout')),
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	307 ('X', 'exclude', False, _('exclude files in the sparse checkout')),
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	308 ('d', 'delete', False, _('delete an include/exclude rule')),
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	309 ('f', 'force', False, _('allow changing rules even with pending changes')),
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	310 ('', 'enable-profile', False, _('enables the specified profile')),
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	311 ('', 'disable-profile', False, _('disables the specified profile')),
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	312 ('', 'import-rules', False, _('imports rules from a file')),
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	313 ('', 'clear-rules', False, _('clears local include/exclude rules')),
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	314 ('', 'refresh', False, _('updates the working after sparseness changes')),
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	315 ('', 'reset', False, _('makes the repo full again')),
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	316 ] + commands.templateopts,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	317 _('[--OPTION] PATTERN...'))
33293 c9cbf4de27ba sparse: rename command to debugsparse Gregory Szorc <gregory.szorc@gmail.com> parents: 33292 diff changeset	318 def debugsparse(ui, repo, pats, *opts):
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	319 """make the current checkout sparse, or edit the existing checkout
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	320
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	321 The sparse command is used to make the current checkout sparse.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	322 This means files that don't meet the sparse condition will not be
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	323 written to disk, or show up in any working copy operations. It does
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	324 not affect files in history in any way.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	325
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	326 Passing no arguments prints the currently applied sparse rules.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	327
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	328 --include and --exclude are used to add and remove files from the sparse
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	329 checkout. The effects of adding an include or exclude rule are applied
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	330 immediately. If applying the new rule would cause a file with pending
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	331 changes to be added or removed, the command will fail. Pass --force to
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	332 force a rule change even with pending changes (the changes on disk will
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	333 be preserved).
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	334
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	335 --delete removes an existing include/exclude rule. The effects are
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	336 immediate.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	337
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	338 --refresh refreshes the files on disk based on the sparse rules. This is
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	339 only necessary if .hg/sparse was changed by hand.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	340
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	341 --enable-profile and --disable-profile accept a path to a .hgsparse file.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	342 This allows defining sparse checkouts and tracking them inside the
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	343 repository. This is useful for defining commonly used sparse checkouts for
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	344 many people to use. As the profile definition changes over time, the sparse
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	345 checkout will automatically be updated appropriately, depending on which
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	346 changeset is checked out. Changes to .hgsparse are not applied until they
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	347 have been committed.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	348
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	349 --import-rules accepts a path to a file containing rules in the .hgsparse
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	350 format, allowing you to add --include, --exclude and --enable-profile rules
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	351 in bulk. Like the --include, --exclude and --enable-profile switches, the
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	352 changes are applied immediately.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	353
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	354 --clear-rules removes all local include and exclude rules, while leaving
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	355 any enabled profiles in place.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	356
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	357 Returns 0 if editing the sparse checkout succeeds.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	358 """
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	359 include = opts.get('include')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	360 exclude = opts.get('exclude')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	361 force = opts.get('force')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	362 enableprofile = opts.get('enable_profile')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	363 disableprofile = opts.get('disable_profile')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	364 importrules = opts.get('import_rules')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	365 clearrules = opts.get('clear_rules')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	366 delete = opts.get('delete')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	367 refresh = opts.get('refresh')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	368 reset = opts.get('reset')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	369 count = sum([include, exclude, enableprofile, disableprofile, delete,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	370 importrules, refresh, clearrules, reset])
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	371 if count > 1:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	372 raise error.Abort(_("too many flags specified"))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	373
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	374 if count == 0:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	375 if repo.vfs.exists('sparse'):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	376 ui.status(repo.vfs.read("sparse") + "\n")
33304 3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	377 temporaryincludes = sparse.readtemporaryincludes(repo)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	378 if temporaryincludes:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	379 ui.status(_("Temporarily Included Files (for merge/rebase):\n"))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	380 ui.status(("\n".join(temporaryincludes) + "\n"))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	381 else:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	382 ui.status(_('repo is not sparse\n'))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	383 return
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	384
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	385 if include or exclude or delete or reset or enableprofile or disableprofile:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	386 _config(ui, repo, pats, opts, include=include, exclude=exclude,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	387 reset=reset, delete=delete, enableprofile=enableprofile,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	388 disableprofile=disableprofile, force=force)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	389
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	390 if importrules:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	391 _import(ui, repo, pats, opts, force=force)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	392
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	393 if clearrules:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	394 _clear(ui, repo, pats, force=force)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	395
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	396 if refresh:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	397 try:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	398 wlock = repo.wlock()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	399 fcounts = map(
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	400 len,
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	401 _refresh(ui, repo, repo.status(), sparse.matcher(repo), force))
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	402 _verbose_output(ui, opts, 0, 0, 0, *fcounts)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	403 finally:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	404 wlock.release()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	405
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	406 def _config(ui, repo, pats, opts, include=False, exclude=False, reset=False,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	407 delete=False, enableprofile=False, disableprofile=False,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	408 force=False):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	409 """
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	410 Perform a sparse config update. Only one of the kwargs may be specified.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	411 """
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	412 wlock = repo.wlock()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	413 try:
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	414 oldsparsematch = sparse.matcher(repo)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	415
33296 ee616196227c sparse: use vfs.tryread() Gregory Szorc <gregory.szorc@gmail.com> parents: 33295 diff changeset	416 raw = repo.vfs.tryread('sparse')
ee616196227c sparse: use vfs.tryread() Gregory Szorc <gregory.szorc@gmail.com> parents: 33295 diff changeset	417 if raw:
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	418 oldinclude, oldexclude, oldprofiles = map(
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33296 diff changeset	419 set, sparse.parseconfig(ui, raw))
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	420 else:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	421 oldinclude = set()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	422 oldexclude = set()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	423 oldprofiles = set()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	424
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	425 try:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	426 if reset:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	427 newinclude = set()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	428 newexclude = set()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	429 newprofiles = set()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	430 else:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	431 newinclude = set(oldinclude)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	432 newexclude = set(oldexclude)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	433 newprofiles = set(oldprofiles)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	434
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	435 oldstatus = repo.status()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	436
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	437 if any(pat.startswith('/') for pat in pats):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	438 ui.warn(_('warning: paths cannot start with /, ignoring: %s\n')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	439 % ([pat for pat in pats if pat.startswith('/')]))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	440 elif include:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	441 newinclude.update(pats)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	442 elif exclude:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	443 newexclude.update(pats)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	444 elif enableprofile:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	445 newprofiles.update(pats)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	446 elif disableprofile:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	447 newprofiles.difference_update(pats)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	448 elif delete:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	449 newinclude.difference_update(pats)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	450 newexclude.difference_update(pats)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	451
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	452 sparse.writeconfig(repo, newinclude, newexclude, newprofiles)
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	453
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	454 fcounts = map(
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	455 len, _refresh(ui, repo, oldstatus, oldsparsematch, force))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	456
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	457 profilecount = (len(newprofiles - oldprofiles) -
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	458 len(oldprofiles - newprofiles))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	459 includecount = (len(newinclude - oldinclude) -
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	460 len(oldinclude - newinclude))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	461 excludecount = (len(newexclude - oldexclude) -
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	462 len(oldexclude - newexclude))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	463 _verbose_output(
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	464 ui, opts, profilecount, includecount, excludecount, *fcounts)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	465 except Exception:
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	466 sparse.writeconfig(repo, oldinclude, oldexclude, oldprofiles)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	467 raise
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	468 finally:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	469 wlock.release()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	470
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	471 def _import(ui, repo, files, opts, force=False):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	472 with repo.wlock():
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	473 # load union of current active profile
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	474 revs = [repo.changelog.rev(node) for node in
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	475 repo.dirstate.parents() if node != nullid]
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	476
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	477 # read current configuration
33296 ee616196227c sparse: use vfs.tryread() Gregory Szorc <gregory.szorc@gmail.com> parents: 33295 diff changeset	478 raw = repo.vfs.tryread('sparse')
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33296 diff changeset	479 oincludes, oexcludes, oprofiles = sparse.parseconfig(ui, raw)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	480 includes, excludes, profiles = map(
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	481 set, (oincludes, oexcludes, oprofiles))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	482
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	483 # all active rules
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	484 aincludes, aexcludes, aprofiles = set(), set(), set()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	485 for rev in revs:
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	486 rincludes, rexcludes, rprofiles = sparse.patternsforrev(repo, rev)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	487 aincludes.update(rincludes)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	488 aexcludes.update(rexcludes)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	489 aprofiles.update(rprofiles)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	490
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	491 # import rules on top; only take in rules that are not yet
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	492 # part of the active rules.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	493 changed = False
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	494 for file in files:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	495 with util.posixfile(util.expandpath(file)) as importfile:
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33296 diff changeset	496 iincludes, iexcludes, iprofiles = sparse.parseconfig(
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33296 diff changeset	497 ui, importfile.read())
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	498 oldsize = len(includes) + len(excludes) + len(profiles)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	499 includes.update(iincludes - aincludes)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	500 excludes.update(iexcludes - aexcludes)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	501 profiles.update(set(iprofiles) - aprofiles)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	502 if len(includes) + len(excludes) + len(profiles) > oldsize:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	503 changed = True
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	504
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	505 profilecount = includecount = excludecount = 0
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	506 fcounts = (0, 0, 0)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	507
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	508 if changed:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	509 profilecount = len(profiles - aprofiles)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	510 includecount = len(includes - aincludes)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	511 excludecount = len(excludes - aexcludes)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	512
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	513 oldstatus = repo.status()
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	514 oldsparsematch = sparse.matcher(repo)
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	515 sparse.writeconfig(repo, includes, excludes, profiles)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	516
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	517 try:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	518 fcounts = map(
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	519 len, _refresh(ui, repo, oldstatus, oldsparsematch, force))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	520 except Exception:
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	521 sparse.writeconfig(repo, oincludes, oexcludes, oprofiles)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	522 raise
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	523
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	524 _verbose_output(ui, opts, profilecount, includecount, excludecount,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	525 *fcounts)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	526
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	527 def _clear(ui, repo, files, force=False):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	528 with repo.wlock():
33296 ee616196227c sparse: use vfs.tryread() Gregory Szorc <gregory.szorc@gmail.com> parents: 33295 diff changeset	529 raw = repo.vfs.tryread('sparse')
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33296 diff changeset	530 includes, excludes, profiles = sparse.parseconfig(ui, raw)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	531
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	532 if includes or excludes:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	533 oldstatus = repo.status()
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	534 oldsparsematch = sparse.matcher(repo)
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	535 sparse.writeconfig(repo, set(), set(), profiles)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	536 _refresh(ui, repo, oldstatus, oldsparsematch, force)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	537
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	538 def _refresh(ui, repo, origstatus, origsparsematch, force):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	539 """Refreshes which files are on disk by comparing the old status and
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	540 sparsematch with the new sparsematch.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	541
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	542 Will raise an exception if a file with pending changes is being excluded
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	543 or included (unless force=True).
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	544 """
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	545 modified, added, removed, deleted, unknown, ignored, clean = origstatus
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	546
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	547 # Verify there are no pending changes
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	548 pending = set()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	549 pending.update(modified)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	550 pending.update(added)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	551 pending.update(removed)
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33319 diff changeset	552 sparsematch = sparse.matcher(repo)
33289 abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	553 abort = False
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	554 for file in pending:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	555 if not sparsematch(file):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	556 ui.warn(_("pending changes to '%s'\n") % file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	557 abort = not force
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	558 if abort:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	559 raise error.Abort(_("could not update sparseness due to " +
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	560 "pending changes"))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	561
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	562 # Calculate actions
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	563 dirstate = repo.dirstate
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	564 ctx = repo['.']
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	565 added = []
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	566 lookup = []
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	567 dropped = []
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	568 mf = ctx.manifest()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	569 files = set(mf)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	570
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	571 actions = {}
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	572
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	573 for file in files:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	574 old = origsparsematch(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	575 new = sparsematch(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	576 # Add files that are newly included, or that don't exist in
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	577 # the dirstate yet.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	578 if (new and not old) or (old and new and not file in dirstate):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	579 fl = mf.flags(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	580 if repo.wvfs.exists(file):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	581 actions[file] = ('e', (fl,), '')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	582 lookup.append(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	583 else:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	584 actions[file] = ('g', (fl, False), '')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	585 added.append(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	586 # Drop files that are newly excluded, or that still exist in
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	587 # the dirstate.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	588 elif (old and not new) or (not old and not new and file in dirstate):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	589 dropped.append(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	590 if file not in pending:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	591 actions[file] = ('r', [], '')
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	592
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	593 # Verify there are no pending changes in newly included files
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	594 abort = False
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	595 for file in lookup:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	596 ui.warn(_("pending changes to '%s'\n") % file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	597 abort = not force
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	598 if abort:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	599 raise error.Abort(_("cannot change sparseness due to " +
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	600 "pending changes (delete the files or use --force " +
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	601 "to bring them back dirty)"))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	602
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	603 # Check for files that were only in the dirstate.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	604 for file, state in dirstate.iteritems():
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	605 if not file in files:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	606 old = origsparsematch(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	607 new = sparsematch(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	608 if old and not new:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	609 dropped.append(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	610
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	611 # Apply changes to disk
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	612 typeactions = dict((m, []) for m in 'a f g am cd dc r dm dg m e k'.split())
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	613 for f, (m, args, msg) in actions.iteritems():
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	614 if m not in typeactions:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	615 typeactions[m] = []
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	616 typeactions[m].append((f, args, msg))
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	617 mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	618
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	619 # Fix dirstate
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	620 for file in added:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	621 dirstate.normal(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	622
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	623 for file in dropped:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	624 dirstate.drop(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	625
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	626 for file in lookup:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	627 # File exists on disk, and we're bringing it back in an unknown state.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	628 dirstate.normallookup(file)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	629
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	630 return added, dropped, lookup
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	631
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	632 def _verbose_output(ui, opts, profilecount, includecount, excludecount, added,
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	633 dropped, lookup):
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	634 """Produce --verbose and templatable output
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	635
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	636 This specifically enables -Tjson, providing machine-readable stats on how
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	637 the sparse profile changed.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	638
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	639 """
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	640 with ui.formatter('sparse', opts) as fm:
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	641 fm.startitem()
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	642 fm.condwrite(ui.verbose, 'profiles_added', 'Profile # change: %d\n',
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	643 profilecount)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	644 fm.condwrite(ui.verbose, 'include_rules_added',
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	645 'Include rule # change: %d\n', includecount)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	646 fm.condwrite(ui.verbose, 'exclude_rules_added',
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	647 'Exclude rule # change: %d\n', excludecount)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	648 # In 'plain' verbose mode, mergemod.applyupdates already outputs what
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	649 # files are added or removed outside of the templating formatter
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	650 # framework. No point in repeating ourselves in that case.
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	651 if not fm.isplain():
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	652 fm.condwrite(ui.verbose, 'files_added', 'Files added: %d\n',
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	653 added)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	654 fm.condwrite(ui.verbose, 'files_dropped', 'Files dropped: %d\n',
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	655 dropped)
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	656 fm.condwrite(ui.verbose, 'files_conflicting',
abd7dedbaa36 sparse: vendor Facebook-developed extension Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	657 'Files conflicting: %d\n', lookup)

Mercurial > public > mercurial-scm > hg

annotate hgext/sparse.py @ 33323:252500520d60