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

annotate mercurial/scmutil.py @ 20364:a6cf48b2880d

revset: added baseset class (still empty) to improve revset performance This class is going to be used to cache the set that is created from this list in many cases while evaluating a revset.

author	Lucas Moscovicz <lmoscovicz@fb.com>
date	Tue, 21 Jan 2014 11:39:26 -0800
parents	88d8e568add1
children	d4f804caa0ed

rev	line source
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	1 # scmutil.py - Mercurial core utility functions
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	2 #
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	3 # Copyright Matt Mackall <mpm@selenic.com>
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	4 #
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	7
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	8 from i18n import _
18466 ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18450 diff changeset	9 from mercurial.node import nullrev
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18898 diff changeset	10 import util, error, osutil, revset, similar, encoding, phases, parsers
20033 f962870712da pathutil: tease out a new library to break an import cycle from canonpath use Augie Fackler <raf@durin42.com> parents: 20006 diff changeset	11 import pathutil
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	12 import match as matchmod
20033 f962870712da pathutil: tease out a new library to break an import cycle from canonpath use Augie Fackler <raf@durin42.com> parents: 20006 diff changeset	13 import os, errno, re, glob
18690 4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	14
4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	15 if os.name == 'nt':
4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	16 import scmwindows as scmplatform
4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	17 else:
4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	18 import scmposix as scmplatform
4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	19
4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	20 systemrcpath = scmplatform.systemrcpath
4c6f7f0dadab scmutil: split platform-specific bits into their own modules Kevin Bullock <kbullock@ringworld.org> parents: 18678 diff changeset	21 userrcpath = scmplatform.userrcpath
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	22
17248 6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	23 def nochangesfound(ui, repo, excluded=None):
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	24 '''Report no changes for push/pull, excluded is None or a list of
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	25 nodes excluded from the push/pull.
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	26 '''
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	27 secretlist = []
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	28 if excluded:
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	29 for n in excluded:
18617 227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18466 diff changeset	30 if n not in repo:
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18466 diff changeset	31 # discovery should not have included the filtered revision,
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18466 diff changeset	32 # we have to explicitly exclude it until discovery is cleanup.
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18466 diff changeset	33 continue
17248 6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	34 ctx = repo[n]
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	35 if ctx.phase() >= phases.secret and not ctx.extinct():
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	36 secretlist.append(n)
6ffb35b2284c discovery: add extinct changesets to outgoing.excluded Patrick Mezard <patrick@mezard.eu> parents: 17201 diff changeset	37
15993 0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	38 if secretlist:
0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	39 ui.status(_("no changes found (ignored %d secret changesets)\n")
0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	40 % len(secretlist))
0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	41 else:
0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	42 ui.status(_("no changes found\n"))
0b05e0bfdc1c scmutil: unify some 'no changes found' messages Matt Mackall <mpm@selenic.com> parents: 15797 diff changeset	43
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17817 diff changeset	44 def checknewlabel(repo, lbl, kind):
19070 290a61833b99 translations: change label integer error to not specify the kind of label Durham Goode <durham@fb.com> parents: 18951 diff changeset	45 # Do not use the "kind" parameter in ui output.
290a61833b99 translations: change label integer error to not specify the kind of label Durham Goode <durham@fb.com> parents: 18951 diff changeset	46 # It makes strings difficult to translate.
17817 b17be267b59c scmutil: add function to validate new branch, tag, and bookmark names Kevin Bullock <kbullock@ringworld.org> parents: 17768 diff changeset	47 if lbl in ['tip', '.', 'null']:
b17be267b59c scmutil: add function to validate new branch, tag, and bookmark names Kevin Bullock <kbullock@ringworld.org> parents: 17768 diff changeset	48 raise util.Abort(_("the name '%s' is reserved") % lbl)
17821 361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17817 diff changeset	49 for c in (':', '\0', '\n', '\r'):
361ab1e2086f scmutil: add bad character checking to checknewlabel Kevin Bullock <kbullock@ringworld.org> parents: 17817 diff changeset	50 if c in lbl:
17850 71c1513fd560 scmutil: generalize message to make it more i18n-friendly Wagner Bruna <wbruna@yahoo.com> parents: 17846 diff changeset	51 raise util.Abort(_("%r cannot be used in a name") % c)
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	52 try:
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	53 int(lbl)
19070 290a61833b99 translations: change label integer error to not specify the kind of label Durham Goode <durham@fb.com> parents: 18951 diff changeset	54 raise util.Abort(_("cannot use an integer as a name"))
18566 341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	55 except ValueError:
341868ef0cf6 bookmark: don't allow integers as bookmark/branch/tag names Durham Goode <durham@fb.com> parents: 18560 diff changeset	56 pass
17817 b17be267b59c scmutil: add function to validate new branch, tag, and bookmark names Kevin Bullock <kbullock@ringworld.org> parents: 17768 diff changeset	57
13974 23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	58 def checkfilename(f):
23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	59 '''Check that the filename f is an acceptable filename for a tracked file'''
23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	60 if '\r' in f or '\n' in f:
23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	61 raise util.Abort(_("'\\n' and '\\r' disallowed in filenames: %r") % f)
23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	62
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	63 def checkportable(ui, f):
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	64 '''Check if filename f is portable and warn or abort depending on config'''
13974 23f2736abce3 move checkfilename from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13973 diff changeset	65 checkfilename(f)
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	66 abort, warn = checkportabilityalert(ui)
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	67 if abort or warn:
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	68 msg = util.checkwinfilename(f)
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	69 if msg:
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	70 msg = "%s: %r" % (msg, f)
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	71 if abort:
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	72 raise util.Abort(msg)
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	73 ui.warn(_("warning: %s\n") % msg)
14068 04ce8fa1015d add: notify when adding a file that would cause a case-folding collision Kevin Gessner <kevin@kevingessner.com> parents: 14067 diff changeset	74
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	75 def checkportabilityalert(ui):
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	76 '''check if the user's config requests nothing, a warning, or abort for
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	77 non-portable filenames'''
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	78 val = ui.config('ui', 'portablefilenames', 'warn')
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	79 lval = val.lower()
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	80 bval = util.parsebool(val)
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	81 abort = os.name == 'nt' or lval == 'abort'
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	82 warn = bval or lval == 'warn'
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	83 if bval is None and not (warn or abort or lval == 'ignore'):
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	84 raise error.ConfigError(
8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: diff changeset	85 _("ui.portablefilenames value is invalid ('%s')") % val)
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	86 return abort, warn
e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	87
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	88 class casecollisionauditor(object):
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	89 def __init__(self, ui, abort, dirstate):
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	90 self._ui = ui
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	91 self._abort = abort
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	92 allfiles = '\0'.join(dirstate._map)
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	93 self._loweredfiles = set(encoding.lower(allfiles).split('\0'))
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	94 self._dirstate = dirstate
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	95 # The purpose of _newfiles is so that we don't complain about
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	96 # case collisions if someone were to call this object with the
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	97 # same filename twice.
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	98 self._newfiles = set()
14067 e88a4958a6b7 scmutil: refactor ui.portablefilenames processing Kevin Gessner <kevin@kevingessner.com> parents: 13986 diff changeset	99
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	100 def __call__(self, f):
20006 9276014db865 scmutil: skip checks in "casecollisionauditor" if filename is already checked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19900 diff changeset	101 if f in self._newfiles:
9276014db865 scmutil: skip checks in "casecollisionauditor" if filename is already checked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19900 diff changeset	102 return
14980 28e98a8b173d i18n: use UTF-8 string to lower filename for case collision check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 14861 diff changeset	103 fl = encoding.lower(f)
20006 9276014db865 scmutil: skip checks in "casecollisionauditor" if filename is already checked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19900 diff changeset	104 if fl in self._loweredfiles and f not in self._dirstate:
14138 c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	105 msg = _('possible case-folding collision for %s') % f
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	106 if self._abort:
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	107 raise util.Abort(msg)
c18204fd35b0 scmutil: introduce casecollisionauditor Adrian Buehlmann <adrian@cadifra.com> parents: 14097 diff changeset	108 self._ui.warn(_("warning: %s\n") % msg)
17201 afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	109 self._loweredfiles.add(fl)
afd75476939e scmutil: 25% speedup in casecollisionauditor Joshua Redstone <joshua.redstone@fb.com> parents: 17161 diff changeset	110 self._newfiles.add(f)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	111
17649 f65c6a5f256c scmutil: rename classes from "opener" to "vfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17561 diff changeset	112 class abstractvfs(object):
14089 d3f7e110c3c0 opener: introduce an abstact superclass of it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14068 diff changeset	113 """Abstract base class; cannot be instantiated"""
d3f7e110c3c0 opener: introduce an abstact superclass of it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14068 diff changeset	114
d3f7e110c3c0 opener: introduce an abstact superclass of it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14068 diff changeset	115 def __init__(self, args, *kwargs):
d3f7e110c3c0 opener: introduce an abstact superclass of it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14068 diff changeset	116 '''Prevent instantiation; don't call this from subclasses.'''
d3f7e110c3c0 opener: introduce an abstact superclass of it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14068 diff changeset	117 raise NotImplementedError('attempted instantiating ' + str(type(self)))
d3f7e110c3c0 opener: introduce an abstact superclass of it Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14068 diff changeset	118
16455 154219f3a6a4 opener: introduce tryread helper Matt Mackall <mpm@selenic.com> parents: 16436 diff changeset	119 def tryread(self, path):
16479 fc04698fa778 opener: coding style, use triple quotes for doc string Thomas Arendsen Hein <thomas@intevation.de> parents: 16455 diff changeset	120 '''gracefully return an empty string for missing files'''
16455 154219f3a6a4 opener: introduce tryread helper Matt Mackall <mpm@selenic.com> parents: 16436 diff changeset	121 try:
154219f3a6a4 opener: introduce tryread helper Matt Mackall <mpm@selenic.com> parents: 16436 diff changeset	122 return self.read(path)
154219f3a6a4 opener: introduce tryread helper Matt Mackall <mpm@selenic.com> parents: 16436 diff changeset	123 except IOError, inst:
154219f3a6a4 opener: introduce tryread helper Matt Mackall <mpm@selenic.com> parents: 16436 diff changeset	124 if inst.errno != errno.ENOENT:
154219f3a6a4 opener: introduce tryread helper Matt Mackall <mpm@selenic.com> parents: 16436 diff changeset	125 raise
154219f3a6a4 opener: introduce tryread helper Matt Mackall <mpm@selenic.com> parents: 16436 diff changeset	126 return ""
154219f3a6a4 opener: introduce tryread helper Matt Mackall <mpm@selenic.com> parents: 16436 diff changeset	127
19897 896a4568def7 vfs: add "open()" for newly added code paths which open files via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19896 diff changeset	128 def open(self, path, mode="r", text=False, atomictemp=False):
896a4568def7 vfs: add "open()" for newly added code paths which open files via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19896 diff changeset	129 self.open = self.__call__
896a4568def7 vfs: add "open()" for newly added code paths which open files via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19896 diff changeset	130 return self.__call__(path, mode, text, atomictemp)
896a4568def7 vfs: add "open()" for newly added code paths which open files via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19896 diff changeset	131
14167 0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	132 def read(self, path):
0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	133 fp = self(path, 'rb')
14097 ca3376f044f8 opener: add read & write utility methods Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14090 diff changeset	134 try:
ca3376f044f8 opener: add read & write utility methods Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14090 diff changeset	135 return fp.read()
ca3376f044f8 opener: add read & write utility methods Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14090 diff changeset	136 finally:
ca3376f044f8 opener: add read & write utility methods Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14090 diff changeset	137 fp.close()
ca3376f044f8 opener: add read & write utility methods Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14090 diff changeset	138
14167 0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	139 def write(self, path, data):
0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	140 fp = self(path, 'wb')
0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	141 try:
0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	142 return fp.write(data)
0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	143 finally:
0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	144 fp.close()
0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	145
0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	146 def append(self, path, data):
0e4753807c93 util & scmutil: adapt read/write helpers as request by mpm Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14138 diff changeset	147 fp = self(path, 'ab')
14097 ca3376f044f8 opener: add read & write utility methods Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14090 diff changeset	148 try:
ca3376f044f8 opener: add read & write utility methods Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14090 diff changeset	149 return fp.write(data)
ca3376f044f8 opener: add read & write utility methods Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14090 diff changeset	150 finally:
ca3376f044f8 opener: add read & write utility methods Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14090 diff changeset	151 fp.close()
ca3376f044f8 opener: add read & write utility methods Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14090 diff changeset	152
20086 f3df2612f3c3 vfs: add "chmod()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20085 diff changeset	153 def chmod(self, path, mode):
f3df2612f3c3 vfs: add "chmod()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20085 diff changeset	154 return os.chmod(self.join(path), mode)
f3df2612f3c3 vfs: add "chmod()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20085 diff changeset	155
17161 be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	156 def exists(self, path=None):
be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	157 return os.path.exists(self.join(path))
be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	158
19899 8c3dcbbfb5de changelog: use "vfs.fstat()" instead of "util.fstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19897 diff changeset	159 def fstat(self, fp):
8c3dcbbfb5de changelog: use "vfs.fstat()" instead of "util.fstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19897 diff changeset	160 return util.fstat(fp)
8c3dcbbfb5de changelog: use "vfs.fstat()" instead of "util.fstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19897 diff changeset	161
17161 be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	162 def isdir(self, path=None):
be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	163 return os.path.isdir(self.join(path))
be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	164
20085 589d6bb5b18d vfs: add "isfile()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20045 diff changeset	165 def isfile(self, path=None):
589d6bb5b18d vfs: add "isfile()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20045 diff changeset	166 return os.path.isfile(self.join(path))
589d6bb5b18d vfs: add "isfile()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20045 diff changeset	167
18949 138978f20180 localrepo: use "vfs.islink()" instead of "os.path.islink()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18948 diff changeset	168 def islink(self, path=None):
138978f20180 localrepo: use "vfs.islink()" instead of "os.path.islink()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18948 diff changeset	169 return os.path.islink(self.join(path))
138978f20180 localrepo: use "vfs.islink()" instead of "os.path.islink()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18948 diff changeset	170
19900 7c21e3398931 context: use "vfs.lstat()" instead of "os.lstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19899 diff changeset	171 def lstat(self, path=None):
7c21e3398931 context: use "vfs.lstat()" instead of "os.lstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19899 diff changeset	172 return os.lstat(self.join(path))
7c21e3398931 context: use "vfs.lstat()" instead of "os.lstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19899 diff changeset	173
17161 be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	174 def makedir(self, path=None, notindexed=True):
be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	175 return util.makedir(self.join(path), notindexed)
be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	176
be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	177 def makedirs(self, path=None, mode=None):
be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	178 return util.makedirs(self.join(path), mode)
be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	179
20090 88d8e568add1 vfs: add "makelock()" and "readlock()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20086 diff changeset	180 def makelock(self, info, path):
88d8e568add1 vfs: add "makelock()" and "readlock()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20086 diff changeset	181 return util.makelock(info, self.join(path))
88d8e568add1 vfs: add "makelock()" and "readlock()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20086 diff changeset	182
17723 ab23768746fd scmutil: reorder newly added functions for vfs support in dictionary order FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17681 diff changeset	183 def mkdir(self, path=None):
ab23768746fd scmutil: reorder newly added functions for vfs support in dictionary order FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17681 diff changeset	184 return os.mkdir(self.join(path))
ab23768746fd scmutil: reorder newly added functions for vfs support in dictionary order FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17681 diff changeset	185
17747 aad3bce98f76 store: invoke "osutil.listdir()" via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17726 diff changeset	186 def readdir(self, path=None, stat=None, skip=None):
aad3bce98f76 store: invoke "osutil.listdir()" via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17726 diff changeset	187 return osutil.listdir(self.join(path), stat, skip)
aad3bce98f76 store: invoke "osutil.listdir()" via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17726 diff changeset	188
20090 88d8e568add1 vfs: add "makelock()" and "readlock()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20086 diff changeset	189 def readlock(self, path):
88d8e568add1 vfs: add "makelock()" and "readlock()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20086 diff changeset	190 return util.readlock(self.join(path))
88d8e568add1 vfs: add "makelock()" and "readlock()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20086 diff changeset	191
18948 2f05fa162316 localrepo: use "vfs.rename()" instead of "util.rename()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18945 diff changeset	192 def rename(self, src, dst):
2f05fa162316 localrepo: use "vfs.rename()" instead of "util.rename()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18945 diff changeset	193 return util.rename(self.join(src), self.join(dst))
2f05fa162316 localrepo: use "vfs.rename()" instead of "util.rename()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18945 diff changeset	194
18950 647e3b0c8751 localrepo: use "vfs.readlink()" instead of "os.readlink()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18949 diff changeset	195 def readlink(self, path):
647e3b0c8751 localrepo: use "vfs.readlink()" instead of "os.readlink()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18949 diff changeset	196 return os.readlink(self.join(path))
647e3b0c8751 localrepo: use "vfs.readlink()" instead of "os.readlink()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18949 diff changeset	197
18951 d13916a00b7e localrepo: use "vfs.setflags()" instead of "util.setflags()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18950 diff changeset	198 def setflags(self, path, l, x):
d13916a00b7e localrepo: use "vfs.setflags()" instead of "util.setflags()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18950 diff changeset	199 return util.setflags(self.join(path), l, x)
d13916a00b7e localrepo: use "vfs.setflags()" instead of "util.setflags()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18950 diff changeset	200
17726 7cb7e17c23b2 store: invoke "os.stat()" for "createmode" initialization via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17725 diff changeset	201 def stat(self, path=None):
7cb7e17c23b2 store: invoke "os.stat()" for "createmode" initialization via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17725 diff changeset	202 return os.stat(self.join(path))
7cb7e17c23b2 store: invoke "os.stat()" for "createmode" initialization via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17725 diff changeset	203
19895 37c0d93fb166 bookmarks: use "vfs.unlink()" instead of "util.unlink()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19655 diff changeset	204 def unlink(self, path=None):
37c0d93fb166 bookmarks: use "vfs.unlink()" instead of "util.unlink()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19655 diff changeset	205 return util.unlink(self.join(path))
37c0d93fb166 bookmarks: use "vfs.unlink()" instead of "util.unlink()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19655 diff changeset	206
19896 af03279c766a bookmarks: use "vfs.utime()" instead of "os.utime()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19895 diff changeset	207 def utime(self, path=None, t=None):
af03279c766a bookmarks: use "vfs.utime()" instead of "os.utime()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19895 diff changeset	208 return os.utime(self.join(path), t)
af03279c766a bookmarks: use "vfs.utime()" instead of "os.utime()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19895 diff changeset	209
17649 f65c6a5f256c scmutil: rename classes from "opener" to "vfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17561 diff changeset	210 class vfs(abstractvfs):
f65c6a5f256c scmutil: rename classes from "opener" to "vfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17561 diff changeset	211 '''Operate files relative to a base directory
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	212
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	213 This class is used to hide the details of COW semantics and
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	214 remote file access from higher level code.
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	215 '''
18945 e75b72fffdfe vfs: split "expand" into "realpath"/"expandpath" to apply each separately FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18900 diff changeset	216 def __init__(self, base, audit=True, expandpath=False, realpath=False):
e75b72fffdfe vfs: split "expand" into "realpath"/"expandpath" to apply each separately FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18900 diff changeset	217 if expandpath:
e75b72fffdfe vfs: split "expand" into "realpath"/"expandpath" to apply each separately FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18900 diff changeset	218 base = util.expandpath(base)
e75b72fffdfe vfs: split "expand" into "realpath"/"expandpath" to apply each separately FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18900 diff changeset	219 if realpath:
e75b72fffdfe vfs: split "expand" into "realpath"/"expandpath" to apply each separately FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18900 diff changeset	220 base = os.path.realpath(base)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	221 self.base = base
17554 5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	222 self._setmustaudit(audit)
5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	223 self.createmode = None
5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	224 self._trustnlink = None
5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	225
5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	226 def _getmustaudit(self):
5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	227 return self._audit
5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	228
5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	229 def _setmustaudit(self, onoff):
5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	230 self._audit = onoff
5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	231 if onoff:
20033 f962870712da pathutil: tease out a new library to break an import cycle from canonpath use Augie Fackler <raf@durin42.com> parents: 20006 diff changeset	232 self.audit = pathutil.pathauditor(self.base)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	233 else:
18327 4aecdb91443c scmutil: simplify vfs.audit - drop wrapped vfs.auditor Mads Kiilerich <mads@kiilerich.com> parents: 18316 diff changeset	234 self.audit = util.always
17554 5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	235
5450c8ad9d98 scmutil: turn opener._audit into a property, mustaudit Bryan O'Sullivan <bryano@fb.com> parents: 17248 diff changeset	236 mustaudit = property(_getmustaudit, _setmustaudit)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	237
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	238 @util.propertycache
14261 e3649bcca3f6 opener: rename _can_symlink to _cansymlink Adrian Buehlmann <adrian@cadifra.com> parents: 14236 diff changeset	239 def _cansymlink(self):
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	240 return util.checklink(self.base)
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	241
18192 f9a89bdd64a6 scmutil: don't try to match modes on filesystems without modes (issue3740) Matt Mackall <mpm@selenic.com> parents: 17850 diff changeset	242 @util.propertycache
f9a89bdd64a6 scmutil: don't try to match modes on filesystems without modes (issue3740) Matt Mackall <mpm@selenic.com> parents: 17850 diff changeset	243 def _chmod(self):
f9a89bdd64a6 scmutil: don't try to match modes on filesystems without modes (issue3740) Matt Mackall <mpm@selenic.com> parents: 17850 diff changeset	244 return util.checkexec(self.base)
f9a89bdd64a6 scmutil: don't try to match modes on filesystems without modes (issue3740) Matt Mackall <mpm@selenic.com> parents: 17850 diff changeset	245
17763 13070de77c86 vfs: backout fchmod change from 76b73ce0ffac Matt Mackall <mpm@selenic.com> parents: 17752 diff changeset	246 def _fixfilemode(self, name):
18192 f9a89bdd64a6 scmutil: don't try to match modes on filesystems without modes (issue3740) Matt Mackall <mpm@selenic.com> parents: 17850 diff changeset	247 if self.createmode is None or not self._chmod:
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	248 return
17763 13070de77c86 vfs: backout fchmod change from 76b73ce0ffac Matt Mackall <mpm@selenic.com> parents: 17752 diff changeset	249 os.chmod(name, self.createmode & 0666)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	250
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	251 def __call__(self, path, mode="r", text=False, atomictemp=False):
14720 36283a7b6856 opener: add self._audit (issue2862) Adrian Buehlmann <adrian@cadifra.com> parents: 14672 diff changeset	252 if self._audit:
36283a7b6856 opener: add self._audit (issue2862) Adrian Buehlmann <adrian@cadifra.com> parents: 14672 diff changeset	253 r = util.checkosfilename(path)
36283a7b6856 opener: add self._audit (issue2862) Adrian Buehlmann <adrian@cadifra.com> parents: 14672 diff changeset	254 if r:
36283a7b6856 opener: add self._audit (issue2862) Adrian Buehlmann <adrian@cadifra.com> parents: 14672 diff changeset	255 raise util.Abort("%s: %r" % (r, path))
18327 4aecdb91443c scmutil: simplify vfs.audit - drop wrapped vfs.auditor Mads Kiilerich <mads@kiilerich.com> parents: 18316 diff changeset	256 self.audit(path)
16199 8181bd808dc5 scmutil: add join method to opener to construct path relative to base Idan Kamara <idankk86@gmail.com> parents: 16198 diff changeset	257 f = self.join(path)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	258
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	259 if not text and "b" not in mode:
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	260 mode += "b" # for that other OS
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	261
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	262 nlink = -1
17937 3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	263 if mode not in ('r', 'rb'):
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	264 dirname, basename = util.split(f)
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	265 # If basename is empty, then the path is malformed because it points
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	266 # to a directory. Let the posixfile() call below raise IOError.
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	267 if basename:
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	268 if atomictemp:
18678 423eee0b0b14 util: make ensuredirs safer against races Bryan O'Sullivan <bryano@fb.com> parents: 18668 diff changeset	269 util.ensuredirs(dirname, self.createmode)
17937 3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	270 return util.atomictempfile(f, mode, self.createmode)
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	271 try:
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	272 if 'w' in mode:
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	273 util.unlink(f)
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	274 nlink = 0
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	275 else:
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	276 # nlinks() may behave differently for files on Windows
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	277 # shares if the file is open.
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	278 fd = util.posixfile(f)
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	279 nlink = util.nlinks(f)
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	280 if nlink < 1:
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	281 nlink = 2 # force mktempcopy (issue1922)
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	282 fd.close()
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	283 except (OSError, IOError), e:
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	284 if e.errno != errno.ENOENT:
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	285 raise
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	286 nlink = 0
18678 423eee0b0b14 util: make ensuredirs safer against races Bryan O'Sullivan <bryano@fb.com> parents: 18668 diff changeset	287 util.ensuredirs(dirname, self.createmode)
17937 3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	288 if nlink > 0:
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	289 if self._trustnlink is None:
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	290 self._trustnlink = nlink > 1 or util.checknlink(f)
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	291 if nlink > 1 or not self._trustnlink:
3cb032d50447 vfs: optimize __call__ by not calling util.split for reads Adrian Buehlmann <adrian@cadifra.com> parents: 17850 diff changeset	292 util.rename(util.mktempcopy(f), f)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	293 fp = util.posixfile(f, mode)
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	294 if nlink == 0:
17763 13070de77c86 vfs: backout fchmod change from 76b73ce0ffac Matt Mackall <mpm@selenic.com> parents: 17752 diff changeset	295 self._fixfilemode(f)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	296 return fp
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	297
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	298 def symlink(self, src, dst):
18327 4aecdb91443c scmutil: simplify vfs.audit - drop wrapped vfs.auditor Mads Kiilerich <mads@kiilerich.com> parents: 18316 diff changeset	299 self.audit(dst)
16199 8181bd808dc5 scmutil: add join method to opener to construct path relative to base Idan Kamara <idankk86@gmail.com> parents: 16198 diff changeset	300 linkname = self.join(dst)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	301 try:
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	302 os.unlink(linkname)
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	303 except OSError:
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	304 pass
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	305
18678 423eee0b0b14 util: make ensuredirs safer against races Bryan O'Sullivan <bryano@fb.com> parents: 18668 diff changeset	306 util.ensuredirs(os.path.dirname(linkname), self.createmode)
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	307
14261 e3649bcca3f6 opener: rename _can_symlink to _cansymlink Adrian Buehlmann <adrian@cadifra.com> parents: 14236 diff changeset	308 if self._cansymlink:
13970 d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	309 try:
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	310 os.symlink(src, linkname)
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	311 except OSError, err:
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	312 raise OSError(err.errno, _('could not symlink to %r: %s') %
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	313 (src, err.strerror), linkname)
d13913355390 move opener from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13962 diff changeset	314 else:
17768 9837cafc25b1 vfs: use self.write to write symlink placeholders Matt Mackall <mpm@selenic.com> parents: 17763 diff changeset	315 self.write(dst, src)
13971 bfeaa88b875d move canonpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13970 diff changeset	316
16199 8181bd808dc5 scmutil: add join method to opener to construct path relative to base Idan Kamara <idankk86@gmail.com> parents: 16198 diff changeset	317 def join(self, path):
17161 be016e96117a localrepo: use file API via vfs while ensuring repository directory FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17157 diff changeset	318 if path:
17681 a41fd730f230 scmutil: backout 83785bb56062 (issue3643) Matt Mackall <mpm@selenic.com> parents: 17675 diff changeset	319 return os.path.join(self.base, path)
a41fd730f230 scmutil: backout 83785bb56062 (issue3643) Matt Mackall <mpm@selenic.com> parents: 17675 diff changeset	320 else:
a41fd730f230 scmutil: backout 83785bb56062 (issue3643) Matt Mackall <mpm@selenic.com> parents: 17675 diff changeset	321 return self.base
16199 8181bd808dc5 scmutil: add join method to opener to construct path relative to base Idan Kamara <idankk86@gmail.com> parents: 16198 diff changeset	322
17649 f65c6a5f256c scmutil: rename classes from "opener" to "vfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17561 diff changeset	323 opener = vfs
f65c6a5f256c scmutil: rename classes from "opener" to "vfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17561 diff changeset	324
17845 408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	325 class auditvfs(object):
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	326 def __init__(self, vfs):
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	327 self.vfs = vfs
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	328
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	329 def _getmustaudit(self):
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	330 return self.vfs.mustaudit
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	331
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	332 def _setmustaudit(self, onoff):
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	333 self.vfs.mustaudit = onoff
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	334
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	335 mustaudit = property(_getmustaudit, _setmustaudit)
408ded42c5ec scmutil: abstract out mustaudit delegation Bryan O'Sullivan <bryano@fb.com> parents: 17821 diff changeset	336
17846 f42cf30873dc scmutil: add mustaudit delegation to filtervfs (issue3673) Bryan O'Sullivan <bryano@fb.com> parents: 17845 diff changeset	337 class filtervfs(abstractvfs, auditvfs):
17649 f65c6a5f256c scmutil: rename classes from "opener" to "vfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17561 diff changeset	338 '''Wrapper vfs for filtering filenames with a function.'''
14090 e24b5e3c2f27 add filteropener abstraction for store openers Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14089 diff changeset	339
17846 f42cf30873dc scmutil: add mustaudit delegation to filtervfs (issue3673) Bryan O'Sullivan <bryano@fb.com> parents: 17845 diff changeset	340 def __init__(self, vfs, filter):
f42cf30873dc scmutil: add mustaudit delegation to filtervfs (issue3673) Bryan O'Sullivan <bryano@fb.com> parents: 17845 diff changeset	341 auditvfs.__init__(self, vfs)
14090 e24b5e3c2f27 add filteropener abstraction for store openers Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14089 diff changeset	342 self._filter = filter
e24b5e3c2f27 add filteropener abstraction for store openers Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14089 diff changeset	343
e24b5e3c2f27 add filteropener abstraction for store openers Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14089 diff changeset	344 def __call__(self, path, args, *kwargs):
17846 f42cf30873dc scmutil: add mustaudit delegation to filtervfs (issue3673) Bryan O'Sullivan <bryano@fb.com> parents: 17845 diff changeset	345 return self.vfs(self._filter(path), args, *kwargs)
14090 e24b5e3c2f27 add filteropener abstraction for store openers Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14089 diff changeset	346
17725 ffd589d4b785 vfs: define "join()" in each classes derived from "abstractvfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17723 diff changeset	347 def join(self, path):
ffd589d4b785 vfs: define "join()" in each classes derived from "abstractvfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17723 diff changeset	348 if path:
17846 f42cf30873dc scmutil: add mustaudit delegation to filtervfs (issue3673) Bryan O'Sullivan <bryano@fb.com> parents: 17845 diff changeset	349 return self.vfs.join(self._filter(path))
17725 ffd589d4b785 vfs: define "join()" in each classes derived from "abstractvfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17723 diff changeset	350 else:
17846 f42cf30873dc scmutil: add mustaudit delegation to filtervfs (issue3673) Bryan O'Sullivan <bryano@fb.com> parents: 17845 diff changeset	351 return self.vfs.join(path)
17725 ffd589d4b785 vfs: define "join()" in each classes derived from "abstractvfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17723 diff changeset	352
17649 f65c6a5f256c scmutil: rename classes from "opener" to "vfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17561 diff changeset	353 filteropener = filtervfs
f65c6a5f256c scmutil: rename classes from "opener" to "vfs" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17561 diff changeset	354
18213 c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	355 class readonlyvfs(abstractvfs, auditvfs):
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	356 '''Wrapper vfs preventing any writing.'''
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	357
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	358 def __init__(self, vfs):
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	359 auditvfs.__init__(self, vfs)
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	360
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	361 def __call__(self, path, mode='r', args, *kw):
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	362 if mode not in ('r', 'rb'):
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	363 raise util.Abort('this vfs is read only')
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	364 return self.vfs(path, mode, args, *kw)
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	365
c38a62af000e vfs: add a read only vfs Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18206 diff changeset	366
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	367 def walkrepos(path, followsym=False, seen_dirs=None, recurse=False):
17104 5a9acb0b2086 help: improve hgweb help Mads Kiilerich <mads@kiilerich.com> parents: 17037 diff changeset	368 '''yield every hg repository under path, always recursively.
5a9acb0b2086 help: improve hgweb help Mads Kiilerich <mads@kiilerich.com> parents: 17037 diff changeset	369 The recurse flag will only control recursion into repo working dirs'''
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	370 def errhandler(err):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	371 if err.filename == path:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	372 raise err
14961 5523529bd1af walkrepos: use getattr instead of hasattr for samestat Augie Fackler <durin42@gmail.com> parents: 14928 diff changeset	373 samestat = getattr(os.path, 'samestat', None)
5523529bd1af walkrepos: use getattr instead of hasattr for samestat Augie Fackler <durin42@gmail.com> parents: 14928 diff changeset	374 if followsym and samestat is not None:
14227 94985b5a8278 scmutil: rename local function _add_dir_if_not_there Adrian Buehlmann <adrian@cadifra.com> parents: 14226 diff changeset	375 def adddir(dirlst, dirname):
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	376 match = False
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	377 dirstat = os.stat(dirname)
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	378 for lstdirstat in dirlst:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	379 if samestat(dirstat, lstdirstat):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	380 match = True
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	381 break
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	382 if not match:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	383 dirlst.append(dirstat)
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	384 return not match
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	385 else:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	386 followsym = False
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	387
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	388 if (seen_dirs is None) and followsym:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	389 seen_dirs = []
14227 94985b5a8278 scmutil: rename local function _add_dir_if_not_there Adrian Buehlmann <adrian@cadifra.com> parents: 14226 diff changeset	390 adddir(seen_dirs, path)
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	391 for root, dirs, files in os.walk(path, topdown=True, onerror=errhandler):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	392 dirs.sort()
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	393 if '.hg' in dirs:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	394 yield root # found a repository
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	395 qroot = os.path.join(root, '.hg', 'patches')
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	396 if os.path.isdir(os.path.join(qroot, '.hg')):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	397 yield qroot # we have a patch queue repo here
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	398 if recurse:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	399 # avoid recursing inside the .hg directory
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	400 dirs.remove('.hg')
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	401 else:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	402 dirs[:] = [] # don't descend further
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	403 elif followsym:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	404 newdirs = []
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	405 for d in dirs:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	406 fname = os.path.join(root, d)
14227 94985b5a8278 scmutil: rename local function _add_dir_if_not_there Adrian Buehlmann <adrian@cadifra.com> parents: 14226 diff changeset	407 if adddir(seen_dirs, fname):
13975 938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	408 if os.path.islink(fname):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	409 for hgname in walkrepos(fname, True, seen_dirs):
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	410 yield hgname
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	411 else:
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	412 newdirs.append(d)
938fbeacac84 move walkrepos from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13974 diff changeset	413 dirs[:] = newdirs
13984 af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	414
14224 f4189866c76c rename scmutil.os_rcpath to osrcpath Adrian Buehlmann <adrian@cadifra.com> parents: 14220 diff changeset	415 def osrcpath():
13985 26335a817dd0 move os_rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13984 diff changeset	416 '''return default os-specific hgrc search path'''
14225 f0ca440b5722 rename scmutil.system_rcpath to systemrcpath Adrian Buehlmann <adrian@cadifra.com> parents: 14224 diff changeset	417 path = systemrcpath()
14226 73cca883370d rename scmutil.user_rcpath to userrcpath Adrian Buehlmann <adrian@cadifra.com> parents: 14225 diff changeset	418 path.extend(userrcpath())
13985 26335a817dd0 move os_rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13984 diff changeset	419 path = [os.path.normpath(f) for f in path]
26335a817dd0 move os_rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13984 diff changeset	420 return path
26335a817dd0 move os_rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13984 diff changeset	421
13984 af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	422 _rcpath = None
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	423
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	424 def rcpath():
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	425 '''return hgrc search path. if env var HGRCPATH is set, use it.
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	426 for each item in path, if directory, use files ending in .rc,
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	427 else use item.
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	428 make HGRCPATH empty to only look in .hg/hgrc of current repo.
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	429 if no HGRCPATH, use default os-specific path.'''
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	430 global _rcpath
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	431 if _rcpath is None:
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	432 if 'HGRCPATH' in os.environ:
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	433 _rcpath = []
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	434 for p in os.environ['HGRCPATH'].split(os.pathsep):
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	435 if not p:
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	436 continue
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	437 p = util.expandpath(p)
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	438 if os.path.isdir(p):
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	439 for f, kind in osutil.listdir(p):
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	440 if f.endswith('.rc'):
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	441 _rcpath.append(os.path.join(p, f))
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	442 else:
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	443 _rcpath.append(p)
af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	444 else:
14224 f4189866c76c rename scmutil.os_rcpath to osrcpath Adrian Buehlmann <adrian@cadifra.com> parents: 14220 diff changeset	445 _rcpath = osrcpath()
13984 af60153b5e3b move rcpath from util to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13975 diff changeset	446 return _rcpath
13986 9c374cf76b7d move system_rcpath and user_rcpath to scmutil Adrian Buehlmann <adrian@cadifra.com> parents: 13985 diff changeset	447
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	448 def revsingle(repo, revspec, default='.'):
19509 8963a706e075 revsingle: fix silly API issue (issue2992) Matt Mackall <mpm@selenic.com> parents: 19154 diff changeset	449 if not revspec and revspec != 0:
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	450 return repo[default]
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	451
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	452 l = revrange(repo, [revspec])
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	453 if len(l) < 1:
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	454 raise util.Abort(_('empty revision set'))
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	455 return repo[l[-1]]
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	456
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	457 def revpair(repo, revs):
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	458 if not revs:
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	459 return repo.dirstate.p1(), None
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	460
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	461 l = revrange(repo, revs)
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	462
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	463 if len(l) == 0:
16790 2a0efa1112ac revpair: handle odd ranges (issue3474) Matt Mackall <mpm@selenic.com> parents: 16479 diff changeset	464 if revs:
2a0efa1112ac revpair: handle odd ranges (issue3474) Matt Mackall <mpm@selenic.com> parents: 16479 diff changeset	465 raise util.Abort(_('empty revision range'))
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	466 return repo.dirstate.p1(), None
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	467
16790 2a0efa1112ac revpair: handle odd ranges (issue3474) Matt Mackall <mpm@selenic.com> parents: 16479 diff changeset	468 if len(l) == 1 and len(revs) == 1 and _revrangesep not in revs[0]:
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	469 return repo.lookup(l[0]), None
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	470
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	471 return repo.lookup(l[0]), repo.lookup(l[-1])
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	472
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	473 _revrangesep = ':'
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	474
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	475 def revrange(repo, revs):
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	476 """Yield revision as strings from a list of revision specifications."""
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	477
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	478 def revfix(repo, val, defval):
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	479 if not val and val != 0 and defval is not None:
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	480 return defval
16379 5cbfbb838198 scmutil: use context instead of lookup Matt Mackall <mpm@selenic.com> parents: 16208 diff changeset	481 return repo[val].rev()
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	482
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	483 seen, l = set(), []
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	484 for spec in revs:
16390 4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	485 if l and not seen:
4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	486 seen = set(l)
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	487 # attempt to parse old-style ranges first to deal with
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	488 # things like old-tag which contain query metacharacters
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	489 try:
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	490 if isinstance(spec, int):
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	491 seen.add(spec)
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	492 l.append(spec)
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	493 continue
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	494
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	495 if _revrangesep in spec:
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	496 start, end = spec.split(_revrangesep, 1)
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	497 start = revfix(repo, start, 0)
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	498 end = revfix(repo, end, len(repo) - 1)
18466 ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18450 diff changeset	499 if end == nullrev and start <= 0:
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18450 diff changeset	500 start = nullrev
17992 c95210b82c0e clfilter: remove usage of `range` and `xrange` in scmutil.revrange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17937 diff changeset	501 rangeiter = repo.changelog.revs(start, end)
16390 4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	502 if not seen and not l:
4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	503 # by far the most common case: revs = ["-1:0"]
17992 c95210b82c0e clfilter: remove usage of `range` and `xrange` in scmutil.revrange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17937 diff changeset	504 l = list(rangeiter)
16390 4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	505 # defer syncing seen until next iteration
4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	506 continue
17992 c95210b82c0e clfilter: remove usage of `range` and `xrange` in scmutil.revrange Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17937 diff changeset	507 newrevs = set(rangeiter)
16390 4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	508 if seen:
4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	509 newrevs.difference_update(seen)
16814 9da5a2864f3f scmutil: seen.union should be seen.update (issue3476) Bryan O'Sullivan <bryano@fb.com> parents: 16790 diff changeset	510 seen.update(newrevs)
16390 4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	511 else:
4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	512 seen = newrevs
4df76d5506a9 scmutil: speed up revrange Bryan O'Sullivan <bryano@fb.com> parents: 16383 diff changeset	513 l.extend(sorted(newrevs, reverse=start > end))
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	514 continue
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	515 elif spec and spec in repo: # single unquoted rev
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	516 rev = revfix(repo, spec, None)
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	517 if rev in seen:
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	518 continue
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	519 seen.add(rev)
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	520 l.append(rev)
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	521 continue
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	522 except error.RepoLookupError:
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	523 pass
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	524
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	525 # fall through to new-style queries if old-style fails
b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	526 m = revset.match(repo.ui, spec)
20364 a6cf48b2880d revset: added baseset class (still empty) to improve revset performance Lucas Moscovicz <lmoscovicz@fb.com> parents: 20090 diff changeset	527 dl = [r for r in m(repo, revset.baseset(repo)) if r not in seen]
17037 419966126a05 scmutil: speed up new-style range extension Bryan O'Sullivan <bryano@fb.com> parents: 17007 diff changeset	528 l.extend(dl)
419966126a05 scmutil: speed up new-style range extension Bryan O'Sullivan <bryano@fb.com> parents: 17007 diff changeset	529 seen.update(dl)
14319 b33f3e35efb0 scmutil: move revsingle/pair/range from cmdutil Matt Mackall <mpm@selenic.com> parents: 14261 diff changeset	530
20364 a6cf48b2880d revset: added baseset class (still empty) to improve revset performance Lucas Moscovicz <lmoscovicz@fb.com> parents: 20090 diff changeset	531 return revset.baseset(l)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	532
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	533 def expandpats(pats):
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	534 if not util.expandglobs:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	535 return list(pats)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	536 ret = []
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	537 for p in pats:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	538 kind, name = matchmod._patsplit(p, None)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	539 if kind is None:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	540 try:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	541 globbed = glob.glob(name)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	542 except re.error:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	543 globbed = [name]
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	544 if globbed:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	545 ret.extend(globbed)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	546 continue
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	547 ret.append(p)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	548 return ret
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	549
16171 336e61875335 graphlog: restore FILE glob expansion on Windows Patrick Mezard <patrick@mezard.eu> parents: 16167 diff changeset	550 def matchandpats(ctx, pats=[], opts={}, globbed=False, default='relpath'):
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	551 if pats == ("",):
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	552 pats = []
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	553 if not globbed and default == 'relpath':
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	554 pats = expandpats(pats or [])
14670 19197fa4c41c scmutil: match now accepts a context or a repo Matt Mackall <mpm@selenic.com> parents: 14669 diff changeset	555
19197fa4c41c scmutil: match now accepts a context or a repo Matt Mackall <mpm@selenic.com> parents: 14669 diff changeset	556 m = ctx.match(pats, opts.get('include'), opts.get('exclude'),
14669 2d2604adfdd6 context: add a match builder method Matt Mackall <mpm@selenic.com> parents: 14527 diff changeset	557 default)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	558 def badfn(f, msg):
14671 35c2cc322ba8 scmutil: switch match users to supplying contexts Matt Mackall <mpm@selenic.com> parents: 14670 diff changeset	559 ctx._repo.ui.warn("%s: %s\n" % (m.rel(f), msg))
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	560 m.bad = badfn
16171 336e61875335 graphlog: restore FILE glob expansion on Windows Patrick Mezard <patrick@mezard.eu> parents: 16167 diff changeset	561 return m, pats
336e61875335 graphlog: restore FILE glob expansion on Windows Patrick Mezard <patrick@mezard.eu> parents: 16167 diff changeset	562
336e61875335 graphlog: restore FILE glob expansion on Windows Patrick Mezard <patrick@mezard.eu> parents: 16167 diff changeset	563 def match(ctx, pats=[], opts={}, globbed=False, default='relpath'):
336e61875335 graphlog: restore FILE glob expansion on Windows Patrick Mezard <patrick@mezard.eu> parents: 16167 diff changeset	564 return matchandpats(ctx, pats, opts, globbed, default)[0]
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	565
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	566 def matchall(repo):
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	567 return matchmod.always(repo.root, repo.getcwd())
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	568
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	569 def matchfiles(repo, files):
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	570 return matchmod.exact(repo.root, repo.getcwd(), files)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	571
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	572 def addremove(repo, pats=[], opts={}, dry_run=None, similarity=None):
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	573 if dry_run is None:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	574 dry_run = opts.get('dry_run')
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	575 if similarity is None:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	576 similarity = float(opts.get('similarity') or 0)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	577 # we'd use status here, except handling of symlinks and ignore is tricky
14671 35c2cc322ba8 scmutil: switch match users to supplying contexts Matt Mackall <mpm@selenic.com> parents: 14670 diff changeset	578 m = match(repo[None], pats, opts)
16167 94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	579 rejected = []
94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	580 m.bad = lambda x, y: rejected.append(x)
94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	581
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	582 added, unknown, deleted, removed = _interestingfiles(repo, m)
18863 1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	583
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	584 unknownset = set(unknown)
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	585 toprint = unknownset.copy()
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	586 toprint.update(deleted)
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	587 for abs in sorted(toprint):
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	588 if repo.ui.verbose or not m.exact(abs):
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	589 rel = m.rel(abs)
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	590 if abs in unknownset:
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	591 status = _('adding %s\n') % ((pats and rel) or abs)
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	592 else:
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	593 status = _('removing %s\n') % ((pats and rel) or abs)
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	594 repo.ui.status(status)
1b70e5941ad7 scmutil.addremove: pull ui.status printing out of the loop Siddharth Agarwal <sid0@fb.com> parents: 18862 diff changeset	595
19152 7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	596 renames = _findrenames(repo, m, added + unknown, removed + deleted,
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	597 similarity)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	598
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	599 if not dry_run:
19153 9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	600 _markchanges(repo, unknown, deleted, renames)
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	601
16167 94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	602 for f in rejected:
94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	603 if f in m.files():
94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	604 return 1
94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	605 return 0
94a8396c9305 addremove: return 1 if we failed to handle any explicit files Matt Mackall <mpm@selenic.com> parents: 16115 diff changeset	606
19154 0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	607 def marktouched(repo, files, similarity=0.0):
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	608 '''Assert that files have somehow been operated upon. files are relative to
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	609 the repo root.'''
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	610 m = matchfiles(repo, files)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	611 rejected = []
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	612 m.bad = lambda x, y: rejected.append(x)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	613
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	614 added, unknown, deleted, removed = _interestingfiles(repo, m)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	615
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	616 if repo.ui.verbose:
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	617 unknownset = set(unknown)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	618 toprint = unknownset.copy()
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	619 toprint.update(deleted)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	620 for abs in sorted(toprint):
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	621 if abs in unknownset:
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	622 status = _('adding %s\n') % abs
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	623 else:
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	624 status = _('removing %s\n') % abs
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	625 repo.ui.status(status)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	626
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	627 renames = _findrenames(repo, m, added + unknown, removed + deleted,
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	628 similarity)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	629
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	630 _markchanges(repo, unknown, deleted, renames)
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	631
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	632 for f in rejected:
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	633 if f in m.files():
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	634 return 1
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	635 return 0
0c7cf411b390 scmutil: add a function to mark that files have been operated on Siddharth Agarwal <sid0@fb.com> parents: 19153 diff changeset	636
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	637 def _interestingfiles(repo, matcher):
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	638 '''Walk dirstate with matcher, looking for files that addremove would care
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	639 about.
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	640
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	641 This is different from dirstate.status because it doesn't care about
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	642 whether files are modified or clean.'''
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	643 added, unknown, deleted, removed = [], [], [], []
20033 f962870712da pathutil: tease out a new library to break an import cycle from canonpath use Augie Fackler <raf@durin42.com> parents: 20006 diff changeset	644 audit_path = pathutil.pathauditor(repo.root)
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	645
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	646 ctx = repo[None]
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	647 dirstate = repo.dirstate
19655 1d07bf106c2a addremove: don't do full walks Siddharth Agarwal <sid0@fb.com> parents: 19509 diff changeset	648 walkresults = dirstate.walk(matcher, sorted(ctx.substate), True, False,
1d07bf106c2a addremove: don't do full walks Siddharth Agarwal <sid0@fb.com> parents: 19509 diff changeset	649 full=False)
19150 7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	650 for abs, st in walkresults.iteritems():
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	651 dstate = dirstate[abs]
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	652 if dstate == '?' and audit_path.check(abs):
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	653 unknown.append(abs)
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	654 elif dstate != 'r' and not st:
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	655 deleted.append(abs)
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	656 # for finding renames
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	657 elif dstate == 'r':
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	658 removed.append(abs)
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	659 elif dstate == 'a':
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	660 added.append(abs)
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	661
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	662 return added, unknown, deleted, removed
7a4eab2456de scmutil.addremove: factor out dirstate walk into another function Siddharth Agarwal <sid0@fb.com> parents: 19070 diff changeset	663
19152 7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	664 def _findrenames(repo, matcher, added, removed, similarity):
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	665 '''Find renames from removed files to added ones.'''
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	666 renames = {}
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	667 if similarity > 0:
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	668 for old, new, score in similar.findrenames(repo, added, removed,
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	669 similarity):
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	670 if (repo.ui.verbose or not matcher.exact(old)
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	671 or not matcher.exact(new)):
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	672 repo.ui.status(_('recording removal of %s as rename to %s '
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	673 '(%d%% similar)\n') %
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	674 (matcher.rel(old), matcher.rel(new),
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	675 score * 100))
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	676 renames[new] = old
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	677 return renames
7a1292523db3 scmutil.addremove: factor out code to find renames Siddharth Agarwal <sid0@fb.com> parents: 19151 diff changeset	678
19153 9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	679 def _markchanges(repo, unknown, deleted, renames):
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	680 '''Marks the files in unknown as added, the files in deleted as removed,
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	681 and the files in renames as copied.'''
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	682 wctx = repo[None]
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	683 wlock = repo.wlock()
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	684 try:
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	685 wctx.forget(deleted)
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	686 wctx.add(unknown)
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	687 for new, old in renames.iteritems():
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	688 wctx.copy(old, new)
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	689 finally:
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	690 wlock.release()
9a4e219bda89 scmutil.addremove: factor out code to mark added/removed/renames Siddharth Agarwal <sid0@fb.com> parents: 19152 diff changeset	691
14320 3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	692 def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None):
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	693 """Update the dirstate to reflect the intent of copying src to dst. For
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	694 different reasons it might not end with dst being marked as copied from src.
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	695 """
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	696 origsrc = repo.dirstate.copied(src) or src
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	697 if dst == origsrc: # copying back a copy?
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	698 if repo.dirstate[dst] not in 'mn' and not dryrun:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	699 repo.dirstate.normallookup(dst)
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	700 else:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	701 if repo.dirstate[origsrc] == 'a' and origsrc == src:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	702 if not ui.quiet:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	703 ui.warn(_("%s has not been committed yet, so no copy "
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	704 "data will be stored for %s.\n")
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	705 % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd)))
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	706 if repo.dirstate[dst] in '?r' and not dryrun:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	707 wctx.add([dst])
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	708 elif not dryrun:
3438417a6657 scmutil: fold in wdutil Matt Mackall <mpm@selenic.com> parents: 14319 diff changeset	709 wctx.copy(origsrc, dst)
14482 58b36e9ea783 introduce new function scmutil.readrequires Adrian Buehlmann <adrian@cadifra.com> parents: 14435 diff changeset	710
58b36e9ea783 introduce new function scmutil.readrequires Adrian Buehlmann <adrian@cadifra.com> parents: 14435 diff changeset	711 def readrequires(opener, supported):
58b36e9ea783 introduce new function scmutil.readrequires Adrian Buehlmann <adrian@cadifra.com> parents: 14435 diff changeset	712 '''Reads and parses .hg/requires and checks if all entries found
58b36e9ea783 introduce new function scmutil.readrequires Adrian Buehlmann <adrian@cadifra.com> parents: 14435 diff changeset	713 are in the list of supported features.'''
58b36e9ea783 introduce new function scmutil.readrequires Adrian Buehlmann <adrian@cadifra.com> parents: 14435 diff changeset	714 requirements = set(opener.read("requires").splitlines())
14746 72e4fcb43227 requirements: show all missing features in the error message. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 14720 diff changeset	715 missings = []
14482 58b36e9ea783 introduce new function scmutil.readrequires Adrian Buehlmann <adrian@cadifra.com> parents: 14435 diff changeset	716 for r in requirements:
58b36e9ea783 introduce new function scmutil.readrequires Adrian Buehlmann <adrian@cadifra.com> parents: 14435 diff changeset	717 if r not in supported:
14484 4582a4dd1817 requires: note apparent corruption Matt Mackall <mpm@selenic.com> parents: 14483 diff changeset	718 if not r or not r[0].isalnum():
4582a4dd1817 requires: note apparent corruption Matt Mackall <mpm@selenic.com> parents: 14483 diff changeset	719 raise error.RequirementError(_(".hg/requires file is corrupt"))
14746 72e4fcb43227 requirements: show all missing features in the error message. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 14720 diff changeset	720 missings.append(r)
72e4fcb43227 requirements: show all missing features in the error message. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 14720 diff changeset	721 missings.sort()
72e4fcb43227 requirements: show all missing features in the error message. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 14720 diff changeset	722 if missings:
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16479 diff changeset	723 raise error.RequirementError(
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16479 diff changeset	724 _("unknown repository format: requires features '%s' (upgrade "
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16479 diff changeset	725 "Mercurial)") % "', '".join(missings))
14482 58b36e9ea783 introduce new function scmutil.readrequires Adrian Buehlmann <adrian@cadifra.com> parents: 14435 diff changeset	726 return requirements
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	727
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	728 class filecachesubentry(object):
20042 9a72d3886888 scmutil.filecacheentry: make stat argument to constructor mandatory Siddharth Agarwal <sid0@fb.com> parents: 20033 diff changeset	729 def __init__(self, path, stat):
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	730 self.path = path
18315 216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	731 self.cachestat = None
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	732 self._cacheable = None
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	733
18315 216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	734 if stat:
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	735 self.cachestat = filecachesubentry.stat(self.path)
18315 216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	736
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	737 if self.cachestat:
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	738 self._cacheable = self.cachestat.cacheable()
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	739 else:
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	740 # None means we don't know yet
216230643ae2 filecache: allow filecacheentry to be created without stating in __init__ Idan Kamara <idankk86@gmail.com> parents: 18213 diff changeset	741 self._cacheable = None
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	742
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	743 def refresh(self):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	744 if self.cacheable():
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	745 self.cachestat = filecachesubentry.stat(self.path)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	746
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	747 def cacheable(self):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	748 if self._cacheable is not None:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	749 return self._cacheable
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	750
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	751 # we don't know yet, assume it is for now
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	752 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	753
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	754 def changed(self):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	755 # no point in going further if we can't cache it
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	756 if not self.cacheable():
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	757 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	758
20043 88bd8df008f2 scmutil: rename filecacheentry to filecachesubentry Siddharth Agarwal <sid0@fb.com> parents: 20042 diff changeset	759 newstat = filecachesubentry.stat(self.path)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	760
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	761 # we may not know if it's cacheable yet, check again now
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	762 if newstat and self._cacheable is None:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	763 self._cacheable = newstat.cacheable()
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	764
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	765 # check again
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	766 if not self._cacheable:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	767 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	768
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	769 if self.cachestat != newstat:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	770 self.cachestat = newstat
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	771 return True
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	772 else:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	773 return False
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	774
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	775 @staticmethod
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	776 def stat(path):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	777 try:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	778 return util.cachestat(path)
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	779 except OSError, e:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	780 if e.errno != errno.ENOENT:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	781 raise
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	782
20044 d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	783 class filecacheentry(object):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	784 def __init__(self, paths, stat=True):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	785 self._entries = []
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	786 for path in paths:
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	787 self._entries.append(filecachesubentry(path, stat))
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	788
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	789 def changed(self):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	790 '''true if any entry has changed'''
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	791 for entry in self._entries:
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	792 if entry.changed():
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	793 return True
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	794 return False
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	795
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	796 def refresh(self):
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	797 for entry in self._entries:
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	798 entry.refresh()
d38de18d187a scmutil: introduce a filecacheentry that can watch multiple paths Siddharth Agarwal <sid0@fb.com> parents: 20043 diff changeset	799
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	800 class filecache(object):
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	801 '''A property like decorator that tracks files under .hg/ for updates.
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	802
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	803 Records stat info when called in _filecache.
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	804
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	805 On subsequent calls, compares old stat info with new info, and recreates the
b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	806 object when any of the files changes, updating the new stat info in
b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	807 _filecache.
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	808
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	809 Mercurial either atomic renames or appends for files under .hg,
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	810 so to ensure the cache is reliable we need the filesystem to be able
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	811 to tell us if a file has been replaced. If it can't, we fallback to
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	812 recreating the object on every call (essentially the same behaviour as
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	813 propertycache).
b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	814
b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	815 '''
b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	816 def __init__(self, *paths):
b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	817 self.paths = paths
16198 fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	818
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	819 def join(self, obj, fname):
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	820 """Used to compute the runtime path of a cached file.
16198 fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	821
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	822 Users should subclass filecache and provide their own version of this
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	823 function to call the appropriate join function on 'obj' (an instance
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	824 of the class that its member function was decorated).
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	825 """
fa8488565afd filecache: refactor path join logic to a function Idan Kamara <idankk86@gmail.com> parents: 16115 diff changeset	826 return obj.join(fname)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	827
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	828 def __call__(self, func):
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	829 self.func = func
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	830 self.name = func.__name__
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	831 return self
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	832
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	833 def __get__(self, obj, type=None):
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	834 # do we need to check if the file changed?
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	835 if self.name in obj.__dict__:
18316 f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	836 assert self.name in obj._filecache, self.name
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	837 return obj.__dict__[self.name]
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	838
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	839 entry = obj._filecache.get(self.name)
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	840
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	841 if entry:
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	842 if entry.changed():
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	843 entry.obj = self.func(obj)
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	844 else:
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	845 paths = [self.join(obj, path) for path in self.paths]
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	846
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	847 # We stat -before- creating the object so our cache doesn't lie if
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	848 # a writer modified between the time we read and stat
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	849 entry = filecacheentry(paths, True)
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	850 entry.obj = self.func(obj)
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	851
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	852 obj._filecache[self.name] = entry
dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	853
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	854 obj.__dict__[self.name] = entry.obj
14928 dca59d5be12d scmutil: introduce filecache Idan Kamara <idankk86@gmail.com> parents: 14861 diff changeset	855 return entry.obj
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	856
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	857 def __set__(self, obj, value):
18316 f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	858 if self.name not in obj._filecache:
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	859 # we add an entry for the missing value because X in __dict__
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	860 # implies X in _filecache
20045 b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	861 paths = [self.join(obj, path) for path in self.paths]
b3684fd2ff1a scmutil.filecache: support watching over multiple files Siddharth Agarwal <sid0@fb.com> parents: 20044 diff changeset	862 ce = filecacheentry(paths, False)
18316 f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	863 obj._filecache[self.name] = ce
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	864 else:
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	865 ce = obj._filecache[self.name]
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	866
f36375576ed5 filecache: create an entry in _filecache when __set__ is called for a missing one Idan Kamara <idankk86@gmail.com> parents: 18315 diff changeset	867 ce.obj = value # update cached copy
16115 236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	868 obj.__dict__[self.name] = value # update copy returned by obj.x
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	869
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	870 def __delete__(self, obj):
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	871 try:
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	872 del obj.__dict__[self.name]
236bb604dc39 scmutil: update cached copy when filecached attribute is assigned (issue3263) Idan Kamara <idankk86@gmail.com> parents: 16068 diff changeset	873 except KeyError:
18177 203b7a759218 scmutil: clean up use of two-argument raise Augie Fackler <raf@durin42.com> parents: 17992 diff changeset	874 raise AttributeError(self.name)
18897 38982de2b4eb scmutil: migrate finddirs from dirstate Bryan O'Sullivan <bryano@fb.com> parents: 18865 diff changeset	875
18898 856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	876 class dirs(object):
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	877 '''a multiset of directory names from a dirstate or manifest'''
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	878
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	879 def __init__(self, map, skip=None):
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	880 self._dirs = {}
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	881 addpath = self.addpath
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	882 if util.safehasattr(map, 'iteritems') and skip is not None:
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	883 for f, s in map.iteritems():
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	884 if s[0] != skip:
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	885 addpath(f)
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	886 else:
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	887 for f in map:
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	888 addpath(f)
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	889
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	890 def addpath(self, path):
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	891 dirs = self._dirs
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	892 for base in finddirs(path):
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	893 if base in dirs:
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	894 dirs[base] += 1
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	895 return
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	896 dirs[base] = 1
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	897
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	898 def delpath(self, path):
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	899 dirs = self._dirs
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	900 for base in finddirs(path):
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	901 if dirs[base] > 1:
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	902 dirs[base] -= 1
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	903 return
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	904 del dirs[base]
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	905
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	906 def __iter__(self):
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	907 return self._dirs.iterkeys()
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	908
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	909 def __contains__(self, d):
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	910 return d in self._dirs
856960173630 scmutil: add a dirs class Bryan O'Sullivan <bryano@fb.com> parents: 18897 diff changeset	911
18900 02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18898 diff changeset	912 if util.safehasattr(parsers, 'dirs'):
02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18898 diff changeset	913 dirs = parsers.dirs
02ee846b246a scmutil: rewrite dirs in C, use if available Bryan O'Sullivan <bryano@fb.com> parents: 18898 diff changeset	914
18897 38982de2b4eb scmutil: migrate finddirs from dirstate Bryan O'Sullivan <bryano@fb.com> parents: 18865 diff changeset	915 def finddirs(path):
38982de2b4eb scmutil: migrate finddirs from dirstate Bryan O'Sullivan <bryano@fb.com> parents: 18865 diff changeset	916 pos = path.rfind('/')
38982de2b4eb scmutil: migrate finddirs from dirstate Bryan O'Sullivan <bryano@fb.com> parents: 18865 diff changeset	917 while pos != -1:
38982de2b4eb scmutil: migrate finddirs from dirstate Bryan O'Sullivan <bryano@fb.com> parents: 18865 diff changeset	918 yield path[:pos]
38982de2b4eb scmutil: migrate finddirs from dirstate Bryan O'Sullivan <bryano@fb.com> parents: 18865 diff changeset	919 pos = path.rfind('/', 0, pos)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/scmutil.py @ 20364:a6cf48b2880d