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

annotate mercurial/sparse.py @ 45360:9320f66854f6

sparse: replace merge action values with mergestate.ACTION_* constants Having bytestrings like `b'r'` makes it hard to understand for people who don't know the code much or looking at it for the first time. Differential Revision: https://phab.mercurial-scm.org/D8881

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Mon, 03 Aug 2020 18:33:00 +0530
parents	b9b055f15035
children	3c783ff08d40

rev	line source
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1 # sparse.py - functionality for sparse checkouts
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	2 #
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	3 # Copyright 2014 Facebook, Inc.
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	4 #
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	7
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	8 from __future__ import absolute_import
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	9
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	10 import os
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	11
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	12 from .i18n import _
35582 72b91f905065 py3: use node.hex(h.digest()) instead of h.hexdigest() Pulkit Goyal <7895pulkit@gmail.com> parents: 34548 diff changeset	13 from .node import (
72b91f905065 py3: use node.hex(h.digest()) instead of h.hexdigest() Pulkit Goyal <7895pulkit@gmail.com> parents: 34548 diff changeset	14 hex,
72b91f905065 py3: use node.hex(h.digest()) instead of h.hexdigest() Pulkit Goyal <7895pulkit@gmail.com> parents: 34548 diff changeset	15 nullid,
72b91f905065 py3: use node.hex(h.digest()) instead of h.hexdigest() Pulkit Goyal <7895pulkit@gmail.com> parents: 34548 diff changeset	16 )
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	17 from . import (
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	18 error,
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	19 match as matchmod,
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	20 merge as mergemod,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44060 diff changeset	21 mergestate as mergestatemod,
33711 e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	22 pathutil,
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	23 pycompat,
33556 22371eabb3b1 sparse: add a requirement when a repository uses sparse (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33555 diff changeset	24 scmutil,
33371 c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	25 util,
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	26 )
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43117 diff changeset	27 from .utils import hashutil
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	28
33299 41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	29 # Whether sparse features are enabled. This variable is intended to be
41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	30 # temporary to facilitate porting sparse to core. It should eventually be
41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	31 # a per-repo option, possibly a repo requirement.
41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	32 enabled = False
41448fc51510 sparse: variable to track if sparse is enabled Gregory Szorc <gregory.szorc@gmail.com> parents: 33298 diff changeset	33
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	34
38877 8fe62ad9f4ff sparse: add an action argument to parseconfig() Pulkit Goyal <pulkit@yandex-team.ru> parents: 37576 diff changeset	35 def parseconfig(ui, raw, action):
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	36 """Parse sparse config file content.
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	37
38877 8fe62ad9f4ff sparse: add an action argument to parseconfig() Pulkit Goyal <pulkit@yandex-team.ru> parents: 37576 diff changeset	38 action is the command which is trigerring this read, can be narrow, sparse
8fe62ad9f4ff sparse: add an action argument to parseconfig() Pulkit Goyal <pulkit@yandex-team.ru> parents: 37576 diff changeset	39
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	40 Returns a tuple of includes, excludes, and profiles.
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	41 """
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	42 includes = set()
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	43 excludes = set()
33550 32f348d741e5 sparse: use set for capturing profiles Gregory Szorc <gregory.szorc@gmail.com> parents: 33499 diff changeset	44 profiles = set()
33551 1d1779734c99 sparse: require [section] in sparse config files (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33550 diff changeset	45 current = None
1d1779734c99 sparse: require [section] in sparse config files (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33550 diff changeset	46 havesection = False
1d1779734c99 sparse: require [section] in sparse config files (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33550 diff changeset	47
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	48 for line in raw.split(b'\n'):
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	49 line = line.strip()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	50 if not line or line.startswith(b'#'):
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	51 # empty or comment line, skip
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	52 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	53 elif line.startswith(b'%include '):
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	54 line = line[9:].strip()
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	55 if line:
33550 32f348d741e5 sparse: use set for capturing profiles Gregory Szorc <gregory.szorc@gmail.com> parents: 33499 diff changeset	56 profiles.add(line)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	57 elif line == b'[include]':
33551 1d1779734c99 sparse: require [section] in sparse config files (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33550 diff changeset	58 if havesection and current != includes:
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	59 # TODO pass filename into this API so we can report it.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	60 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	61 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	62 b'%(action)s config cannot have includes '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	63 b'after excludes'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	64 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	65 % {b'action': action}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	66 )
33551 1d1779734c99 sparse: require [section] in sparse config files (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33550 diff changeset	67 havesection = True
1d1779734c99 sparse: require [section] in sparse config files (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33550 diff changeset	68 current = includes
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	69 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	70 elif line == b'[exclude]':
33551 1d1779734c99 sparse: require [section] in sparse config files (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33550 diff changeset	71 havesection = True
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	72 current = excludes
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	73 elif line:
33551 1d1779734c99 sparse: require [section] in sparse config files (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33550 diff changeset	74 if current is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	75 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	76 _(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	77 b'%(action)s config entry outside of '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	78 b'section: %(line)s'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	79 )
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	80 % {b'action': action, b'line': line},
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	81 hint=_(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	82 b'add an [include] or [exclude] line '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	83 b'to declare the entry type'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	84 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	85 )
33551 1d1779734c99 sparse: require [section] in sparse config files (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33550 diff changeset	86
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	87 if line.strip().startswith(b'/'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	88 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	89 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	90 b'warning: %(action)s profile cannot use'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	91 b' paths starting with /, ignoring %(line)s\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	92 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	93 % {b'action': action, b'line': line}
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	94 )
33297 ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	95 continue
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	96 current.add(line)
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	97
ba5d89774db6 sparse: move config parsing into core Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	98 return includes, excludes, profiles
33298 f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	99
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	100
33298 f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	101 # Exists as separate function to facilitate monkeypatching.
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	102 def readprofile(repo, profile, changeid):
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	103 """Resolve the raw content of a sparse profile file."""
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	104 # TODO add some kind of cache here because this incurs a manifest
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	105 # resolve and can be slow.
f41a99c45956 sparse: move profile reading into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33297 diff changeset	106 return repo.filectx(profile, changeid=changeid).data()
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	107
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	108
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	109 def patternsforrev(repo, rev):
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	110 """Obtain sparse checkout patterns for the given rev.
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	111
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	112 Returns a tuple of iterables representing includes, excludes, and
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	113 patterns.
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	114 """
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	115 # Feature isn't enabled. No-op.
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	116 if not enabled:
33550 32f348d741e5 sparse: use set for capturing profiles Gregory Szorc <gregory.szorc@gmail.com> parents: 33499 diff changeset	117 return set(), set(), set()
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	118
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	119 raw = repo.vfs.tryread(b'sparse')
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	120 if not raw:
33550 32f348d741e5 sparse: use set for capturing profiles Gregory Szorc <gregory.szorc@gmail.com> parents: 33499 diff changeset	121 return set(), set(), set()
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	122
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	123 if rev is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	124 raise error.Abort(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	125 _(b'cannot parse sparse patterns from working directory')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	126 )
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	127
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	128 includes, excludes, profiles = parseconfig(repo.ui, raw, b'sparse')
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	129 ctx = repo[rev]
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	130
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	131 if profiles:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	132 visited = set()
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	133 while profiles:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	134 profile = profiles.pop()
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	135 if profile in visited:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	136 continue
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	137
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	138 visited.add(profile)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	139
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	140 try:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	141 raw = readprofile(repo, profile, rev)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	142 except error.ManifestLookupError:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	143 msg = (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	144 b"warning: sparse profile '%s' not found "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	145 b"in rev %s - ignoring it\n" % (profile, ctx)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	146 )
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	147 # experimental config: sparse.missingwarning
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	148 if repo.ui.configbool(b'sparse', b'missingwarning'):
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	149 repo.ui.warn(msg)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	150 else:
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	151 repo.ui.debug(msg)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	152 continue
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	153
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	154 pincludes, pexcludes, subprofs = parseconfig(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	155 repo.ui, raw, b'sparse'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	156 )
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	157 includes.update(pincludes)
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	158 excludes.update(pexcludes)
33550 32f348d741e5 sparse: use set for capturing profiles Gregory Szorc <gregory.szorc@gmail.com> parents: 33499 diff changeset	159 profiles.update(subprofs)
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	160
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	161 profiles = visited
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	162
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	163 if includes:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	164 includes.add(b'.hg*')
33300 f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	165
f7a106b3f089 sparse: move resolving of sparse patterns for rev into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33299 diff changeset	166 return includes, excludes, profiles
33301 ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	167
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	168
33370 482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	169 def activeconfig(repo):
482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	170 """Determine the active sparse config rules.
482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	171
482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	172 Rules are constructed by reading the current sparse config and bringing in
482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	173 referenced profiles from parents of the working directory.
482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	174 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	175 revs = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	176 repo.changelog.rev(node)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	177 for node in repo.dirstate.parents()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	178 if node != nullid
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	179 ]
33301 ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	180
33370 482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	181 allincludes = set()
482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	182 allexcludes = set()
482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	183 allprofiles = set()
482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	184
33301 ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	185 for rev in revs:
33370 482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	186 includes, excludes, profiles = patternsforrev(repo, rev)
482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	187 allincludes \|= includes
482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	188 allexcludes \|= excludes
33550 32f348d741e5 sparse: use set for capturing profiles Gregory Szorc <gregory.szorc@gmail.com> parents: 33499 diff changeset	189 allprofiles \|= profiles
33301 ca4b78eb11e7 sparse: move active profiles function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33300 diff changeset	190
33370 482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	191 return allincludes, allexcludes, allprofiles
33302 36a415b5a4b2 localrepo: add sparse caches Gregory Szorc <gregory.szorc@gmail.com> parents: 33301 diff changeset	192
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	193
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	194 def configsignature(repo, includetemp=True):
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	195 """Obtain the signature string for the current sparse configuration.
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	196
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	197 This is used to construct a cache key for matchers.
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	198 """
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	199 cache = repo._sparsesignaturecache
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	200
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	201 signature = cache.get(b'signature')
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	202
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	203 if includetemp:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	204 tempsignature = cache.get(b'tempsignature')
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	205 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	206 tempsignature = b'0'
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	207
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	208 if signature is None or (includetemp and tempsignature is None):
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43117 diff changeset	209 signature = hex(hashutil.sha1(repo.vfs.tryread(b'sparse')).digest())
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	210 cache[b'signature'] = signature
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	211
df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	212 if includetemp:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	213 raw = repo.vfs.tryread(b'tempsparse')
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43117 diff changeset	214 tempsignature = hex(hashutil.sha1(raw).digest())
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	215 cache[b'tempsignature'] = tempsignature
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	216
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	217 return b'%s %s' % (signature, tempsignature)
33317 df1287268cc0 sparse: move config signature logic into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33304 diff changeset	218
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	219
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	220 def writeconfig(repo, includes, excludes, profiles):
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	221 """Write the sparse config file given a sparse configuration."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	222 with repo.vfs(b'sparse', b'wb') as fh:
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	223 for p in sorted(profiles):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	224 fh.write(b'%%include %s\n' % p)
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	225
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	226 if includes:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	227 fh.write(b'[include]\n')
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	228 for i in sorted(includes):
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	229 fh.write(i)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	230 fh.write(b'\n')
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	231
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	232 if excludes:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	233 fh.write(b'[exclude]\n')
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	234 for e in sorted(excludes):
8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	235 fh.write(e)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	236 fh.write(b'\n')
33303 8b571495d811 sparse: move config file writing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33302 diff changeset	237
33325 38df146d0697 sparse: inline signature cache clearing Gregory Szorc <gregory.szorc@gmail.com> parents: 33324 diff changeset	238 repo._sparsesignaturecache.clear()
33304 3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	239
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	240
33304 3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	241 def readtemporaryincludes(repo):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	242 raw = repo.vfs.tryread(b'tempsparse')
33304 3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	243 if not raw:
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	244 return set()
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	245
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	246 return set(raw.split(b'\n'))
33304 3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	247
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	248
33304 3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	249 def writetemporaryincludes(repo, includes):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	250 repo.vfs.write(b'tempsparse', b'\n'.join(sorted(includes)))
33325 38df146d0697 sparse: inline signature cache clearing Gregory Szorc <gregory.szorc@gmail.com> parents: 33324 diff changeset	251 repo._sparsesignaturecache.clear()
33304 3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	252
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	253
33304 3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	254 def addtemporaryincludes(repo, additional):
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	255 includes = readtemporaryincludes(repo)
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	256 for i in additional:
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	257 includes.add(i)
3e1accab7447 sparse: move some temporary includes functions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33303 diff changeset	258 writetemporaryincludes(repo, includes)
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	259
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	260
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	261 def prunetemporaryincludes(repo):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	262 if not enabled or not repo.vfs.exists(b'tempsparse'):
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	263 return
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	264
33356 ccb3e5399921 sparse: access status fields by name instead of deconstructing it Martin von Zweigbergk <martinvonz@google.com> parents: 33355 diff changeset	265 s = repo.status()
ccb3e5399921 sparse: access status fields by name instead of deconstructing it Martin von Zweigbergk <martinvonz@google.com> parents: 33355 diff changeset	266 if s.modified or s.added or s.removed or s.deleted:
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	267 # Still have pending changes. Don't bother trying to prune.
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	268 return
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	269
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	270 sparsematch = matcher(repo, includetemp=False)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	271 dirstate = repo.dirstate
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	272 mresult = mergemod.mergeresult()
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	273 dropped = []
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	274 tempincludes = readtemporaryincludes(repo)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	275 for file in tempincludes:
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	276 if file in dirstate and not sparsematch(file):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	277 message = _(b'dropping temporarily included sparse files')
45360 9320f66854f6 sparse: replace merge action values with mergestate.ACTION_* constants Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	278 mresult.addfile(file, mergestatemod.ACTION_REMOVE, None, message)
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	279 dropped.append(file)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	280
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	281 mergemod.applyupdates(
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	282 repo, mresult, repo[None], repo[b'.'], False, wantfiledata=False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	283 )
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	284
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	285 # Fix dirstate
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	286 for file in dropped:
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	287 dirstate.drop(file)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	288
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	289 repo.vfs.unlink(b'tempsparse')
33325 38df146d0697 sparse: inline signature cache clearing Gregory Szorc <gregory.szorc@gmail.com> parents: 33324 diff changeset	290 repo._sparsesignaturecache.clear()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	291 msg = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	292 b'cleaned up %d temporarily added file(s) from the '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	293 b'sparse checkout\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	294 )
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	295 repo.ui.status(msg % len(tempincludes))
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33320 diff changeset	296
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	297
33447 6f4e5e5940a5 match: write forceincludematcher using unionmatcher Martin von Zweigbergk <martinvonz@google.com> parents: 33376 diff changeset	298 def forceincludematcher(matcher, includes):
6f4e5e5940a5 match: write forceincludematcher using unionmatcher Martin von Zweigbergk <martinvonz@google.com> parents: 33376 diff changeset	299 """Returns a matcher that returns true for any of the forced includes
6f4e5e5940a5 match: write forceincludematcher using unionmatcher Martin von Zweigbergk <martinvonz@google.com> parents: 33376 diff changeset	300 before testing against the actual matcher."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	301 kindpats = [(b'path', include, b'') for include in includes]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	302 includematcher = matchmod.includematcher(b'', kindpats)
33447 6f4e5e5940a5 match: write forceincludematcher using unionmatcher Martin von Zweigbergk <martinvonz@google.com> parents: 33376 diff changeset	303 return matchmod.unionmatcher([includematcher, matcher])
6f4e5e5940a5 match: write forceincludematcher using unionmatcher Martin von Zweigbergk <martinvonz@google.com> parents: 33376 diff changeset	304
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	305
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	306 def matcher(repo, revs=None, includetemp=True):
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	307 """Obtain a matcher for sparse working directories for the given revs.
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	308
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	309 If multiple revisions are specified, the matcher is the union of all
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	310 revs.
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	311
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	312 ``includetemp`` indicates whether to use the temporary sparse profile.
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	313 """
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	314 # If sparse isn't enabled, sparse matcher matches everything.
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	315 if not enabled:
41687 0531dff73d0b match: delete unused root and cwd arguments from {always,never,exact}() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41686 diff changeset	316 return matchmod.always()
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	317
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	318 if not revs or revs == [None]:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	319 revs = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	320 repo.changelog.rev(node)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	321 for node in repo.dirstate.parents()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	322 if node != nullid
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	323 ]
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	324
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	325 signature = configsignature(repo, includetemp=includetemp)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	326
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	327 key = b'%s %s' % (signature, b' '.join(map(pycompat.bytestr, revs)))
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	328
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	329 result = repo._sparsematchercache.get(key)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	330 if result:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	331 return result
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	332
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	333 matchers = []
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	334 for rev in revs:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	335 try:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	336 includes, excludes, profiles = patternsforrev(repo, rev)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	337
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	338 if includes or excludes:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	339 matcher = matchmod.match(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	340 repo.root,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	341 b'',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	342 [],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	343 include=includes,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	344 exclude=excludes,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	345 default=b'relpath',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	346 )
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	347 matchers.append(matcher)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	348 except IOError:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	349 pass
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	350
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	351 if not matchers:
41687 0531dff73d0b match: delete unused root and cwd arguments from {always,never,exact}() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41686 diff changeset	352 result = matchmod.always()
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	353 elif len(matchers) == 1:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	354 result = matchers[0]
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	355 else:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	356 result = matchmod.unionmatcher(matchers)
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	357
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	358 if includetemp:
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	359 tempincludes = readtemporaryincludes(repo)
33447 6f4e5e5940a5 match: write forceincludematcher using unionmatcher Martin von Zweigbergk <martinvonz@google.com> parents: 33376 diff changeset	360 result = forceincludematcher(result, tempincludes)
33320 153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	361
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	362 repo._sparsematchercache[key] = result
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	363
153456f02426 sparse: move function for resolving sparse matcher into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33318 diff changeset	364 return result
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	365
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	366
45311 d70c972cec74 sparse: pass mergeresult obj in sparse.filterupdatesactions() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45106 diff changeset	367 def filterupdatesactions(repo, wctx, mctx, branchmerge, mresult):
33323 252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33322 diff changeset	368 """Filter updates to only lay out files that match the sparse rules."""
252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33322 diff changeset	369 if not enabled:
45311 d70c972cec74 sparse: pass mergeresult obj in sparse.filterupdatesactions() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45106 diff changeset	370 return
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	371
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	372 oldrevs = [pctx.rev() for pctx in wctx.parents()]
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	373 oldsparsematch = matcher(repo, oldrevs)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	374
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	375 if oldsparsematch.always():
45311 d70c972cec74 sparse: pass mergeresult obj in sparse.filterupdatesactions() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45106 diff changeset	376 return
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	377
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	378 files = set()
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	379 prunedactions = {}
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	380
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	381 if branchmerge:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	382 # If we're merging, use the wctx filter, since we're merging into
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	383 # the wctx.
41419 0bd56c291359 cleanup: use p1() and p2() instead of parents()[0] and parents()[1] Martin von Zweigbergk <martinvonz@google.com> parents: 41042 diff changeset	384 sparsematch = matcher(repo, [wctx.p1().rev()])
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	385 else:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	386 # If we're updating, use the target context's filter, since we're
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	387 # moving to the target context.
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	388 sparsematch = matcher(repo, [mctx.rev()])
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	389
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	390 temporaryfiles = []
45311 d70c972cec74 sparse: pass mergeresult obj in sparse.filterupdatesactions() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45106 diff changeset	391 for file, action in pycompat.iteritems(mresult.actions):
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	392 type, args, msg = action
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	393 files.add(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	394 if sparsematch(file):
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	395 prunedactions[file] = action
45315 30f3e278c5d7 mergeactions: use action constants instead of string values Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	396 elif type == mergestatemod.ACTION_MERGE:
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	397 temporaryfiles.append(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	398 prunedactions[file] = action
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	399 elif branchmerge:
45315 30f3e278c5d7 mergeactions: use action constants instead of string values Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	400 if type != mergestatemod.ACTION_KEEP:
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	401 temporaryfiles.append(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	402 prunedactions[file] = action
45315 30f3e278c5d7 mergeactions: use action constants instead of string values Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	403 elif type == mergestatemod.ACTION_FORGET:
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	404 prunedactions[file] = action
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	405 elif file in wctx:
45315 30f3e278c5d7 mergeactions: use action constants instead of string values Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	406 prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg)
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	407
45316 6a8eafaeff3b sparse: add comment for an if condition which I tried to refactor Pulkit Goyal <7895pulkit@gmail.com> parents: 45315 diff changeset	408 # in case or rename on one side, it is possible that f1 might not
6a8eafaeff3b sparse: add comment for an if condition which I tried to refactor Pulkit Goyal <7895pulkit@gmail.com> parents: 45315 diff changeset	409 # be present in sparse checkout we should include it
6a8eafaeff3b sparse: add comment for an if condition which I tried to refactor Pulkit Goyal <7895pulkit@gmail.com> parents: 45315 diff changeset	410 # TODO: should we do the same for f2?
6a8eafaeff3b sparse: add comment for an if condition which I tried to refactor Pulkit Goyal <7895pulkit@gmail.com> parents: 45315 diff changeset	411 # exists as a separate check because file can be in sparse and hence
6a8eafaeff3b sparse: add comment for an if condition which I tried to refactor Pulkit Goyal <7895pulkit@gmail.com> parents: 45315 diff changeset	412 # if we try to club this condition in above `elif type == ACTION_MERGE`
6a8eafaeff3b sparse: add comment for an if condition which I tried to refactor Pulkit Goyal <7895pulkit@gmail.com> parents: 45315 diff changeset	413 # it won't be triggered
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44060 diff changeset	414 if branchmerge and type == mergestatemod.ACTION_MERGE:
39544 9db856446298 sparse: add local files to temporaryfiles if they exist out of sparse Pulkit Goyal <pulkit@yandex-team.ru> parents: 38901 diff changeset	415 f1, f2, fa, move, anc = args
9db856446298 sparse: add local files to temporaryfiles if they exist out of sparse Pulkit Goyal <pulkit@yandex-team.ru> parents: 38901 diff changeset	416 if not sparsematch(f1):
9db856446298 sparse: add local files to temporaryfiles if they exist out of sparse Pulkit Goyal <pulkit@yandex-team.ru> parents: 38901 diff changeset	417 temporaryfiles.append(f1)
9db856446298 sparse: add local files to temporaryfiles if they exist out of sparse Pulkit Goyal <pulkit@yandex-team.ru> parents: 38901 diff changeset	418
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	419 if len(temporaryfiles) > 0:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	420 repo.ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	421 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	422 b'temporarily included %d file(s) in the sparse '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	423 b'checkout for merging\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	424 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	425 % len(temporaryfiles)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	426 )
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	427 addtemporaryincludes(repo, temporaryfiles)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	428
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	429 # Add the new files to the working copy so they can be merged, etc
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	430 tmresult = mergemod.mergeresult()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	431 message = b'temporarily adding to sparse checkout'
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	432 wctxmanifest = repo[None].manifest()
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	433 for file in temporaryfiles:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	434 if file in wctxmanifest:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	435 fctx = repo[None][file]
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	436 tmresult.addfile(
b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	437 file,
b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	438 mergestatemod.ACTION_GET,
b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	439 (fctx.flags(), False),
b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	440 message,
b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	441 )
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	442
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	443 mergemod.applyupdates(
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	444 repo, tmresult, repo[None], repo[b'.'], False, wantfiledata=False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	445 )
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	446
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	447 dirstate = repo.dirstate
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	448 for file, flags, msg in tmresult.getactions([mergestatemod.ACTION_GET]):
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	449 dirstate.normal(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	450
33370 482320104672 sparse: refactor activeprofiles into a generic function (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 33356 diff changeset	451 profiles = activeconfig(repo)[2]
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	452 changedprofiles = profiles & files
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	453 # If an active profile changed during the update, refresh the checkout.
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	454 # Don't do this during a branch merge, since all incoming changes should
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	455 # have been handled by the temporary includes above.
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	456 if changedprofiles and not branchmerge:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	457 mf = mctx.manifest()
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	458 for file in mf:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	459 old = oldsparsematch(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	460 new = sparsematch(file)
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	461 if not old and new:
fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	462 flags = mf.flags(file)
45315 30f3e278c5d7 mergeactions: use action constants instead of string values Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	463 prunedactions[file] = (
30f3e278c5d7 mergeactions: use action constants instead of string values Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	464 mergestatemod.ACTION_GET,
30f3e278c5d7 mergeactions: use action constants instead of string values Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	465 (flags, False),
30f3e278c5d7 mergeactions: use action constants instead of string values Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	466 b'',
30f3e278c5d7 mergeactions: use action constants instead of string values Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	467 )
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	468 elif old and not new:
45315 30f3e278c5d7 mergeactions: use action constants instead of string values Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	469 prunedactions[file] = (mergestatemod.ACTION_REMOVE, [], b'')
33322 fa6c2c3064fd sparse: move update action filtering into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	470
45311 d70c972cec74 sparse: pass mergeresult obj in sparse.filterupdatesactions() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45106 diff changeset	471 mresult.setactions(prunedactions)
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	472
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	473
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	474 def refreshwdir(repo, origstatus, origsparsematch, force=False):
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	475 """Refreshes working directory by taking sparse config into account.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	476
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	477 The old status and sparse matcher is compared against the current sparse
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	478 matcher.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	479
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	480 Will abort if a file with pending changes is being excluded or included
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	481 unless ``force`` is True.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	482 """
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	483 # Verify there are no pending changes
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	484 pending = set()
33356 ccb3e5399921 sparse: access status fields by name instead of deconstructing it Martin von Zweigbergk <martinvonz@google.com> parents: 33355 diff changeset	485 pending.update(origstatus.modified)
ccb3e5399921 sparse: access status fields by name instead of deconstructing it Martin von Zweigbergk <martinvonz@google.com> parents: 33355 diff changeset	486 pending.update(origstatus.added)
ccb3e5399921 sparse: access status fields by name instead of deconstructing it Martin von Zweigbergk <martinvonz@google.com> parents: 33355 diff changeset	487 pending.update(origstatus.removed)
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	488 sparsematch = matcher(repo)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	489 abort = False
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	490
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	491 for f in pending:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	492 if not sparsematch(f):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	493 repo.ui.warn(_(b"pending changes to '%s'\n") % f)
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	494 abort = not force
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	495
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	496 if abort:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	497 raise error.Abort(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	498 _(b'could not update sparseness due to pending changes')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	499 )
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	500
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	501 # Calculate merge result
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	502 dirstate = repo.dirstate
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	503 ctx = repo[b'.']
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	504 added = []
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	505 lookup = []
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	506 dropped = []
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	507 mf = ctx.manifest()
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	508 files = set(mf)
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	509 mresult = mergemod.mergeresult()
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	510
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	511 for file in files:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	512 old = origsparsematch(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	513 new = sparsematch(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	514 # Add files that are newly included, or that don't exist in
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	515 # the dirstate yet.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	516 if (new and not old) or (old and new and not file in dirstate):
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	517 fl = mf.flags(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	518 if repo.wvfs.exists(file):
45360 9320f66854f6 sparse: replace merge action values with mergestate.ACTION_* constants Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	519 mresult.addfile(file, mergestatemod.ACTION_EXEC, (fl,), b'')
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	520 lookup.append(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	521 else:
45360 9320f66854f6 sparse: replace merge action values with mergestate.ACTION_* constants Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	522 mresult.addfile(
9320f66854f6 sparse: replace merge action values with mergestate.ACTION_* constants Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	523 file, mergestatemod.ACTION_GET, (fl, False), b''
9320f66854f6 sparse: replace merge action values with mergestate.ACTION_* constants Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	524 )
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	525 added.append(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	526 # Drop files that are newly excluded, or that still exist in
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	527 # the dirstate.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	528 elif (old and not new) or (not old and not new and file in dirstate):
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	529 dropped.append(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	530 if file not in pending:
45360 9320f66854f6 sparse: replace merge action values with mergestate.ACTION_* constants Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	531 mresult.addfile(file, mergestatemod.ACTION_REMOVE, [], b'')
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	532
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	533 # Verify there are no pending changes in newly included files
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	534 abort = False
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	535 for file in lookup:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	536 repo.ui.warn(_(b"pending changes to '%s'\n") % file)
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	537 abort = not force
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	538 if abort:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	539 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	540 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	541 b'cannot change sparseness due to pending '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	542 b'changes (delete the files or use '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	543 b'--force to bring them back dirty)'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	544 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	545 )
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	546
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	547 # Check for files that were only in the dirstate.
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	548 for file, state in pycompat.iteritems(dirstate):
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	549 if not file in files:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	550 old = origsparsematch(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	551 new = sparsematch(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	552 if old and not new:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	553 dropped.append(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	554
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	555 mergemod.applyupdates(
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45316 diff changeset	556 repo, mresult, repo[None], repo[b'.'], False, wantfiledata=False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	557 )
33324 33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	558
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	559 # Fix dirstate
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	560 for file in added:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	561 dirstate.normal(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	562
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	563 for file in dropped:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	564 dirstate.drop(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	565
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	566 for file in lookup:
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	567 # File exists on disk, and we're bringing it back in an unknown state.
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	568 dirstate.normallookup(file)
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	569
33d0859c37bd sparse: move working directory refreshing into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33323 diff changeset	570 return added, dropped, lookup
33353 160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	571
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	572
33353 160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	573 def aftercommit(repo, node):
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	574 """Perform actions after a working directory commit."""
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	575 # This function is called unconditionally, even if sparse isn't
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	576 # enabled.
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	577 ctx = repo[node]
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	578
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	579 profiles = patternsforrev(repo, ctx.rev())[2]
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	580
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	581 # profiles will only have data if sparse is enabled.
33550 32f348d741e5 sparse: use set for capturing profiles Gregory Szorc <gregory.szorc@gmail.com> parents: 33499 diff changeset	582 if profiles & set(ctx.files()):
33353 160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	583 origstatus = repo.status()
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	584 origsparsematch = matcher(repo)
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	585 refreshwdir(repo, origstatus, origsparsematch, force=True)
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	586
160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33325 diff changeset	587 prunetemporaryincludes(repo)
33354 4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	588
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	589
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	590 def _updateconfigandrefreshwdir(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	591 repo, includes, excludes, profiles, force=False, removing=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	592 ):
33555 6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	593 """Update the sparse config and working directory state."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	594 raw = repo.vfs.tryread(b'sparse')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	595 oldincludes, oldexcludes, oldprofiles = parseconfig(repo.ui, raw, b'sparse')
33555 6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	596
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	597 oldstatus = repo.status()
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	598 oldmatch = matcher(repo)
33556 22371eabb3b1 sparse: add a requirement when a repository uses sparse (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33555 diff changeset	599 oldrequires = set(repo.requirements)
33555 6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	600
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	601 # TODO remove this try..except once the matcher integrates better
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	602 # with dirstate. We currently have to write the updated config
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	603 # because that will invalidate the matcher cache and force a
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	604 # re-read. We ideally want to update the cached matcher on the
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	605 # repo instance then flush the new config to disk once wdir is
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	606 # updated. But this requires massive rework to matcher() and its
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	607 # consumers.
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	608
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	609 if b'exp-sparse' in oldrequires and removing:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	610 repo.requirements.discard(b'exp-sparse')
45106 a03c177a4679 scmutil: add writereporequirements() and route requires writing through it Pulkit Goyal <7895pulkit@gmail.com> parents: 44915 diff changeset	611 scmutil.writereporequirements(repo)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	612 elif b'exp-sparse' not in oldrequires:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	613 repo.requirements.add(b'exp-sparse')
45106 a03c177a4679 scmutil: add writereporequirements() and route requires writing through it Pulkit Goyal <7895pulkit@gmail.com> parents: 44915 diff changeset	614 scmutil.writereporequirements(repo)
33555 6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	615
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	616 try:
33556 22371eabb3b1 sparse: add a requirement when a repository uses sparse (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33555 diff changeset	617 writeconfig(repo, includes, excludes, profiles)
33555 6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	618 return refreshwdir(repo, oldstatus, oldmatch, force=force)
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	619 except Exception:
33556 22371eabb3b1 sparse: add a requirement when a repository uses sparse (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33555 diff changeset	620 if repo.requirements != oldrequires:
22371eabb3b1 sparse: add a requirement when a repository uses sparse (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33555 diff changeset	621 repo.requirements.clear()
22371eabb3b1 sparse: add a requirement when a repository uses sparse (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 33555 diff changeset	622 repo.requirements \|= oldrequires
45106 a03c177a4679 scmutil: add writereporequirements() and route requires writing through it Pulkit Goyal <7895pulkit@gmail.com> parents: 44915 diff changeset	623 scmutil.writereporequirements(repo)
33555 6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	624 writeconfig(repo, oldincludes, oldexcludes, oldprofiles)
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	625 raise
6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	626
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	627
33354 4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	628 def clearrules(repo, force=False):
4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	629 """Clears include/exclude rules from the sparse config.
4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	630
4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	631 The remaining sparse config only has profiles, if defined. The working
4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	632 directory is refreshed, as needed.
4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	633 """
4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	634 with repo.wlock():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	635 raw = repo.vfs.tryread(b'sparse')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	636 includes, excludes, profiles = parseconfig(repo.ui, raw, b'sparse')
33354 4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	637
4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	638 if not includes and not excludes:
4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	639 return
4695f1829045 sparse: move code for clearing rules to core Gregory Szorc <gregory.szorc@gmail.com> parents: 33353 diff changeset	640
33555 6755b719048c sparse: consolidate common code for writing sparse config Gregory Szorc <gregory.szorc@gmail.com> parents: 33551 diff changeset	641 _updateconfigandrefreshwdir(repo, set(), set(), profiles, force=force)
33355 9087f9997f42 sparse: move printing of sparse config changes function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33354 diff changeset	642
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	643
33371 c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	644 def importfromfiles(repo, opts, paths, force=False):
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	645 """Import sparse config rules from files.
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	646
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	647 The updated sparse config is written out and the working directory
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	648 is refreshed, as needed.
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	649 """
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	650 with repo.wlock():
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	651 # read current configuration
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	652 raw = repo.vfs.tryread(b'sparse')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	653 includes, excludes, profiles = parseconfig(repo.ui, raw, b'sparse')
33371 c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	654 aincludes, aexcludes, aprofiles = activeconfig(repo)
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	655
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	656 # Import rules on top; only take in rules that are not yet
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	657 # part of the active rules.
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	658 changed = False
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	659 for p in paths:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	660 with util.posixfile(util.expandpath(p), mode=b'rb') as fh:
33371 c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	661 raw = fh.read()
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	662
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	663 iincludes, iexcludes, iprofiles = parseconfig(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	664 repo.ui, raw, b'sparse'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	665 )
33371 c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	666 oldsize = len(includes) + len(excludes) + len(profiles)
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	667 includes.update(iincludes - aincludes)
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	668 excludes.update(iexcludes - aexcludes)
33550 32f348d741e5 sparse: use set for capturing profiles Gregory Szorc <gregory.szorc@gmail.com> parents: 33499 diff changeset	669 profiles.update(iprofiles - aprofiles)
33371 c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	670 if len(includes) + len(excludes) + len(profiles) > oldsize:
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	671 changed = True
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	672
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	673 profilecount = includecount = excludecount = 0
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	674 fcounts = (0, 0, 0)
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	675
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	676 if changed:
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	677 profilecount = len(profiles - aprofiles)
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	678 includecount = len(includes - aincludes)
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	679 excludecount = len(excludes - aexcludes)
c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	680
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	681 fcounts = map(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	682 len,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	683 _updateconfigandrefreshwdir(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	684 repo, includes, excludes, profiles, force=force
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	685 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	686 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	687
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	688 printchanges(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	689 repo.ui, opts, profilecount, includecount, excludecount, *fcounts
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	690 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	691
33371 c6415195fa78 sparse: move code for importing rules from files into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33370 diff changeset	692
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	693 def updateconfig(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	694 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	695 pats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	696 opts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	697 include=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	698 exclude=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	699 reset=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	700 delete=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	701 enableprofile=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	702 disableprofile=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	703 force=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	704 usereporootpaths=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	705 ):
33374 4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	706 """Perform a sparse config update.
4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	707
4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	708 Only one of the actions may be performed.
4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	709
4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	710 The new config is written out and a working directory refresh is performed.
4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	711 """
33375 df6dd6d536bb sparse: clean up updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33374 diff changeset	712 with repo.wlock():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	713 raw = repo.vfs.tryread(b'sparse')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	714 oldinclude, oldexclude, oldprofiles = parseconfig(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	715 repo.ui, raw, b'sparse'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	716 )
33374 4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	717
33376 d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	718 if reset:
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	719 newinclude = set()
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	720 newexclude = set()
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	721 newprofiles = set()
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	722 else:
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	723 newinclude = set(oldinclude)
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	724 newexclude = set(oldexclude)
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	725 newprofiles = set(oldprofiles)
33374 4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	726
33709 7dcb517122f9 sparse: properly error out when absolute paths are used Kostia Balytskyi <ikostia@fb.com> parents: 33556 diff changeset	727 if any(os.path.isabs(pat) for pat in pats):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	728 raise error.Abort(_(b'paths cannot be absolute'))
33709 7dcb517122f9 sparse: properly error out when absolute paths are used Kostia Balytskyi <ikostia@fb.com> parents: 33556 diff changeset	729
33711 e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	730 if not usereporootpaths:
e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	731 # let's treat paths as relative to cwd
e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	732 root, cwd = repo.root, repo.getcwd()
e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	733 abspats = []
e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	734 for kindpat in pats:
e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	735 kind, pat = matchmod._patsplit(kindpat, None)
e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	736 if kind in matchmod.cwdrelativepatternkinds or kind is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	737 ap = (kind + b':' if kind else b'') + pathutil.canonpath(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	738 root, cwd, pat
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	739 )
33711 e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	740 abspats.append(ap)
e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	741 else:
e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	742 abspats.append(kindpat)
e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	743 pats = abspats
e1c56486d1aa sparse: treat paths as cwd-relative Kostia Balytskyi <ikostia@fb.com> parents: 33709 diff changeset	744
33709 7dcb517122f9 sparse: properly error out when absolute paths are used Kostia Balytskyi <ikostia@fb.com> parents: 33556 diff changeset	745 if include:
33376 d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	746 newinclude.update(pats)
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	747 elif exclude:
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	748 newexclude.update(pats)
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	749 elif enableprofile:
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	750 newprofiles.update(pats)
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	751 elif disableprofile:
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	752 newprofiles.difference_update(pats)
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	753 elif delete:
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	754 newinclude.difference_update(pats)
d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	755 newexclude.difference_update(pats)
33374 4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	756
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	757 profilecount = len(newprofiles - oldprofiles) - len(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	758 oldprofiles - newprofiles
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	759 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	760 includecount = len(newinclude - oldinclude) - len(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	761 oldinclude - newinclude
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	762 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	763 excludecount = len(newexclude - oldexclude) - len(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	764 oldexclude - newexclude
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	765 )
33374 4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	766
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	767 fcounts = map(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	768 len,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	769 _updateconfigandrefreshwdir(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	770 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	771 newinclude,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	772 newexclude,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	773 newprofiles,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	774 force=force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	775 removing=reset,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	776 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	777 )
33376 d5a38eae67e5 sparse: shorten try..except block in updateconfig() Gregory Szorc <gregory.szorc@gmail.com> parents: 33375 diff changeset	778
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	779 printchanges(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	780 repo.ui, opts, profilecount, includecount, excludecount, *fcounts
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	781 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	782
33374 4dc04cdf2520 sparse: move config updating function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33371 diff changeset	783
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	784 def printchanges(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	785 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	786 opts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	787 profilecount=0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	788 includecount=0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	789 excludecount=0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	790 added=0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	791 dropped=0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	792 conflicting=0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	793 ):
33355 9087f9997f42 sparse: move printing of sparse config changes function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33354 diff changeset	794 """Print output summarizing sparse config changes."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	795 with ui.formatter(b'sparse', opts) as fm:
33355 9087f9997f42 sparse: move printing of sparse config changes function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33354 diff changeset	796 fm.startitem()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	797 fm.condwrite(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	798 ui.verbose,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	799 b'profiles_added',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	800 _(b'Profiles changed: %d\n'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	801 profilecount,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	802 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	803 fm.condwrite(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	804 ui.verbose,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	805 b'include_rules_added',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	806 _(b'Include rules changed: %d\n'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	807 includecount,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	808 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	809 fm.condwrite(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	810 ui.verbose,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	811 b'exclude_rules_added',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	812 _(b'Exclude rules changed: %d\n'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	813 excludecount,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	814 )
33355 9087f9997f42 sparse: move printing of sparse config changes function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33354 diff changeset	815
9087f9997f42 sparse: move printing of sparse config changes function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33354 diff changeset	816 # In 'plain' verbose mode, mergemod.applyupdates already outputs what
9087f9997f42 sparse: move printing of sparse config changes function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33354 diff changeset	817 # files are added or removed outside of the templating formatter
9087f9997f42 sparse: move printing of sparse config changes function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33354 diff changeset	818 # framework. No point in repeating ourselves in that case.
9087f9997f42 sparse: move printing of sparse config changes function into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33354 diff changeset	819 if not fm.isplain():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	820 fm.condwrite(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	821 ui.verbose, b'files_added', _(b'Files added: %d\n'), added
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	822 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	823 fm.condwrite(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	824 ui.verbose, b'files_dropped', _(b'Files dropped: %d\n'), dropped
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	825 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	826 fm.condwrite(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	827 ui.verbose,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	828 b'files_conflicting',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	829 _(b'Files conflicting: %d\n'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	830 conflicting,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42472 diff changeset	831 )

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/sparse.py @ 45360:9320f66854f6