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

annotate mercurial/localrepo.py @ 13411:d4de90a612f7

commit: abort if a subrepo is modified and ui.commitsubrepos=no The default behaviour is to commit subrepositories with uncommitted changes. In my experience this is usually undesirable: - Changes to dependencies are often debugging leftovers - Real changes should generally be applied on the source project directly, tested then committed. This is not always possible, subversion subrepos may include only a small part of the source project, without the tests. Setting ui.commitsubrepos=no will now abort commits containing such modified subrepositories like: $ hg --config ui.commitsubrepos=no ci -m msg abort: uncommitted changes in subrepo sub I ruled out the hook solution because it does not easily take --include/exclude options in account. Also, my main concern is whether this flag could cause problems with extensions. If there are legitimate reasons for callers to override this behaviour (I could not find any), they might either override at ui level, or we could add an argument to localrepo.commit() later. v2: - Renamed ui.commitsubs to ui.commitsubrepos - Mention the configuration entry in hg help subrepos

author	Patrick Mezard <pmezard@gmail.com>
date	Tue, 15 Feb 2011 22:25:48 +0100
parents	14f3795a5ed7
children	58c497d0e44d

rev	line source
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	1 # localrepo.py - read/write repository class for mercurial
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9954 diff changeset	6 # GNU General Public License version 2 or any later version.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 6210 diff changeset	8 from node import bin, hex, nullid, nullrev, short
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
11368 b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	10 import repo, changegroup, subrepo, discovery, pushkey
13355 cce2e7b77e36 bookmarks: move property methods into localrepo Matt Mackall <mpm@selenic.com> parents: 13341 diff changeset	11 import changelog, dirstate, filelog, manifest, context, bookmarks
8390 beae42f3d93b drop unused imports Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8312 diff changeset	12 import lock, transaction, store, encoding
8312 b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8294 diff changeset	13 import util, extensions, hook, error
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	14 import match as matchmod
5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	15 import merge as mergemod
5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	16 import tags as tagsmod
10886 38f2ef9c134b localrepo: do not store URL password in undo.desc Patrick Mezard <pmezard@gmail.com> parents: 10882 diff changeset	17 import url as urlmod
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	18 from lock import release
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11301 diff changeset	19 import weakref, errno, os, time, inspect
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	20 propertycache = util.propertycache
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	21
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	22 class localrepository(repo.repository):
11368 b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	23 capabilities = set(('lookup', 'changegroupsubset', 'branchmap', 'pushkey'))
12295 3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	24 supportedformats = set(('revlogv1', 'parentdelta'))
12687 34d8247a4595 store: encode first period or space in filenames (issue1713) Adrian Buehlmann <adrian@cadifra.com> parents: 12622 diff changeset	25 supported = supportedformats \| set(('store', 'fncache', 'shared',
34d8247a4595 store: encode first period or space in filenames (issue1713) Adrian Buehlmann <adrian@cadifra.com> parents: 12622 diff changeset	26 'dotencode'))
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	27
8189 d2899a856f9f ui: replace parentui mechanism with repo.baseui Matt Mackall <mpm@selenic.com> parents: 8156 diff changeset	28 def __init__(self, baseui, path=None, create=0):
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	29 repo.repository.__init__(self)
11154 17031fea4e95 expand paths to local repository or bundle in appropriate classes Alexander Solovyov <piranha@piranha.org.ua> parents: 10925 diff changeset	30 self.root = os.path.realpath(util.expandpath(path))
4170 7b5723c95a82 Save an absolute path in repo.path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4168 diff changeset	31 self.path = os.path.join(self.root, ".hg")
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	32 self.origroot = path
12162 af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	33 self.auditor = util.path_auditor(self.root, self._checknested)
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	34 self.opener = util.opener(self.path)
a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	35 self.wopener = util.opener(self.root)
8797 9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	36 self.baseui = baseui
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	37 self.ui = baseui.copy()
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	38
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	39 try:
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	40 self.ui.readconfig(self.join("hgrc"), self.root)
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	41 extensions.loadall(self.ui)
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	42 except IOError:
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	43 pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	44
3035 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	45 if not os.path.isdir(self.path):
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	46 if create:
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	47 if not os.path.exists(path):
11640 c3e8ab80ee90 init: create target directory recursively Mads Kiilerich <mads@kiilerich.com> parents: 11486 diff changeset	48 util.makedirs(path)
3035 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	49 os.mkdir(self.path)
4166 c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	50 requirements = ["revlogv1"]
8797 9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	51 if self.ui.configbool('format', 'usestore', True):
4163 fe41d9a186ab Allow disabling store format to work with absurdly long filenames Matt Mackall <mpm@selenic.com> parents: 4161 diff changeset	52 os.mkdir(os.path.join(self.path, "store"))
4166 c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	53 requirements.append("store")
8797 9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	54 if self.ui.configbool('format', 'usefncache', True):
7234 ae70fe6143fc add format.usefncache config option (default is true) Adrian Buehlmann <adrian@cadifra.com> parents: 7233 diff changeset	55 requirements.append("fncache")
12687 34d8247a4595 store: encode first period or space in filenames (issue1713) Adrian Buehlmann <adrian@cadifra.com> parents: 12622 diff changeset	56 if self.ui.configbool('format', 'dotencode', True):
34d8247a4595 store: encode first period or space in filenames (issue1713) Adrian Buehlmann <adrian@cadifra.com> parents: 12622 diff changeset	57 requirements.append('dotencode')
4166 c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	58 # create an invalid changelog
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	59 self.opener("00changelog.i", "a").write(
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	60 '\0\0\0\2' # represents revlogv2
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	61 ' dummy changelog to prevent using the old repo layout'
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	62 )
11932 01778673aab7 localrepo: add parentdelta to requires only if enabled in config file Pradeepkumar Gayam <in3xes@gmail.com> parents: 11702 diff changeset	63 if self.ui.configbool('format', 'parentdelta', False):
01778673aab7 localrepo: add parentdelta to requires only if enabled in config file Pradeepkumar Gayam <in3xes@gmail.com> parents: 11702 diff changeset	64 requirements.append("parentdelta")
3035 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	65 else:
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	66 raise error.RepoError(_("repository %s not found") % path)
3035 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	67 elif create:
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	68 raise error.RepoError(_("repository %s already exists") % path)
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	69 else:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	70 # find requirements
8262 3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	71 requirements = set()
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	72 try:
8262 3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	73 requirements = set(self.opener("requires").read().splitlines())
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	74 except IOError, inst:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	75 if inst.errno != errno.ENOENT:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	76 raise
8262 3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	77 for r in requirements - self.supported:
3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	78 raise error.RepoError(_("requirement '%s' not supported") % r)
405 99470ae6b424 Check if repository exists mpm@selenic.com parents: 402 diff changeset	79
8799 87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	80 self.sharedpath = self.path
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	81 try:
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	82 s = os.path.realpath(self.opener("sharedpath").read())
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	83 if not os.path.exists(s):
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	84 raise error.RepoError(
8908 105343f9f744 Fix warning: Seen unexpected token "%" Dongsheng Song <dongsheng.song@gmail.com> parents: 8813 diff changeset	85 _('.hg/sharedpath points to nonexistent directory %s') % s)
8799 87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	86 self.sharedpath = s
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	87 except IOError, inst:
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	88 if inst.errno != errno.ENOENT:
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	89 raise
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	90
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	91 self.store = store.store(requirements, self.sharedpath, util.opener)
6840 80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	92 self.spath = self.store.path
80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	93 self.sopener = self.store.opener
80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	94 self.sjoin = self.store.join
80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	95 self.opener.createmode = self.store.createmode
12295 3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	96 self._applyrequirements(requirements)
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	97 if create:
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	98 self._writerequirements()
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	99
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	100 # These two define the set of tags for this repository. _tags
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	101 # maps tag name to node; _tagtypes maps tag name to 'global' or
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	102 # 'local'. (Global tags are defined by .hgtags across all
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	103 # heads, and local tags are defined in .hg/localtags.) They
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	104 # constitute the in-memory cache of tags.
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	105 self._tags = None
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	106 self._tagtypes = None
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	107
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13037 diff changeset	108 self._branchcache = None
6121 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	109 self._branchcachetip = None
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	110 self.nodetagscache = None
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	111 self.filterpats = {}
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	112 self._datafilters = {}
4916 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	113 self._transref = self._lockref = self._wlockref = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	114
12295 3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	115 def _applyrequirements(self, requirements):
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	116 self.requirements = requirements
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	117 self.sopener.options = {}
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	118 if 'parentdelta' in requirements:
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	119 self.sopener.options['parentdelta'] = 1
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	120
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	121 def _writerequirements(self):
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	122 reqfile = self.opener("requires", "w")
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	123 for r in self.requirements:
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	124 reqfile.write("%s\n" % r)
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	125 reqfile.close()
3388ab21d768 localrepo: factor out requirement application and write Sune Foldager <cryo@cyanite.org> parents: 12176 diff changeset	126
12162 af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	127 def _checknested(self, path):
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	128 """Determine if path is a legal nested repository."""
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	129 if not path.startswith(self.root):
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	130 return False
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	131 subpath = path[len(self.root) + 1:]
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	132
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	133 # XXX: Checking against the current working copy is wrong in
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	134 # the sense that it can reject things like
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	135 #
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	136 # $ hg cat -r 10 sub/x.txt
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	137 #
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	138 # if sub/ is no longer a subrepository in the working copy
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	139 # parent revision.
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	140 #
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	141 # However, it can of course also allow things that would have
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	142 # been rejected before, such as the above cat command if sub/
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	143 # is a subrepository now, but was a normal directory before.
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	144 # The old path auditor would have rejected by mistake since it
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	145 # panics when it sees sub/.hg/.
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	146 #
12174 7bccd04292a2 localrepo: check nested repos against working directory Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	147 # All in all, checking against the working copy seems sensible
7bccd04292a2 localrepo: check nested repos against working directory Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	148 # since we want to prevent access to nested repositories on
7bccd04292a2 localrepo: check nested repos against working directory Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	149 # the filesystem now.
7bccd04292a2 localrepo: check nested repos against working directory Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	150 ctx = self[None]
12162 af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	151 parts = util.splitpath(subpath)
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	152 while parts:
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	153 prefix = os.sep.join(parts)
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	154 if prefix in ctx.substate:
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	155 if prefix == subpath:
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	156 return True
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	157 else:
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	158 sub = ctx.sub(prefix)
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	159 return sub.checknested(subpath[len(prefix) + 1:])
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	160 else:
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	161 parts.pop()
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	162 return False
af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	163
13355 cce2e7b77e36 bookmarks: move property methods into localrepo Matt Mackall <mpm@selenic.com> parents: 13341 diff changeset	164 @util.propertycache
cce2e7b77e36 bookmarks: move property methods into localrepo Matt Mackall <mpm@selenic.com> parents: 13341 diff changeset	165 def _bookmarks(self):
cce2e7b77e36 bookmarks: move property methods into localrepo Matt Mackall <mpm@selenic.com> parents: 13341 diff changeset	166 return bookmarks.read(self)
cce2e7b77e36 bookmarks: move property methods into localrepo Matt Mackall <mpm@selenic.com> parents: 13341 diff changeset	167
cce2e7b77e36 bookmarks: move property methods into localrepo Matt Mackall <mpm@selenic.com> parents: 13341 diff changeset	168 @util.propertycache
cce2e7b77e36 bookmarks: move property methods into localrepo Matt Mackall <mpm@selenic.com> parents: 13341 diff changeset	169 def _bookmarkcurrent(self):
cce2e7b77e36 bookmarks: move property methods into localrepo Matt Mackall <mpm@selenic.com> parents: 13341 diff changeset	170 return bookmarks.readcurrent(self)
12162 af8c4929931c localrepo: add auditor attribute which knows about subrepos Martin Geisler <mg@lazybytes.net> parents: 12127 diff changeset	171
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	172 @propertycache
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	173 def changelog(self):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	174 c = changelog.changelog(self.sopener)
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	175 if 'HG_PENDING' in os.environ:
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	176 p = os.environ['HG_PENDING']
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	177 if p.startswith(self.root):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	178 c.readpending('00changelog.i.a')
10322 d9a2bc2f776b add options dict to localrepo.store.opener and use it for defversion Vsevolod Solovyov <vsevolod.solovyov@gmail.com> parents: 10320 diff changeset	179 self.sopener.options['defversion'] = c.version
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	180 return c
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	181
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	182 @propertycache
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	183 def manifest(self):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	184 return manifest.manifest(self.sopener)
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	185
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	186 @propertycache
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	187 def dirstate(self):
13032 e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	188 warned = [0]
e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	189 def validate(node):
e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	190 try:
e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	191 r = self.changelog.rev(node)
e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	192 return node
e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	193 except error.LookupError:
e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	194 if not warned[0]:
e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	195 warned[0] = True
e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	196 self.ui.warn(_("warning: ignoring unknown"
13037 9beac11b8c56 localrepo: move string formatting out of gettext call Martin Geisler <mg@aragost.com> parents: 13032 diff changeset	197 " working parent %s!\n") % short(node))
13032 e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	198 return nullid
e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	199
e41e2b79883d dirstate: warn on invalid parents rather than aborting Matt Mackall <mpm@selenic.com> parents: 13001 diff changeset	200 return dirstate.dirstate(self.opener, self.ui, self.root, validate)
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	201
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	202 def __getitem__(self, changeid):
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8515 diff changeset	203 if changeid is None:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	204 return context.workingctx(self)
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	205 return context.changectx(self, changeid)
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	206
9924 ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	207 def __contains__(self, changeid):
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	208 try:
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	209 return bool(self.lookup(changeid))
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	210 except error.RepoLookupError:
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	211 return False
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	212
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	213 def __nonzero__(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	214 return True
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	215
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	216 def __len__(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	217 return len(self.changelog)
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	218
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	219 def __iter__(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	220 for i in xrange(len(self)):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	221 yield i
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	222
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	223 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	224 return 'file:' + self.root
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	225
1718 c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	226 def hook(self, name, throw=False, **args):
4622 fff50306e6dd hooks: separate hook code into a separate module Matt Mackall <mpm@selenic.com> parents: 4619 diff changeset	227 return hook.hook(self.ui, self, name, throw, **args)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	228
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	229 tag_disallowed = ':\r\n'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	230
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	231 def _tag(self, names, node, message, local, user, date, extra={}):
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	232 if isinstance(names, str):
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	233 allchars = names
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	234 names = (names,)
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	235 else:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	236 allchars = ''.join(names)
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	237 for c in self.tag_disallowed:
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	238 if c in allchars:
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	239 raise util.Abort(_('%r cannot be used in a tag name') % c)
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	240
11063 eb23c876c111 tag: warn users about tag/branch possible name conflicts Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11047 diff changeset	241 branches = self.branchmap()
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	242 for name in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	243 self.hook('pretag', throw=True, node=hex(node), tag=name,
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	244 local=local)
11063 eb23c876c111 tag: warn users about tag/branch possible name conflicts Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11047 diff changeset	245 if name in branches:
eb23c876c111 tag: warn users about tag/branch possible name conflicts Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11047 diff changeset	246 self.ui.warn(_("warning: tag %s conflicts with existing"
eb23c876c111 tag: warn users about tag/branch possible name conflicts Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11047 diff changeset	247 " branch name\n") % name)
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	248
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	249 def writetags(fp, names, munge, prevtags):
5985 850494d62674 localrepo._tag: add a seek before writing the new tag Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5882 diff changeset	250 fp.seek(0, 2)
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	251 if prevtags and prevtags[-1] != '\n':
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	252 fp.write('\n')
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	253 for name in names:
6671 938eddd76237 tag: record tag we're superseding, if any (issue 1102) Matt Mackall <mpm@selenic.com> parents: 6647 diff changeset	254 m = munge and munge(name) or name
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	255 if self._tagtypes and name in self._tagtypes:
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	256 old = self._tags.get(name, nullid)
6671 938eddd76237 tag: record tag we're superseding, if any (issue 1102) Matt Mackall <mpm@selenic.com> parents: 6647 diff changeset	257 fp.write('%s %s\n' % (hex(old), m))
938eddd76237 tag: record tag we're superseding, if any (issue 1102) Matt Mackall <mpm@selenic.com> parents: 6647 diff changeset	258 fp.write('%s %s\n' % (hex(node), m))
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	259 fp.close()
5081 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4932 diff changeset	260
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	261 prevtags = ''
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	262 if local:
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	263 try:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	264 fp = self.opener('localtags', 'r+')
7875 553aa0cbeab6 cleanup: drop unused assignments Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7848 diff changeset	265 except IOError:
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	266 fp = self.opener('localtags', 'a')
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	267 else:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	268 prevtags = fp.read()
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	269
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	270 # local tags are stored in the current charset
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	271 writetags(fp, names, None, prevtags)
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	272 for name in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	273 self.hook('tag', node=hex(node), tag=name, local=local)
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	274 return
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	275
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	276 try:
0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	277 fp = self.wfile('.hgtags', 'rb+')
0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	278 except IOError:
0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	279 fp = self.wfile('.hgtags', 'ab')
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	280 else:
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	281 prevtags = fp.read()
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	282
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	283 # committed tags are stored in UTF-8
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7930 diff changeset	284 writetags(fp, names, encoding.fromlocal, prevtags)
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	285
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13391 diff changeset	286 fp.close()
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13391 diff changeset	287
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	288 if '.hgtags' not in self.dirstate:
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11301 diff changeset	289 self[None].add(['.hgtags'])
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	290
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	291 m = matchmod.exact(self.root, '', ['.hgtags'])
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	292 tagnode = self.commit(message, user, date, extra=extra, match=m)
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	293
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	294 for name in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	295 self.hook('tag', node=hex(node), tag=name, local=local)
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	296
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	297 return tagnode
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	298
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	299 def tag(self, names, node, message, local, user, date):
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	300 '''tag a revision with one or more symbolic names.
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	301
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	302 names is a list of strings or, when adding a single tag, names may be a
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	303 string.
6334 7016f7fb8fe3 tab/space cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 6321 diff changeset	304
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	305 if local is True, the tags are stored in a per-repository file.
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	306 otherwise, they are stored in the .hgtags file, and a new
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	307 changeset is committed with the change.
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	308
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	309 keyword arguments:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	310
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	311 local: whether to store tags in non-version-controlled file
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	312 (default False)
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	313
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	314 message: commit message to use if committing
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	315
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	316 user: name of user to use if committing
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	317
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	318 date: date tuple to use if committing'''
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	319
13133 c1492615cdee tag: don't check .hgtags status if --local passed Kevin Bullock <kbullock@ringworld.org> parents: 13000 diff changeset	320 if not local:
c1492615cdee tag: don't check .hgtags status if --local passed Kevin Bullock <kbullock@ringworld.org> parents: 13000 diff changeset	321 for x in self.status()[:5]:
c1492615cdee tag: don't check .hgtags status if --local passed Kevin Bullock <kbullock@ringworld.org> parents: 13000 diff changeset	322 if '.hgtags' in x:
c1492615cdee tag: don't check .hgtags status if --local passed Kevin Bullock <kbullock@ringworld.org> parents: 13000 diff changeset	323 raise util.Abort(_('working copy of .hgtags is changed '
c1492615cdee tag: don't check .hgtags status if --local passed Kevin Bullock <kbullock@ringworld.org> parents: 13000 diff changeset	324 '(please commit .hgtags manually)'))
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	325
7814 4421abf8c85d tag: force load of tag cache Matt Mackall <mpm@selenic.com> parents: 7803 diff changeset	326 self.tags() # instantiate the cache
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	327 self._tag(names, node, message, local, user, date)
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	328
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	329 def tags(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	330 '''return a mapping of tag to node'''
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	331 if self._tags is None:
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	332 (self._tags, self._tagtypes) = self._findtags()
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	333
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	334 return self._tags
4210 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4178 diff changeset	335
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	336 def _findtags(self):
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	337 '''Do the hard work of finding tags. Return a pair of dicts
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	338 (tags, tagtypes) where tags maps tag name to node, and tagtypes
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	339 maps tag name to a string like \'global\' or \'local\'.
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	340 Subclasses or extensions are free to add their own tags, but
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	341 should be aware that the returned dicts will be retained for the
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	342 duration of the localrepo object.'''
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	343
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	344 # XXX what tagtype should subclasses/extensions use? Currently
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	345 # mq and bookmarks add tags, but do not set the tagtype at all.
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	346 # Should each extension invent its own tag type? Should there
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	347 # be one tagtype for all such "virtual" tags? Or is the status
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	348 # quo fine?
4210 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4178 diff changeset	349
9148 b7837f0ed9fe localrepo: factor updatetags() out of readtags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9147 diff changeset	350 alltags = {} # map tag name to (node, hist)
5657 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	351 tagtypes = {}
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	352
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	353 tagsmod.findglobaltags(self.ui, self, alltags, tagtypes)
5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	354 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
5657 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	355
9152 4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	356 # Build the return dicts. Have to re-encode tag names because
4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	357 # the tags module always uses UTF-8 (in order not to lose info
4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	358 # writing to the cache), but the rest of Mercurial wants them in
4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	359 # local encoding.
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	360 tags = {}
9147 234a230cc33b localrepo: improve readability of _findtags(), readtags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9146 diff changeset	361 for (name, (node, hist)) in alltags.iteritems():
234a230cc33b localrepo: improve readability of _findtags(), readtags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9146 diff changeset	362 if node != nullid:
9152 4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	363 tags[encoding.tolocal(name)] = node
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	364 tags['tip'] = self.changelog.tip()
9152 4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	365 tagtypes = dict([(encoding.tolocal(name), value)
4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	366 for (name, value) in tagtypes.iteritems()])
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	367 return (tags, tagtypes)
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	368
5657 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	369 def tagtype(self, tagname):
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	370 '''
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	371 return the type of the given tag. result can be:
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	372
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	373 'local' : a local tag
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	374 'global' : a global tag
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	375 None : tag does not exist
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	376 '''
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	377
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	378 self.tags()
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5757 diff changeset	379
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	380 return self._tagtypes.get(tagname)
5657 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	381
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	382 def tagslist(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	383 '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	384 l = []
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7599 diff changeset	385 for t, n in self.tags().iteritems():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	386 try:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	387 r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	388 except:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	389 r = -2 # sort to the beginning of the list if unknown
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	390 l.append((r, t, n))
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	391 return [(t, n) for r, t, n in sorted(l)]
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	392
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	393 def nodetags(self, node):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	394 '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	395 if not self.nodetagscache:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	396 self.nodetagscache = {}
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7599 diff changeset	397 for t, n in self.tags().iteritems():
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	398 self.nodetagscache.setdefault(n, []).append(t)
11047 c7dbd6c4877a tags: return tags in sorted order Eric Eisner <ede@mit.edu> parents: 10970 diff changeset	399 for tags in self.nodetagscache.itervalues():
c7dbd6c4877a tags: return tags in sorted order Eric Eisner <ede@mit.edu> parents: 10970 diff changeset	400 tags.sort()
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	401 return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	402
13384 caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13365 diff changeset	403 def nodebookmarks(self, node):
caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13365 diff changeset	404 marks = []
caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13365 diff changeset	405 for bookmark, n in self._bookmarks.iteritems():
caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13365 diff changeset	406 if n == node:
caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13365 diff changeset	407 marks.append(bookmark)
caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13365 diff changeset	408 return sorted(marks)
caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13365 diff changeset	409
6120 f89878df40fe move the reading of branch.cache from _branchtags to branchtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6119 diff changeset	410 def _branchtags(self, partial, lrev):
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	411 # TODO: rename this function?
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	412 tiprev = len(self) - 1
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	413 if lrev != tiprev:
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10725 diff changeset	414 ctxgen = (self[r] for r in xrange(lrev + 1, tiprev + 1))
fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10725 diff changeset	415 self._updatebranchcache(partial, ctxgen)
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	416 self._writebranchcache(partial, self.changelog.tip(), tiprev)
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	417
3826 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3803 diff changeset	418 return partial
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3803 diff changeset	419
12066 d01e28657429 localrepo: introduce method for explicit branch cache update Georg Brandl <georg@python.org> parents: 12035 diff changeset	420 def updatebranchcache(self):
9671 9471d9a900b4 transfer branchmap branch names over the wire in utf-8 Henrik Stuart <henrik.stuart@edlund.dk> parents: 9569 diff changeset	421 tip = self.changelog.tip()
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	422 if self._branchcache is not None and self._branchcachetip == tip:
603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	423 return self._branchcache
9671 9471d9a900b4 transfer branchmap branch names over the wire in utf-8 Henrik Stuart <henrik.stuart@edlund.dk> parents: 9569 diff changeset	424
6121 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	425 oldtip = self._branchcachetip
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	426 self._branchcachetip = tip
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	427 if oldtip is None or oldtip not in self.changelog.nodemap:
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	428 partial, last, lrev = self._readbranchcache()
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	429 else:
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	430 lrev = self.changelog.rev(oldtip)
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	431 partial = self._branchcache
6121 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	432
6120 f89878df40fe move the reading of branch.cache from _branchtags to branchtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6119 diff changeset	433 self._branchtags(partial, lrev)
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	434 # this private cache holds all heads (not just tips)
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	435 self._branchcache = partial
3826 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3803 diff changeset	436
12066 d01e28657429 localrepo: introduce method for explicit branch cache update Georg Brandl <georg@python.org> parents: 12035 diff changeset	437 def branchmap(self):
d01e28657429 localrepo: introduce method for explicit branch cache update Georg Brandl <georg@python.org> parents: 12035 diff changeset	438 '''returns a dictionary {branch: [branchheads]}'''
d01e28657429 localrepo: introduce method for explicit branch cache update Georg Brandl <georg@python.org> parents: 12035 diff changeset	439 self.updatebranchcache()
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	440 return self._branchcache
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	441
816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	442 def branchtags(self):
816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	443 '''return a dict where branch names map to the tipmost head of
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	444 the branch, open heads come before closed'''
6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	445 bt = {}
9675 ee913987e4b0 localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9674 diff changeset	446 for bn, heads in self.branchmap().iteritems():
10392 9be6c5900c07 localrepo: cleanup branch tip computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	447 tip = heads[-1]
9be6c5900c07 localrepo: cleanup branch tip computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	448 for h in reversed(heads):
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	449 if 'close' not in self.changelog.read(h)[5]:
10392 9be6c5900c07 localrepo: cleanup branch tip computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	450 tip = h
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	451 break
10392 9be6c5900c07 localrepo: cleanup branch tip computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	452 bt[bn] = tip
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	453 return bt
6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	454
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	455 def _readbranchcache(self):
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	456 partial = {}
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	457 try:
13341 4e33ef68b1f8 remove pointless os.path.join calls when opening files in .hg/cache Adrian Buehlmann <adrian@cadifra.com> parents: 13327 diff changeset	458 f = self.opener("cache/branchheads")
3668 6f6696962986 don't use readline() to read branches.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3664 diff changeset	459 lines = f.read().split('\n')
6f6696962986 don't use readline() to read branches.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3664 diff changeset	460 f.close()
4415 1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	461 except (IOError, OSError):
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	462 return {}, nullid, nullrev
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	463
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	464 try:
4167 4574a8cb080f Store empty (default) branch in branch cache, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 4128 diff changeset	465 last, lrev = lines.pop(0).split(" ", 1)
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	466 last, lrev = bin(last), int(lrev)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	467 if lrev >= len(self) or self[lrev].node() != last:
3761 9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	468 # invalidate the cache
6056 0ad2ffbf6b38 Print less scary warning when invalidating the branch cache. Thomas Arendsen Hein <thomas@intevation.de> parents: 6001 diff changeset	469 raise ValueError('invalidating branch cache (tip differs)')
3761 9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	470 for l in lines:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	471 if not l:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	472 continue
4167 4574a8cb080f Store empty (default) branch in branch cache, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 4128 diff changeset	473 node, label = l.split(" ", 1)
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13037 diff changeset	474 label = encoding.tolocal(label.strip())
6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13037 diff changeset	475 partial.setdefault(label, []).append(bin(node))
7644 182b7114d35a error: move SignalInterrupt Matt Mackall <mpm@selenic.com> parents: 7641 diff changeset	476 except KeyboardInterrupt:
3761 9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	477 raise
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	478 except Exception, inst:
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	479 if self.ui.debugflag:
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	480 self.ui.warn(str(inst), '\n')
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	481 partial, last, lrev = {}, nullid, nullrev
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	482 return partial, last, lrev
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	483
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	484 def _writebranchcache(self, branches, tip, tiprev):
3452 fcf14d87e0a4 If we can't write the branch cache, fail quietly. Matt Mackall <mpm@selenic.com> parents: 3450 diff changeset	485 try:
13341 4e33ef68b1f8 remove pointless os.path.join calls when opening files in .hg/cache Adrian Buehlmann <adrian@cadifra.com> parents: 13327 diff changeset	486 f = self.opener("cache/branchheads", "w", atomictemp=True)
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	487 f.write("%s %s\n" % (hex(tip), tiprev))
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	488 for label, nodes in branches.iteritems():
816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	489 for node in nodes:
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13037 diff changeset	490 f.write("%s %s\n" % (hex(node), encoding.fromlocal(label)))
4329 cea5ba038a1d use atomictemp files to write branch.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4266 diff changeset	491 f.rename()
4415 1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	492 except (IOError, OSError):
3452 fcf14d87e0a4 If we can't write the branch cache, fail quietly. Matt Mackall <mpm@selenic.com> parents: 3450 diff changeset	493 pass
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	494
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10725 diff changeset	495 def _updatebranchcache(self, partial, ctxgen):
8954 e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	496 # collect new branch entries
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	497 newbranches = {}
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10725 diff changeset	498 for c in ctxgen:
8954 e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	499 newbranches.setdefault(c.branch(), []).append(c.node())
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	500 # if older branchheads are reachable from new ones, they aren't
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	501 # really branchheads. Note checking parents is insufficient:
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	502 # 1 (branch a) -> 2 (branch b) -> 3 (branch a)
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	503 for branch, newnodes in newbranches.iteritems():
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	504 bheads = partial.setdefault(branch, [])
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	505 bheads.extend(newnodes)
10920 39c69b5dc258 localrepo: simplify _updatebranchcache slightly Sune Foldager <cryo@cyanite.org> parents: 10912 diff changeset	506 if len(bheads) <= 1:
8954 e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	507 continue
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	508 # starting from tip means fewer passes over reachable
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	509 while newnodes:
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	510 latest = newnodes.pop()
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	511 if latest not in bheads:
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	512 continue
9120 d3b995dd4eab branch heads: optimise computation of branch head cache (issue1734) Henrik Stuart <hg@hstuart.dk> parents: 9093 diff changeset	513 minbhrev = self[min([self[bh].rev() for bh in bheads])].node()
d3b995dd4eab branch heads: optimise computation of branch head cache (issue1734) Henrik Stuart <hg@hstuart.dk> parents: 9093 diff changeset	514 reachable = self.changelog.reachable(latest, minbhrev)
10920 39c69b5dc258 localrepo: simplify _updatebranchcache slightly Sune Foldager <cryo@cyanite.org> parents: 10912 diff changeset	515 reachable.remove(latest)
8954 e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	516 bheads = [b for b in bheads if b not in reachable]
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	517 partial[branch] = bheads
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	518
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	519 def lookup(self, key):
7377 374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	520 if isinstance(key, int):
374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	521 return self.changelog.node(key)
374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	522 elif key == '.':
6736 369ddc9c0339 lookup: optimize '.' Matt Mackall <mpm@selenic.com> parents: 6732 diff changeset	523 return self.dirstate.parents()[0]
3801 bd7011246fab Add "null" pseudo-tag pointing to nullid Brendan Cully <brendan@kublai.com> parents: 3791 diff changeset	524 elif key == 'null':
bd7011246fab Add "null" pseudo-tag pointing to nullid Brendan Cully <brendan@kublai.com> parents: 3791 diff changeset	525 return nullid
7377 374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	526 elif key == 'tip':
374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	527 return self.changelog.tip()
3453 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	528 n = self.changelog._match(key)
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	529 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	530 return n
13363 999f616b09dc bookmarks: merge lookup into localrepo Matt Mackall <mpm@selenic.com> parents: 13360 diff changeset	531 if key in self._bookmarks:
999f616b09dc bookmarks: merge lookup into localrepo Matt Mackall <mpm@selenic.com> parents: 13360 diff changeset	532 return self._bookmarks[key]
3418 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	533 if key in self.tags():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	534 return self.tags()[key]
3418 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	535 if key in self.branchtags():
5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	536 return self.branchtags()[key]
3453 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	537 n = self.changelog._partialmatch(key)
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	538 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	539 return n
8639 1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	540
1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	541 # can't find key, check if it might have come from damaged dirstate
1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	542 if key in self.dirstate.parents():
1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	543 raise error.Abort(_("working directory has unknown parent '%s'!")
1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	544 % short(key))
4916 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	545 try:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	546 if len(key) == 20:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	547 key = hex(key)
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	548 except:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	549 pass
9423 1444a42f6052 Make distinct lookup error for localrepo.lookup Matt Mackall <mpm@selenic.com> parents: 9120 diff changeset	550 raise error.RepoLookupError(_("unknown revision '%s'") % key)
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	551
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	552 def lookupbranch(self, key, remote=None):
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	553 repo = remote or self
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	554 if key in repo.branchmap():
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	555 return key
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	556
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	557 repo = (remote and remote.local()) and remote or self
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	558 return repo[key].branch()
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	559
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	560 def local(self):
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	561 return True
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	562
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	563 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	564 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	565
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	566 def wjoin(self, f):
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	567 return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	568
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	569 def file(self, f):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	570 if f[0] == '/':
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	571 f = f[1:]
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4232 diff changeset	572 return filelog.filelog(self.sopener, f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	573
6739 c9fbd6ec3489 context: avoid using None for working parent Matt Mackall <mpm@selenic.com> parents: 6736 diff changeset	574 def changectx(self, changeid):
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	575 return self[changeid]
3218 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3164 diff changeset	576
3163 1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	577 def parents(self, changeid=None):
6742 2d54e7c1e69d context: clean up parents() Matt Mackall <mpm@selenic.com> parents: 6740 diff changeset	578 '''get list of changectxs for parents of changeid'''
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	579 return self[changeid].parents()
3163 1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	580
2564 55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	581 def filectx(self, path, changeid=None, fileid=None):
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	582 """changeid can be a changeset revision, node, or tag.
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	583 fileid can be a file revision or node."""
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	584 return context.filectx(self, path, changeid, fileid)
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	585
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	586 def getcwd(self):
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	587 return self.dirstate.getcwd()
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	588
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4516 diff changeset	589 def pathto(self, f, cwd=None):
78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4516 diff changeset	590 return self.dirstate.pathto(f, cwd)
78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4516 diff changeset	591
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	592 def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	593 return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	594
4275 81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	595 def _link(self, f):
81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	596 return os.path.islink(self.wjoin(f))
81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	597
11698 9df481f8036d localrepo: refactor filter computation Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11669 diff changeset	598 def _loadfilter(self, filter):
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	599 if filter not in self.filterpats:
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	600 l = []
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	601 for pat, cmd in self.ui.configitems(filter):
7226 b71a52f101dc Make it possible to disable filtering for a pattern. Mads Kiilerich <mads@kiilerich.com> parents: 7208 diff changeset	602 if cmd == '!':
b71a52f101dc Make it possible to disable filtering for a pattern. Mads Kiilerich <mads@kiilerich.com> parents: 7208 diff changeset	603 continue
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	604 mf = matchmod.match(self.root, '', [pat])
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	605 fn = None
6066 f3a8b5360100 Strip filter name from command before passing to filter function. Jesse Glick <jesse.glick@sun.com> parents: 6065 diff changeset	606 params = cmd
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	607 for name, filterfn in self._datafilters.iteritems():
6210 942287cb1f57 Removed trailing spaces from everything except test output Thomas Arendsen Hein <thomas@intevation.de> parents: 6201 diff changeset	608 if cmd.startswith(name):
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	609 fn = filterfn
6066 f3a8b5360100 Strip filter name from command before passing to filter function. Jesse Glick <jesse.glick@sun.com> parents: 6065 diff changeset	610 params = cmd[len(name):].lstrip()
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	611 break
11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	612 if not fn:
5967 f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	613 fn = lambda s, c, **kwargs: util.filter(s, c)
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	614 # Wrap old filters not supporting keyword arguments
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	615 if not inspect.getargspec(fn)[2]:
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	616 oldfn = fn
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	617 fn = lambda s, c, **kwargs: oldfn(s, c)
6066 f3a8b5360100 Strip filter name from command before passing to filter function. Jesse Glick <jesse.glick@sun.com> parents: 6065 diff changeset	618 l.append((mf, fn, params))
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	619 self.filterpats[filter] = l
12706 9ca08fbb750a localrepo: have _loadfilter return the loaded filter patterns Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12687 diff changeset	620 return self.filterpats[filter]
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	621
12707 2216ab103ea8 localrepo: load filter patterns outside of _filter Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12706 diff changeset	622 def _filter(self, filterpats, filename, data):
2216ab103ea8 localrepo: load filter patterns outside of _filter Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12706 diff changeset	623 for mf, fn, cmd in filterpats:
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	624 if mf(filename):
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	625 self.ui.debug("filtering %s through %s\n" % (filename, cmd))
5967 f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	626 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	627 break
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	628
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	629 return data
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	630
12708 8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	631 @propertycache
8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	632 def _encodefilterpats(self):
8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	633 return self._loadfilter('encode')
8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	634
8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	635 @propertycache
8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	636 def _decodefilterpats(self):
8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	637 return self._loadfilter('decode')
8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	638
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	639 def adddatafilter(self, name, filter):
11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	640 self._datafilters[name] = filter
11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	641
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	642 def wread(self, filename):
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	643 if self._link(filename):
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	644 data = os.readlink(self.wjoin(filename))
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	645 else:
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	646 data = self.wopener(filename, 'r').read()
12708 8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	647 return self._filter(self._encodefilterpats, filename, data)
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	648
4006 67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	649 def wwrite(self, filename, data, flags):
12708 8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	650 data = self._filter(self._decodefilterpats, filename, data)
6877 1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	651 if 'l' in flags:
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	652 self.wopener.symlink(data, filename)
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	653 else:
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	654 self.wopener(filename, 'w').write(data)
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	655 if 'x' in flags:
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	656 util.set_flags(self.wjoin(filename), False, True)
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	657
4005 656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 4004 diff changeset	658 def wwritedata(self, filename, data):
12708 8a08b12ae88e localrepo: use propertycaches to access encode/decode filters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12707 diff changeset	659 return self._filter(self._decodefilterpats, filename, data)
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	660
10881 a685011ed38e localrepo: add desc parameter to transaction Steve Borho <steve@borho.org> parents: 10877 diff changeset	661 def transaction(self, desc):
8072 ecf7795479d5 transaction: support multiple, separate transactions Henrik Stuart <henrik.stuart@edlund.dk> parents: 7948 diff changeset	662 tr = self._transref and self._transref() or None
ecf7795479d5 transaction: support multiple, separate transactions Henrik Stuart <henrik.stuart@edlund.dk> parents: 7948 diff changeset	663 if tr and tr.running():
ecf7795479d5 transaction: support multiple, separate transactions Henrik Stuart <henrik.stuart@edlund.dk> parents: 7948 diff changeset	664 return tr.nest()
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	665
5865 e7127f669edb transactions: don't show a backtrace when journal exists Matt Mackall <mpm@selenic.com> parents: 5814 diff changeset	666 # abort here if the journal already exists
e7127f669edb transactions: don't show a backtrace when journal exists Matt Mackall <mpm@selenic.com> parents: 5814 diff changeset	667 if os.path.exists(self.sjoin("journal")):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	668 raise error.RepoError(
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	669 _("abandoned transaction found - run hg recover"))
5865 e7127f669edb transactions: don't show a backtrace when journal exists Matt Mackall <mpm@selenic.com> parents: 5814 diff changeset	670
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2354 diff changeset	671 # save dirstate for rollback
263 e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	672 try:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	673 ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	674 except IOError:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	675 ds = ""
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	676 self.opener("journal.dirstate", "w").write(ds)
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13037 diff changeset	677 self.opener("journal.branch", "w").write(
6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13037 diff changeset	678 encoding.fromlocal(self.dirstate.branch()))
10892 e39e94377eb2 transaction: use newlines to separate description elements Matt Mackall <mpm@selenic.com> parents: 10888 diff changeset	679 self.opener("journal.desc", "w").write("%d\n%s\n" % (len(self), desc))
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	680
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3773 diff changeset	681 renames = [(self.sjoin("journal"), self.sjoin("undo")),
5814 dd5a501cb97f restore branch after rollback (issue 902) Alexandre Vassalotti <mercurial-bugs@selenic.com> parents: 5812 diff changeset	682 (self.join("journal.dirstate"), self.join("undo.dirstate")),
10881 a685011ed38e localrepo: add desc parameter to transaction Steve Borho <steve@borho.org> parents: 10877 diff changeset	683 (self.join("journal.branch"), self.join("undo.branch")),
a685011ed38e localrepo: add desc parameter to transaction Steve Borho <steve@borho.org> parents: 10877 diff changeset	684 (self.join("journal.desc"), self.join("undo.desc"))]
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	685 tr = transaction.transaction(self.ui.warn, self.sopener,
6065 53ed9b40cfc4 make the journal/undo files from transactions inherit the mode from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6062 diff changeset	686 self.sjoin("journal"),
53ed9b40cfc4 make the journal/undo files from transactions inherit the mode from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6062 diff changeset	687 aftertrans(renames),
6894 29772acb5d2a localrepo: kill _createmode Matt Mackall <mpm@selenic.com> parents: 6888 diff changeset	688 self.store.createmode)
4916 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	689 self._transref = weakref.ref(tr)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	690 return tr
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	691
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	692 def recover(self):
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	693 lock = self.lock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	694 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	695 if os.path.exists(self.sjoin("journal")):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	696 self.ui.status(_("rolling back interrupted transaction\n"))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	697 transaction.rollback(self.sopener, self.sjoin("journal"),
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	698 self.ui.warn)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	699 self.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	700 return True
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	701 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	702 self.ui.warn(_("no interrupted transaction available\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	703 return False
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	704 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	705 lock.release()
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	706
10882 f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	707 def rollback(self, dryrun=False):
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	708 wlock = lock = None
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	709 try:
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	710 wlock = self.wlock()
4438 3900f684a150 Fix hg import --exact bug that hangs hg on failure. Eric Hopper <hopper@omnifarious.org> parents: 4417 diff changeset	711 lock = self.lock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	712 if os.path.exists(self.sjoin("undo")):
10882 f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	713 try:
10892 e39e94377eb2 transaction: use newlines to separate description elements Matt Mackall <mpm@selenic.com> parents: 10888 diff changeset	714 args = self.opener("undo.desc", "r").read().splitlines()
e39e94377eb2 transaction: use newlines to separate description elements Matt Mackall <mpm@selenic.com> parents: 10888 diff changeset	715 if len(args) >= 3 and self.ui.verbose:
10893 468876bc3885 rollback: improve message Matt Mackall <mpm@selenic.com> parents: 10892 diff changeset	716 desc = _("rolling back to revision %s"
468876bc3885 rollback: improve message Matt Mackall <mpm@selenic.com> parents: 10892 diff changeset	717 " (undo %s: %s)\n") % (
11174 ba78a1bfbfd9 rollback: fix off-by-one in message Matt Mackall <mpm@selenic.com> parents: 11156 diff changeset	718 int(args[0]) - 1, args[1], args[2])
10892 e39e94377eb2 transaction: use newlines to separate description elements Matt Mackall <mpm@selenic.com> parents: 10888 diff changeset	719 elif len(args) >= 2:
10893 468876bc3885 rollback: improve message Matt Mackall <mpm@selenic.com> parents: 10892 diff changeset	720 desc = _("rolling back to revision %s (undo %s)\n") % (
11174 ba78a1bfbfd9 rollback: fix off-by-one in message Matt Mackall <mpm@selenic.com> parents: 11156 diff changeset	721 int(args[0]) - 1, args[1])
10892 e39e94377eb2 transaction: use newlines to separate description elements Matt Mackall <mpm@selenic.com> parents: 10888 diff changeset	722 except IOError:
10882 f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	723 desc = _("rolling back unknown transaction\n")
f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	724 self.ui.status(desc)
f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	725 if dryrun:
f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	726 return
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	727 transaction.rollback(self.sopener, self.sjoin("undo"),
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	728 self.ui.warn)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	729 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
13356 d96db730fcb2 bookmarks: merge rollback support into localrepo Matt Mackall <mpm@selenic.com> parents: 13355 diff changeset	730 if os.path.exists(self.join('undo.bookmarks')):
d96db730fcb2 bookmarks: merge rollback support into localrepo Matt Mackall <mpm@selenic.com> parents: 13355 diff changeset	731 util.rename(self.join('undo.bookmarks'),
d96db730fcb2 bookmarks: merge rollback support into localrepo Matt Mackall <mpm@selenic.com> parents: 13355 diff changeset	732 self.join('bookmarks'))
6058 88b4d726332a Do not abort rollback if undo.branch isn't available, but warn. Thomas Arendsen Hein <thomas@intevation.de> parents: 6056 diff changeset	733 try:
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn. Thomas Arendsen Hein <thomas@intevation.de> parents: 6056 diff changeset	734 branch = self.opener("undo.branch").read()
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn. Thomas Arendsen Hein <thomas@intevation.de> parents: 6056 diff changeset	735 self.dirstate.setbranch(branch)
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn. Thomas Arendsen Hein <thomas@intevation.de> parents: 6056 diff changeset	736 except IOError:
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn. Thomas Arendsen Hein <thomas@intevation.de> parents: 6056 diff changeset	737 self.ui.warn(_("Named branch could not be reset, "
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn. Thomas Arendsen Hein <thomas@intevation.de> parents: 6056 diff changeset	738 "current branch still is: %s\n")
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13037 diff changeset	739 % self.dirstate.branch())
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	740 self.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	741 self.dirstate.invalidate()
9150 09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	742 self.destroyed()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	743 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	744 self.ui.warn(_("no rollback information available\n"))
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11174 diff changeset	745 return 1
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	746 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	747 release(lock, wlock)
162 5dcbe4d9a30c Implement recover and undo commands mpm@selenic.com parents: 161 diff changeset	748
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	749 def invalidatecaches(self):
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	750 self._tags = None
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	751 self._tagtypes = None
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	752 self.nodetagscache = None
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	753 self._branchcache = None # in UTF-8
6121 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	754 self._branchcachetip = None
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	755
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	756 def invalidate(self):
13358 f26a51857dc7 bookmarks: merge invalidation into core Matt Mackall <mpm@selenic.com> parents: 13357 diff changeset	757 for a in ("changelog", "manifest", "_bookmarks", "_bookmarkscurrent"):
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	758 if a in self.__dict__:
bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	759 delattr(self, a)
bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	760 self.invalidatecaches()
bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	761
4913 46e39935ce33 rename and simplify do_lock Matt Mackall <mpm@selenic.com> parents: 4912 diff changeset	762 def _lock(self, lockname, wait, releasefn, acquirefn, desc):
161 0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	763 try:
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	764 l = lock.lock(lockname, 0, releasefn, desc=desc)
7640 7197812e8d44 error: move lock errors Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	765 except error.LockHeld, inst:
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	766 if not wait:
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	767 raise
3688 d92dad355000 Corrected "waiting for lock on repository FOO held by BAR" message. Thomas Arendsen Hein <thomas@intevation.de> parents: 3687 diff changeset	768 self.ui.warn(_("waiting for lock on %s held by %r\n") %
d92dad355000 Corrected "waiting for lock on repository FOO held by BAR" message. Thomas Arendsen Hein <thomas@intevation.de> parents: 3687 diff changeset	769 (desc, inst.locker))
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	770 # default to 600 seconds timeout
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	771 l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")),
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	772 releasefn, desc=desc)
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	773 if acquirefn:
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	774 acquirefn()
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	775 return l
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	776
4914 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4913 diff changeset	777 def lock(self, wait=True):
9309 cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	778 '''Lock the repository store (.hg/store) and return a weak reference
cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	779 to the lock. Use this before modifying the store (e.g. committing or
cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	780 stripping). If you are opening a transaction, get a lock as well.)'''
8108 a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	781 l = self._lockref and self._lockref()
a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	782 if l is not None and l.held:
a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	783 l.lock()
a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	784 return l
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	785
13391 d00bbff8600e fncachestore: defer updating the fncache file to a single file open Adrian Buehlmann <adrian@cadifra.com> parents: 13390 diff changeset	786 l = self._lock(self.sjoin("lock"), wait, self.store.write,
d00bbff8600e fncachestore: defer updating the fncache file to a single file open Adrian Buehlmann <adrian@cadifra.com> parents: 13390 diff changeset	787 self.invalidate, _('repository %s') % self.origroot)
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	788 self._lockref = weakref.ref(l)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	789 return l
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	790
4914 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4913 diff changeset	791 def wlock(self, wait=True):
9309 cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	792 '''Lock the non-store parts of the repository (everything under
cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	793 .hg except .hg/store) and return a weak reference to the lock.
cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	794 Use this before modifying files in .hg.'''
8108 a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	795 l = self._wlockref and self._wlockref()
a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	796 if l is not None and l.held:
a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	797 l.lock()
a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	798 return l
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	799
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	800 l = self._lock(self.join("wlock"), wait, self.dirstate.write,
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	801 self.dirstate.invalidate, _('working directory of %s') %
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	802 self.origroot)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	803 self._wlockref = weakref.ref(l)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	804 return l
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	805
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	806 def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist):
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	807 """
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	808 commit an individual file as part of a larger transaction
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	809 """
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	810
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	811 fname = fctx.path()
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	812 text = fctx.data()
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	813 flog = self.file(fname)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	814 fparent1 = manifest1.get(fname, nullid)
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	815 fparent2 = fparent2o = manifest2.get(fname, nullid)
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	816
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	817 meta = {}
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	818 copy = fctx.renamed()
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	819 if copy and copy[0] != fname:
4058 e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	820 # Mark the new revision of this file as a copy of another
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4510 diff changeset	821 # file. This copy data will effectively act as a parent
96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4510 diff changeset	822 # of this new revision. If this is a merge, the first
4058 e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	823 # parent will be the nullid (meaning "look up the copy data")
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	824 # and the second one will be the other parent. For example:
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	825 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	826 # 0 --- 1 --- 3 rev1 changes file foo
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	827 # \ / rev2 renames foo to bar and changes it
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	828 # \- 2 -/ rev3 should have bar with all changes and
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	829 # should record that bar descends from
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	830 # bar in rev2 and foo in rev1
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	831 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	832 # this allows this merge to succeed:
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	833 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	834 # 0 --- 1 --- 3 rev4 reverts the content change from rev2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	835 # \ / merging rev3 and rev4 should use bar@rev2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	836 # \- 2 --- 4 as the merge base
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	837 #
6874 8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6680 diff changeset	838
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	839 cfname = copy[0]
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	840 crev = manifest1.get(cfname)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	841 newfparent = fparent2
6874 8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6680 diff changeset	842
8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6680 diff changeset	843 if manifest2: # branch merge
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	844 if fparent2 == nullid or crev is None: # copied on remote side
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	845 if cfname in manifest2:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	846 crev = manifest2[cfname]
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	847 newfparent = fparent1
6874 8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6680 diff changeset	848
6875 0d714a48ab53 add a fix for issue 1175 Matt Mackall <mpm@selenic.com> parents: 6874 diff changeset	849 # find source in nearest ancestor if we've lost track
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	850 if not crev:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	851 self.ui.debug(" %s: searching for copy revision for %s\n" %
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	852 (fname, cfname))
13000 417f3c27983b commit: search both parents for missing copy revision (issue2484) Matt Mackall <mpm@selenic.com> parents: 12899 diff changeset	853 for ancestor in self[None].ancestors():
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	854 if cfname in ancestor:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	855 crev = ancestor[cfname].filenode()
6876 077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6875 6840 diff changeset	856 break
6875 0d714a48ab53 add a fix for issue 1175 Matt Mackall <mpm@selenic.com> parents: 6874 diff changeset	857
13000 417f3c27983b commit: search both parents for missing copy revision (issue2484) Matt Mackall <mpm@selenic.com> parents: 12899 diff changeset	858 if crev:
417f3c27983b commit: search both parents for missing copy revision (issue2484) Matt Mackall <mpm@selenic.com> parents: 12899 diff changeset	859 self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
417f3c27983b commit: search both parents for missing copy revision (issue2484) Matt Mackall <mpm@selenic.com> parents: 12899 diff changeset	860 meta["copy"] = cfname
417f3c27983b commit: search both parents for missing copy revision (issue2484) Matt Mackall <mpm@selenic.com> parents: 12899 diff changeset	861 meta["copyrev"] = hex(crev)
417f3c27983b commit: search both parents for missing copy revision (issue2484) Matt Mackall <mpm@selenic.com> parents: 12899 diff changeset	862 fparent1, fparent2 = nullid, newfparent
417f3c27983b commit: search both parents for missing copy revision (issue2484) Matt Mackall <mpm@selenic.com> parents: 12899 diff changeset	863 else:
417f3c27983b commit: search both parents for missing copy revision (issue2484) Matt Mackall <mpm@selenic.com> parents: 12899 diff changeset	864 self.ui.warn(_("warning: can't find ancestor for '%s' "
417f3c27983b commit: search both parents for missing copy revision (issue2484) Matt Mackall <mpm@selenic.com> parents: 12899 diff changeset	865 "copied from '%s'!\n") % (fname, cfname))
417f3c27983b commit: search both parents for missing copy revision (issue2484) Matt Mackall <mpm@selenic.com> parents: 12899 diff changeset	866
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	867 elif fparent2 != nullid:
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	868 # is one parent an ancestor of the other?
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	869 fparentancestor = flog.ancestor(fparent1, fparent2)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	870 if fparentancestor == fparent1:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	871 fparent1, fparent2 = fparent2, nullid
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	872 elif fparentancestor == fparent2:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	873 fparent2 = nullid
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	874
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	875 # is the file changed?
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	876 if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	877 changelist.append(fname)
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	878 return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	879
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	880 # are just the flags changed during merge?
10320 808c187fc556 localrepo: minor formatting - remove double space Henri Wiechers <hwiechers@gmail.com> parents: 10282 diff changeset	881 if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags():
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	882 changelist.append(fname)
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	883
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	884 return fparent1
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	885
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	886 def commit(self, text="", user=None, date=None, match=None, force=False,
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	887 editor=False, extra={}):
8515 865e08a7d6b0 localrepo: update commit() docstrings Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 8503 diff changeset	888 """Add a new revision to current repository.
865e08a7d6b0 localrepo: update commit() docstrings Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 8503 diff changeset	889
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	890 Revision information is gathered from the working directory,
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	891 match can be used to filter the committed files. If editor is
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	892 supplied, it is called to get a commit message.
8515 865e08a7d6b0 localrepo: update commit() docstrings Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 8503 diff changeset	893 """
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	894
8715 8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	895 def fail(f, msg):
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	896 raise util.Abort('%s: %s' % (f, msg))
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	897
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	898 if not match:
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	899 match = matchmod.always(self.root, '')
8715 8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	900
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	901 if not force:
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	902 vdirs = []
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	903 match.dir = vdirs.append
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	904 match.bad = fail
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	905
8405 7cbf8fcd2453 commit: push repo lock down into _commitctx Matt Mackall <mpm@selenic.com> parents: 8404 diff changeset	906 wlock = self.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	907 try:
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	908 wctx = self[None]
10970 3213e8947975 localrepo.commit: use explicit variables, avoid creating new contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10969 diff changeset	909 merge = len(wctx.parents()) > 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	910
10970 3213e8947975 localrepo.commit: use explicit variables, avoid creating new contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10969 diff changeset	911 if (not force and merge and match and
8501 ab0e3f7ea315 commit: some tidying Matt Mackall <mpm@selenic.com> parents: 8500 diff changeset	912 (match.files() or match.anypats())):
8397 613ac2856535 remove deprecated rawcommit Matt Mackall <mpm@selenic.com> parents: 8395 diff changeset	913 raise util.Abort(_('cannot partially commit a merge '
613ac2856535 remove deprecated rawcommit Matt Mackall <mpm@selenic.com> parents: 8395 diff changeset	914 '(do not specify files or patterns)'))
6706 716a1296e182 localrepo: replace dirstate by workingfilectx in filecommit() Patrick Mezard <pmezard@gmail.com> parents: 6705 diff changeset	915
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	916 changes = self.status(match=match, clean=force)
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	917 if force:
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	918 changes[0].extend(changes[6]) # mq may commit unchanged files
3621 7d3d603e7df9 localrepo: factor commit and rawcommit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3620 diff changeset	919
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	920 # check subrepos
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	921 subs = []
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	922 removedsubs = set()
b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	923 for p in wctx.parents():
b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	924 removedsubs.update(s for s in p.substate if match(s))
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	925 for s in wctx.substate:
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	926 removedsubs.discard(s)
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	927 if match(s) and wctx.sub(s).dirty():
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	928 subs.append(s)
11485 b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11442 diff changeset	929 if (subs or removedsubs):
b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11442 diff changeset	930 if (not match('.hgsub') and
b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11442 diff changeset	931 '.hgsub' in (wctx.modified() + wctx.added())):
11486 d3c3e2fdeb0c commit: add missing _() Matt Mackall <mpm@selenic.com> parents: 11485 diff changeset	932 raise util.Abort(_("can't commit subrepos without .hgsub"))
11485 b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11442 diff changeset	933 if '.hgsubstate' not in changes[0]:
b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11442 diff changeset	934 changes[0].insert(0, '.hgsubstate')
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	935
13411 d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13400 diff changeset	936 if subs and not self.ui.configbool('ui', 'commitsubrepos', True):
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13400 diff changeset	937 changedsubs = [s for s in subs if wctx.sub(s).dirty(True)]
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13400 diff changeset	938 if changedsubs:
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13400 diff changeset	939 raise util.Abort(_("uncommitted changes in subrepo %s")
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13400 diff changeset	940 % changedsubs[0])
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no Patrick Mezard <pmezard@gmail.com> parents: 13400 diff changeset	941
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	942 # make sure all explicit patterns are matched
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	943 if not force and match.files():
8710 bcb6e5bebd93 commit: trade O(n^2) file checks for O(n^2) dir checks Matt Mackall <mpm@selenic.com> parents: 8709 diff changeset	944 matched = set(changes[0] + changes[1] + changes[2])
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	945
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	946 for f in match.files():
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	947 if f == '.' or f in matched or f in wctx.substate:
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	948 continue
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	949 if f in changes[3]: # missing
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	950 fail(f, _('file not found!'))
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	951 if f in vdirs: # visited directory
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	952 d = f + '/'
8710 bcb6e5bebd93 commit: trade O(n^2) file checks for O(n^2) dir checks Matt Mackall <mpm@selenic.com> parents: 8709 diff changeset	953 for mf in matched:
bcb6e5bebd93 commit: trade O(n^2) file checks for O(n^2) dir checks Matt Mackall <mpm@selenic.com> parents: 8709 diff changeset	954 if mf.startswith(d):
bcb6e5bebd93 commit: trade O(n^2) file checks for O(n^2) dir checks Matt Mackall <mpm@selenic.com> parents: 8709 diff changeset	955 break
bcb6e5bebd93 commit: trade O(n^2) file checks for O(n^2) dir checks Matt Mackall <mpm@selenic.com> parents: 8709 diff changeset	956 else:
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	957 fail(f, _("no match under directory!"))
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	958 elif f not in self.dirstate:
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	959 fail(f, _("file not tracked!"))
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	960
10970 3213e8947975 localrepo.commit: use explicit variables, avoid creating new contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10969 diff changeset	961 if (not force and not extra.get("close") and not merge
8501 ab0e3f7ea315 commit: some tidying Matt Mackall <mpm@selenic.com> parents: 8500 diff changeset	962 and not (changes[0] or changes[1] or changes[2])
10970 3213e8947975 localrepo.commit: use explicit variables, avoid creating new contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10969 diff changeset	963 and wctx.branch() == wctx.p1().branch()):
8404 a2bc39ade36b commit: move 'nothing changed' test into commit() Matt Mackall <mpm@selenic.com> parents: 8403 diff changeset	964 return None
a2bc39ade36b commit: move 'nothing changed' test into commit() Matt Mackall <mpm@selenic.com> parents: 8403 diff changeset	965
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	966 ms = mergemod.mergestate(self)
6888 7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6884 diff changeset	967 for f in changes[0]:
7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6884 diff changeset	968 if f in ms and ms[f] == 'u':
7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6884 diff changeset	969 raise util.Abort(_("unresolved merge conflicts "
7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6884 diff changeset	970 "(see hg resolve)"))
8496 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8481 diff changeset	971
10969 ca052b484e56 context: remove parents parameter to workingctx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10960 diff changeset	972 cctx = context.workingctx(self, text, user, date, extra, changes)
8496 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8481 diff changeset	973 if editor:
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8954 diff changeset	974 cctx._text = editor(self, cctx, subs)
9935 48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	975 edited = (text != cctx._text)
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	976
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	977 # commit subs
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	978 if subs or removedsubs:
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	979 state = wctx.substate.copy()
12127 36a65283c3af commit: sort subrepos before committing for stable test output Martin Geisler <mg@lazybytes.net> parents: 12070 diff changeset	980 for s in sorted(subs):
11112 4a9bee613737 subrepo: print paths relative to upper repo root for push/pull/commit Edouard Gomez <ed.gomez@free.fr> parents: 11063 diff changeset	981 sub = wctx.sub(s)
4a9bee613737 subrepo: print paths relative to upper repo root for push/pull/commit Edouard Gomez <ed.gomez@free.fr> parents: 11063 diff changeset	982 self.ui.status(_('committing subrepository %s\n') %
12752 18b5b6392fcf subrepo: rename relpath to subrelpath and introduce reporelpath Mads Kiilerich <mads@kiilerich.com> parents: 12708 diff changeset	983 subrepo.subrelpath(sub))
11112 4a9bee613737 subrepo: print paths relative to upper repo root for push/pull/commit Edouard Gomez <ed.gomez@free.fr> parents: 11063 diff changeset	984 sr = sub.commit(cctx._text, user, date)
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	985 state[s] = (state[s][0], sr)
13172 84cec5895d01 subrepo: backout f02d7a562a21 Erik Zielke <ez@aragost.com> parents: 13155 diff changeset	986 subrepo.writestate(self, state)
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	987
9934 720f70b720d3 commit: save commit message so it's not destroyed by rollback. Greg Ward <greg-hg@gerg.ca> parents: 9924 diff changeset	988 # Save commit message in case this transaction gets rolled back
9949 bc3f762af82e commit: write last-message.txt with no content modifications. Greg Ward <greg-hg@gerg.ca> parents: 9935 diff changeset	989 # (e.g. by a pretxncommit hook). Leave the content alone on
bc3f762af82e commit: write last-message.txt with no content modifications. Greg Ward <greg-hg@gerg.ca> parents: 9935 diff changeset	990 # the assumption that the user will use the same editor again.
bc3f762af82e commit: write last-message.txt with no content modifications. Greg Ward <greg-hg@gerg.ca> parents: 9935 diff changeset	991 msgfile = self.opener('last-message.txt', 'wb')
bc3f762af82e commit: write last-message.txt with no content modifications. Greg Ward <greg-hg@gerg.ca> parents: 9935 diff changeset	992 msgfile.write(cctx._text)
9934 720f70b720d3 commit: save commit message so it's not destroyed by rollback. Greg Ward <greg-hg@gerg.ca> parents: 9924 diff changeset	993 msgfile.close()
720f70b720d3 commit: save commit message so it's not destroyed by rollback. Greg Ward <greg-hg@gerg.ca> parents: 9924 diff changeset	994
10970 3213e8947975 localrepo.commit: use explicit variables, avoid creating new contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10969 diff changeset	995 p1, p2 = self.dirstate.parents()
3213e8947975 localrepo.commit: use explicit variables, avoid creating new contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10969 diff changeset	996 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '')
9935 48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	997 try:
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	998 self.hook("precommit", throw=True, parent1=hookp1, parent2=hookp2)
9935 48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	999 ret = self.commitctx(cctx, True)
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	1000 except:
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	1001 if edited:
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	1002 msgfn = self.pathto(msgfile.name[len(self.root)+1:])
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	1003 self.ui.write(
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	1004 _('note: commit message saved in %s\n') % msgfn)
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	1005 raise
8496 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8481 diff changeset	1006
13357 b67867940bd1 bookmarks: move commit action into core Matt Mackall <mpm@selenic.com> parents: 13356 diff changeset	1007 # update bookmarks, dirstate and mergestate
b67867940bd1 bookmarks: move commit action into core Matt Mackall <mpm@selenic.com> parents: 13356 diff changeset	1008 parents = (p1, p2)
b67867940bd1 bookmarks: move commit action into core Matt Mackall <mpm@selenic.com> parents: 13356 diff changeset	1009 if p2 == nullid:
b67867940bd1 bookmarks: move commit action into core Matt Mackall <mpm@selenic.com> parents: 13356 diff changeset	1010 parents = (p1,)
b67867940bd1 bookmarks: move commit action into core Matt Mackall <mpm@selenic.com> parents: 13356 diff changeset	1011 bookmarks.update(self, parents, ret)
8416 9dfee83c93c8 commit: hoist the rest of the dirstate manipulation out of commitctx Matt Mackall <mpm@selenic.com> parents: 8415 diff changeset	1012 for f in changes[0] + changes[1]:
9dfee83c93c8 commit: hoist the rest of the dirstate manipulation out of commitctx Matt Mackall <mpm@selenic.com> parents: 8415 diff changeset	1013 self.dirstate.normal(f)
9dfee83c93c8 commit: hoist the rest of the dirstate manipulation out of commitctx Matt Mackall <mpm@selenic.com> parents: 8415 diff changeset	1014 for f in changes[2]:
9dfee83c93c8 commit: hoist the rest of the dirstate manipulation out of commitctx Matt Mackall <mpm@selenic.com> parents: 8415 diff changeset	1015 self.dirstate.forget(f)
9dfee83c93c8 commit: hoist the rest of the dirstate manipulation out of commitctx Matt Mackall <mpm@selenic.com> parents: 8415 diff changeset	1016 self.dirstate.setparents(ret)
8503 90f86a5330bb commit: tidy up mergestate slightly Matt Mackall <mpm@selenic.com> parents: 8502 diff changeset	1017 ms.reset()
6710 0aa91f69a4c4 localrepo: extract _commitctx() from commit() Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1018 finally:
8405 7cbf8fcd2453 commit: push repo lock down into _commitctx Matt Mackall <mpm@selenic.com> parents: 8404 diff changeset	1019 wlock.release()
6710 0aa91f69a4c4 localrepo: extract _commitctx() from commit() Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1020
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	1021 self.hook("commit", node=hex(ret), parent1=hookp1, parent2=hookp2)
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	1022 return ret
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	1023
8496 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8481 diff changeset	1024 def commitctx(self, ctx, error=False):
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7072 diff changeset	1025 """Add a new revision to current repository.
8410 1d11d985c179 commit: combine _commitctx and commitctx, drop unused force argument Matt Mackall <mpm@selenic.com> parents: 8407 diff changeset	1026 Revision information is passed via the context argument.
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7072 diff changeset	1027 """
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6712 diff changeset	1028
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	1029 tr = lock = None
12899 fabe61418a53 localrepo: do not modify ctx.remove() list in-place Patrick Mezard <pmezard@gmail.com> parents: 12847 diff changeset	1030 removed = list(ctx.removed())
8414 2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	1031 p1, p2 = ctx.p1(), ctx.p2()
2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	1032 m1 = p1.manifest().copy()
2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	1033 m2 = p2.manifest()
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	1034 user = ctx.user()
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	1035
8411 4d5916358abd commit: move lots of commitctx outside of the repo lock Matt Mackall <mpm@selenic.com> parents: 8410 diff changeset	1036 lock = self.lock()
4d5916358abd commit: move lots of commitctx outside of the repo lock Matt Mackall <mpm@selenic.com> parents: 8410 diff changeset	1037 try:
10881 a685011ed38e localrepo: add desc parameter to transaction Steve Borho <steve@borho.org> parents: 10877 diff changeset	1038 tr = self.transaction("commit")
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	1039 trp = weakref.proxy(tr)
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	1040
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1041 # check in files
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1042 new = {}
6710 0aa91f69a4c4 localrepo: extract _commitctx() from commit() Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1043 changed = []
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1044 linkrev = len(self)
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	1045 for f in sorted(ctx.modified() + ctx.added()):
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1046 self.ui.note(f + "\n")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1047 try:
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	1048 fctx = ctx[f]
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	1049 new[f] = self._filecommit(fctx, m1, m2, linkrev, trp,
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	1050 changed)
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	1051 m1.set(f, fctx.flags())
10428 e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	1052 except OSError, inst:
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	1053 self.ui.warn(_("trouble committing %s!\n") % f)
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	1054 raise
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	1055 except IOError, inst:
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	1056 errcode = getattr(inst, 'errno', errno.ENOENT)
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	1057 if error or errcode and errcode != errno.ENOENT:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1058 self.ui.warn(_("trouble committing %s!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1059 raise
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1060 else:
8498 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	1061 removed.append(f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	1062
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1063 # update manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1064 m1.update(new)
8498 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	1065 removed = [f for f in sorted(removed) if f in m1 or f in m2]
a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	1066 drop = [f for f in removed if f in m1]
a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	1067 for f in drop:
a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	1068 del m1[f]
8414 2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	1069 mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(),
8498 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	1070 p2.manifestnode(), (new, drop))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1071
8499 fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8498 diff changeset	1072 # update changelog
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	1073 self.changelog.delayupdate()
8499 fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8498 diff changeset	1074 n = self.changelog.add(mn, changed + removed, ctx.description(),
fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8498 diff changeset	1075 trp, p1.node(), p2.node(),
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	1076 user, ctx.date(), ctx.extra().copy())
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	1077 p = lambda: self.changelog.writepending() and self.root or ""
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	1078 xp1, xp2 = p1.hex(), p2 and p2.hex() or ''
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1079 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	1080 parent2=xp2, pending=p)
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	1081 self.changelog.finalize(trp)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1082 tr.close()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1083
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	1084 if self._branchcache:
12066 d01e28657429 localrepo: introduce method for explicit branch cache update Georg Brandl <georg@python.org> parents: 12035 diff changeset	1085 self.updatebranchcache()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1086 return n
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1087 finally:
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 11228 diff changeset	1088 if tr:
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 11228 diff changeset	1089 tr.release()
8405 7cbf8fcd2453 commit: push repo lock down into _commitctx Matt Mackall <mpm@selenic.com> parents: 8404 diff changeset	1090 lock.release()
660 2c83350784c3 Move commit hook after commit completes Matt Mackall <mpm@selenic.com> parents: 659 diff changeset	1091
9150 09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	1092 def destroyed(self):
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	1093 '''Inform the repository that nodes have been destroyed.
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	1094 Intended for use by strip and rollback, so there's a common
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	1095 place for anything that has to be done after destroying history.'''
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	1096 # XXX it might be nice if we could take the list of destroyed
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	1097 # nodes, but I don't see an easy way for rollback() to do that
9151 f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1098
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1099 # Ensure the persistent tag cache is updated. Doing it now
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1100 # means that the tag cache only has to worry about destroyed
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1101 # heads immediately after a strip/rollback. That in turn
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1102 # guarantees that "cachetip == currenttip" (comparing both rev
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1103 # and node) always means no nodes have been added or destroyed.
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1104
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1105 # XXX this is suboptimal when qrefresh'ing: we strip the current
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1106 # head, refresh the tag cache, then immediately add a new head.
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1107 # But I think doing it this way is necessary for the "instant
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	1108 # tag cache retrieval" case to work.
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	1109 self.invalidatecaches()
9150 09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	1110
6585 d3d1d39da2fa walk: remove cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	1111 def walk(self, match, node=None):
3532 26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	1112 '''
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	1113 walk recursively through the directory tree or a given
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	1114 changeset, finding all files matched by the match
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	1115 function
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	1116 '''
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	1117 return self[node].walk(match)
3532 26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	1118
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1119 def status(self, node1='.', node2=None, match=None,
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1120 ignored=False, clean=False, unknown=False,
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1121 listsubrepos=False):
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1122 """return status of files between two nodes or node and working directory
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1123
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1124 If node1 is None, use the first dirstate parent instead.
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1125 If node2 is None, compare node1 with working directory.
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1126 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1127
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1128 def mfmatches(ctx):
97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1129 mf = ctx.manifest().copy()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1130 for fn in mf.keys():
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1131 if not match(fn):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1132 del mf[fn]
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1133 return mf
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	1134
7090 7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1135 if isinstance(node1, context.changectx):
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1136 ctx1 = node1
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1137 else:
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1138 ctx1 = self[node1]
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1139 if isinstance(node2, context.changectx):
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1140 ctx2 = node2
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1141 else:
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1142 ctx2 = self[node2]
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1143
7435 5e13df32fb74 bundlerepo doesn't really have a dirstate, throw AttributeError if requested Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7415 diff changeset	1144 working = ctx2.rev() is None
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1145 parentworking = working and ctx1 == self['.']
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	1146 match = match or matchmod.always(self.root, self.getcwd())
6753 ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	1147 listignored, listclean, listunknown = ignored, clean, unknown
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	1148
7090 7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1149 # load earliest manifest first for caching reasons
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1150 if not working and ctx2.rev() < ctx1.rev():
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1151 ctx2.manifest()
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1152
7067 40d105a12cac status: don't warn about missing files present in base revision (issue1323) Matt Mackall <mpm@selenic.com> parents: 7064 diff changeset	1153 if not parentworking:
40d105a12cac status: don't warn about missing files present in base revision (issue1323) Matt Mackall <mpm@selenic.com> parents: 7064 diff changeset	1154 def bad(f, msg):
40d105a12cac status: don't warn about missing files present in base revision (issue1323) Matt Mackall <mpm@selenic.com> parents: 7064 diff changeset	1155 if f not in ctx1:
40d105a12cac status: don't warn about missing files present in base revision (issue1323) Matt Mackall <mpm@selenic.com> parents: 7064 diff changeset	1156 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
40d105a12cac status: don't warn about missing files present in base revision (issue1323) Matt Mackall <mpm@selenic.com> parents: 7064 diff changeset	1157 match.bad = bad
40d105a12cac status: don't warn about missing files present in base revision (issue1323) Matt Mackall <mpm@selenic.com> parents: 7064 diff changeset	1158
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1159 if working: # we need to scan the working dir
11227 054549ccb680 status: avoid performance regression when no .hgsub is present Matt Mackall <mpm@selenic.com> parents: 11154 diff changeset	1160 subrepos = []
054549ccb680 status: avoid performance regression when no .hgsub is present Matt Mackall <mpm@selenic.com> parents: 11154 diff changeset	1161 if '.hgsub' in self.dirstate:
054549ccb680 status: avoid performance regression when no .hgsub is present Matt Mackall <mpm@selenic.com> parents: 11154 diff changeset	1162 subrepos = ctx1.substate.keys()
10176 24ce8f0c0a39 dirstate: don't check state of subrepo directories Augie Fackler <durin42@gmail.com> parents: 10011 diff changeset	1163 s = self.dirstate.status(match, subrepos, listignored,
24ce8f0c0a39 dirstate: don't check state of subrepo directories Augie Fackler <durin42@gmail.com> parents: 10011 diff changeset	1164 listclean, listunknown)
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1165 cmp, modified, added, removed, deleted, unknown, ignored, clean = s
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1166
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1167 # check for any possibly clean files
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1168 if parentworking and cmp:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1169 fixup = []
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1170 # do a full compare of any files that might have changed
8395 475552c03496 status: check cmp list in order Matt Mackall <mpm@selenic.com> parents: 8393 diff changeset	1171 for f in sorted(cmp):
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1172 if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f)
11702 eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11698 diff changeset	1173 or ctx1[f].cmp(ctx2[f])):
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1174 modified.append(f)
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1175 else:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1176 fixup.append(f)
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1177
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1178 # update dirstate for files that are actually clean
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1179 if fixup:
11669 c47cb3193c53 localrepo.status: move fixup concatenation inside if block for clarity Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11665 diff changeset	1180 if listclean:
c47cb3193c53 localrepo.status: move fixup concatenation inside if block for clarity Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11665 diff changeset	1181 clean += fixup
c47cb3193c53 localrepo.status: move fixup concatenation inside if block for clarity Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11665 diff changeset	1182
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1183 try:
8647 cb74433f9b41 localrepo: move comment Adrian Buehlmann <adrian@cadifra.com> parents: 8646 diff changeset	1184 # updating the dirstate is optional
cb74433f9b41 localrepo: move comment Adrian Buehlmann <adrian@cadifra.com> parents: 8646 diff changeset	1185 # so we don't wait on the lock
8646 60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1186 wlock = self.wlock(False)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1187 try:
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1188 for f in fixup:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1189 self.dirstate.normal(f)
8646 60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1190 finally:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1191 wlock.release()
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1192 except error.LockError:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1193 pass
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1194
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1195 if not parentworking:
97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1196 mf1 = mfmatches(ctx1)
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1197 if working:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1198 # we are comparing working dir against non-parent
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1199 # generate a pseudo-manifest for the working dir
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1200 mf2 = mfmatches(self['.'])
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1201 for f in cmp + modified + added:
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1202 mf2[f] = None
6817 cf319797d61c minor status fixups Matt Mackall <mpm@selenic.com> parents: 6810 diff changeset	1203 mf2.set(f, ctx2.flags(f))
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	1204 for f in removed:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1205 if f in mf2:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1206 del mf2[f]
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1207 else:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1208 # we are comparing two revisions
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1209 deleted, unknown, ignored = [], [], []
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1210 mf2 = mfmatches(ctx2)
4372 4ddc6d374265 localrepository.status: only acquire wlock if actually needed. Bryan O'Sullivan <bos@serpentine.com> parents: 4335 diff changeset	1211
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1212 modified, added, clean = [], [], []
6827 c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1213 for fn in mf2:
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5913 diff changeset	1214 if fn in mf1:
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4622 diff changeset	1215 if (mf1.flags(fn) != mf2.flags(fn) or
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4622 diff changeset	1216 (mf1[fn] != mf2[fn] and
11702 eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11698 diff changeset	1217 (mf2[fn] or ctx1[fn].cmp(ctx2[fn])))):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1218 modified.append(fn)
6753 ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	1219 elif listclean:
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1220 clean.append(fn)
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1221 del mf1[fn]
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1222 else:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1223 added.append(fn)
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	1224 removed = mf1.keys()
ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	1225
6827 c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1226 r = modified, added, removed, deleted, unknown, ignored, clean
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1227
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1228 if listsubrepos:
12176 ecab10820983 subrepos: add function for iterating over ctx subrepos Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	1229 for subpath, sub in subrepo.itersubrepos(ctx1, ctx2):
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1230 if working:
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1231 rev2 = None
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1232 else:
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1233 rev2 = ctx2.substate[subpath][1]
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1234 try:
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1235 submatch = matchmod.narrowmatcher(subpath, match)
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1236 s = sub.status(rev2, match=submatch, ignored=listignored,
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1237 clean=listclean, unknown=listunknown,
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1238 listsubrepos=True)
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1239 for rfiles, sfiles in zip(r, s):
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1240 rfiles.extend("%s/%s" % (subpath, f) for f in sfiles)
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1241 except error.LookupError:
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1242 self.ui.status(_("skipping missing subrepository: %s\n")
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1243 % subpath)
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12162 diff changeset	1244
6827 c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1245 [l.sort() for l in r]
c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1246 return r
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1247
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8731 diff changeset	1248 def heads(self, start=None):
1550 ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1532 diff changeset	1249 heads = self.changelog.heads(start)
ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1532 diff changeset	1250 # sort the output in rev descending order
13075 d73c3034deee coding style: fix gratuitous whitespace after Python keywords Thomas Arendsen Hein <thomas@jtah.de> parents: 13047 diff changeset	1251 return sorted(heads, key=self.changelog.rev, reverse=True)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1252
8694 ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default John Mulligan <phlogistonjohn@asynchrono.us> parents: 8680 diff changeset	1253 def branchheads(self, branch=None, start=None, closed=False):
9475 c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1254 '''return a (possibly filtered) list of heads for the given branch
c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1255
c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1256 Heads are returned in topological order, from newest to oldest.
c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1257 If branch is None, use the dirstate branch.
c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1258 If start is not None, return only heads reachable from start.
c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1259 If closed is True, return heads that are marked as closed as well.
c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1260 '''
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	1261 if branch is None:
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	1262 branch = self[None].branch()
9675 ee913987e4b0 localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9674 diff changeset	1263 branches = self.branchmap()
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1264 if branch not in branches:
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1265 return []
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	1266 # the cache returns heads ordered lowest to highest
9475 c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1267 bheads = list(reversed(branches[branch]))
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1268 if start is not None:
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	1269 # filter out the heads that cannot be reached from startrev
9475 c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1270 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1271 bheads = [h for h in bheads if h in fbheads]
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	1272 if not closed:
7670 e5f445c94226 kill some trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7656 diff changeset	1273 bheads = [h for h in bheads if
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	1274 ('close' not in self.changelog.read(h)[5])]
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	1275 return bheads
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1276
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1277 def branches(self, nodes):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1278 if not nodes:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1279 nodes = [self.changelog.tip()]
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1280 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1281 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1282 t = n
2345 4f7745fc9823 n is always 'True', we can only stop the loop with the break statement Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2320 diff changeset	1283 while 1:
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1284 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1285 if p[1] != nullid or p[0] == nullid:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1286 b.append((t, n, p[0], p[1]))
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1287 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1288 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1289 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1290
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1291 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1292 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1293
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1294 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1295 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1296 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1297
7708 a32847fa0df0 wire protocol: avoid infinite loop (issue1483) Matt Mackall <mpm@selenic.com> parents: 7564 diff changeset	1298 while n != bottom and n != nullid:
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1299 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1300 if i == f:
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	1301 l.append(n)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1302 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1303 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1304 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1305
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1306 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1307
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1308 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1309
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1310 def pull(self, remote, heads=None, force=False):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1311 lock = self.lock()
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1312 try:
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	1313 tmp = discovery.findcommonincoming(self, remote, heads=heads,
3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	1314 force=force)
3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	1315 common, fetch, rheads = tmp
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1316 if not fetch:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1317 self.ui.status(_("no changes found\n"))
13364 ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1318 result = 0
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1319 else:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1320 if heads is None and fetch == [nullid]:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1321 self.ui.status(_("requesting all changes\n"))
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1322 elif heads is None and remote.capable('changegroupsubset'):
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1323 # issue1320, avoid a race if remote changed after discovery
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1324 heads = rheads
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1325
13364 ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1326 if heads is None:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1327 cg = remote.changegroup(fetch, 'pull')
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1328 elif not remote.capable('changegroupsubset'):
12067 a4fbbe0fbc38 Lowercase error messages Martin Geisler <mg@lazybytes.net> parents: 11640 diff changeset	1329 raise util.Abort(_("partial pull cannot be done because "
13364 ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1330 "other repository doesn't support "
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1331 "changegroupsubset."))
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1332 else:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1333 cg = remote.changegroupsubset(fetch, heads, 'pull')
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1334 result = self.addchangegroup(cg, 'pull', remote.url(),
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1335 lock=lock)
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1336 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1337 lock.release()
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1338
13364 ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1339 self.ui.debug("checking for updated bookmarks\n")
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1340 rb = remote.listkeys('bookmarks')
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1341 changed = False
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1342 for k in rb.keys():
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1343 if k in self._bookmarks:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1344 nr, nl = rb[k], self._bookmarks[k]
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1345 if nr in self:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1346 cr = self[nr]
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1347 cl = self[nl]
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1348 if cl.rev() >= cr.rev():
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1349 continue
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1350 if cr in cl.descendants():
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1351 self._bookmarks[k] = cr.node()
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1352 changed = True
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1353 self.ui.status(_("updating bookmark %s\n") % k)
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1354 else:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1355 self.ui.warn(_("not updating divergent"
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1356 " bookmark %s\n") % k)
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1357 if changed:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1358 bookmarks.write(self)
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1359
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1360 return result
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1361
13327 dc11e30b48a3 mq: factor out push conditions checks Patrick Mezard <pmezard@gmail.com> parents: 13272 diff changeset	1362 def checkpush(self, force, revs):
dc11e30b48a3 mq: factor out push conditions checks Patrick Mezard <pmezard@gmail.com> parents: 13272 diff changeset	1363 """Extensions can override this function if additional checks have
dc11e30b48a3 mq: factor out push conditions checks Patrick Mezard <pmezard@gmail.com> parents: 13272 diff changeset	1364 to be performed before pushing, or call it if they override push
dc11e30b48a3 mq: factor out push conditions checks Patrick Mezard <pmezard@gmail.com> parents: 13272 diff changeset	1365 command.
dc11e30b48a3 mq: factor out push conditions checks Patrick Mezard <pmezard@gmail.com> parents: 13272 diff changeset	1366 """
dc11e30b48a3 mq: factor out push conditions checks Patrick Mezard <pmezard@gmail.com> parents: 13272 diff changeset	1367 pass
dc11e30b48a3 mq: factor out push conditions checks Patrick Mezard <pmezard@gmail.com> parents: 13272 diff changeset	1368
11211 e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11177 diff changeset	1369 def push(self, remote, force=False, revs=None, newbranch=False):
11153 9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1370 '''Push outgoing changesets (limited by revs) from the current
9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1371 repository to remote. Return an integer:
9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1372 - 0 means HTTP error or nothing to push
9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1373 - 1 means we pushed and remote head count is unchanged or
9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1374 we have outgoing changesets but refused to push
9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1375 - other values as described by addchangegroup()
9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1376 '''
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1377 # there are two ways to push to remote repo:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1378 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1379 # addchangegroup assumes local user can lock remote
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1380 # repo (local filesystem, old ssh servers).
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1381 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1382 # unbundle assumes local user cannot lock remote repo (new ssh
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1383 # servers, http servers).
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1384
13327 dc11e30b48a3 mq: factor out push conditions checks Patrick Mezard <pmezard@gmail.com> parents: 13272 diff changeset	1385 self.checkpush(force, revs)
11598 5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1386 lock = None
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1387 unbundle = remote.capable('unbundle')
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1388 if not unbundle:
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1389 lock = remote.lock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1390 try:
13364 ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1391 cg, remote_heads = discovery.prepush(self, remote, force, revs,
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1392 newbranch)
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1393 ret = remote_heads
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1394 if cg is not None:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1395 if unbundle:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1396 # local repo finds heads on server, finds out what
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1397 # revs it must push. once revs transferred, if server
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1398 # finds it has different heads (someone else won
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1399 # commit/push race), server aborts.
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1400 if force:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1401 remote_heads = ['force']
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1402 # ssh: return remote's addchangegroup()
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1403 # http: return remote's addchangegroup() or 0 for error
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1404 ret = remote.unbundle(cg, remote_heads, 'push')
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1405 else:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1406 # we return an integer indicating remote head count change
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1407 ret = remote.addchangegroup(cg, 'push', self.url(),
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1408 lock=lock)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1409 finally:
11598 5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1410 if lock is not None:
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1411 lock.release()
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1412
13364 ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1413 self.ui.debug("checking for updated bookmarks\n")
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1414 rb = remote.listkeys('bookmarks')
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1415 for k in rb.keys():
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1416 if k in self._bookmarks:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1417 nr, nl = rb[k], hex(self._bookmarks[k])
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1418 if nr in self:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1419 cr = self[nr]
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1420 cl = self[nl]
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1421 if cl in cr.descendants():
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1422 r = remote.pushkey('bookmarks', k, nr, nl)
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1423 if r:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1424 self.ui.status(_("updating bookmark %s\n") % k)
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1425 else:
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1426 self.ui.warn(_('updating bookmark %s'
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1427 ' failed!\n') % k)
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1428
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1429 return ret
ddddb76f2da3 bookmarks: merge low-level push/pull support into core Matt Mackall <mpm@selenic.com> parents: 13363 diff changeset	1430
5763 e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	1431 def changegroupinfo(self, nodes, source):
e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	1432 if self.ui.verbose or source == 'bundle':
e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	1433 self.ui.status(_("%d changesets found\n") % len(nodes))
3513 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1434 if self.ui.debugflag:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1435 self.ui.debug("list of changesets:\n")
3513 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1436 for node in nodes:
9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1437 self.ui.debug("%s\n" % hex(node))
9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1438
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1439 def changegroupsubset(self, bases, heads, source, extranodes=None):
9437 1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1440 """Compute a changegroup consisting of all the nodes that are
1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1441 descendents of any of the bases and ancestors of any of the heads.
1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1442 Return a chunkbuffer object whose read() method will return
1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1443 successive changegroup chunks.
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1444
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1445 It is fairly complex as determining which filenodes and which
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1446 manifest nodes need to be included for the changeset to be complete
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1447 is non-trivial.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1448
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1449 Another wrinkle is doing the reverse, figuring out which changeset in
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1450 the changegroup a particular filenode or manifestnode belongs to.
6210 942287cb1f57 Removed trailing spaces from everything except test output Thomas Arendsen Hein <thomas@intevation.de> parents: 6201 diff changeset	1451
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1452 The caller can specify some nodes that must be included in the
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1453 changegroup using the extranodes argument. It should be a dict
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1454 where the keys are the filenames (or 1 for the manifest), and the
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1455 values are lists of (node, linknode) tuples, where node is a wanted
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1456 node and linknode is the changelog node that should be transmitted as
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1457 the linkrev.
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1458 """
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1459
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1460 # Set up some initial variables
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1461 # Make it easy to refer to self.changelog
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1462 cl = self.changelog
11660 5d62df44cac0 changegroupsubset(): move comment at the right place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11659 diff changeset	1463 # Compute the list of changesets in this changegroup.
5d62df44cac0 changegroupsubset(): move comment at the right place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11659 diff changeset	1464 # Some bases may turn out to be superfluous, and some heads may be
5d62df44cac0 changegroupsubset(): move comment at the right place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11659 diff changeset	1465 # too. nodesbetween will return the minimal set of bases and heads
5d62df44cac0 changegroupsubset(): move comment at the right place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11659 diff changeset	1466 # necessary to re-create the changegroup.
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1467 if not bases:
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1468 bases = [nullid]
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1469 msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads)
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1470
7233 9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1471 if extranodes is None:
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1472 # can we go through the fast path ?
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1473 heads.sort()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1474 allheads = self.heads()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1475 allheads.sort()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1476 if heads == allheads:
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1477 return self._changegroup(msng_cl_lst, source)
7233 9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1478
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1479 # slow path
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1480 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1481
5763 e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	1482 self.changegroupinfo(msng_cl_lst, source)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1483
11662 a3bfdf212094 changegroupsubset: simplify knownheads/has_cl_set computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11661 diff changeset	1484 # We assume that all ancestors of bases are known
a3bfdf212094 changegroupsubset: simplify knownheads/has_cl_set computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11661 diff changeset	1485 commonrevs = set(cl.ancestors(*[cl.rev(n) for n in bases]))
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1486
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1487 # Make it easy to refer to self.manifest
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1488 mnfst = self.manifest
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1489 # We don't know which manifests are missing yet
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1490 msng_mnfst_set = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1491 # Nor do we know which filenodes are missing.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1492 msng_filenode_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1493
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1494 # A changeset always belongs to itself, so the changenode lookup
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1495 # function for a changenode is identity.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1496 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1497 return x
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1498
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1499 # A function generating function that sets up the initial environment
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1500 # the inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1501 def filenode_collector(changedfiles):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1502 # This gathers information from each manifestnode included in the
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1503 # changegroup about which filenodes the manifest node references
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1504 # so we can include those in the changegroup too.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1505 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1506 # It also remembers which changenode each filenode belongs to. It
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1507 # does this by assuming the a filenode belongs to the changenode
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1508 # the first manifest that references it belongs to.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1509 def collect_msng_filenodes(mnfstnode):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1510 r = mnfst.rev(mnfstnode)
12622 01b6f058021b changegroupsubset: use readdelta() fast path when delta is against a parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 12337 diff changeset	1511 if mnfst.deltaparent(r) in mnfst.parentrevs(r):
10011 a9836feb5a8c changegroupsubset: readdelta() can be used if the previous rev is a parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10010 diff changeset	1512 # If the previous rev is one of the parents,
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1513 # we only need to see a diff.
5175 012dbf88b9b2 remove unneeded imports of mdiff Matt Mackall <mpm@selenic.com> parents: 5158 diff changeset	1514 deltamf = mnfst.readdelta(mnfstnode)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1515 # For each line in the delta
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7599 diff changeset	1516 for f, fnode in deltamf.iteritems():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1517 # And if the file is in the list of files we care
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1518 # about.
11648 801533a52799 changegroup(): use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11644 diff changeset	1519 if f in changedfiles:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1520 # Get the changenode this manifest belongs to
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1521 clnode = msng_mnfst_set[mnfstnode]
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1522 # Create the set of filenodes for the file if
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1523 # there isn't one already.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1524 ndset = msng_filenode_set.setdefault(f, {})
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1525 # And set the filenode's changelog node to the
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1526 # manifest's if it hasn't been set already.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1527 ndset.setdefault(fnode, clnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1528 else:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1529 # Otherwise we need a full manifest.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1530 m = mnfst.read(mnfstnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1531 # For every file in we care about.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1532 for f in changedfiles:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1533 fnode = m.get(f, None)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1534 # If it's in the manifest
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1535 if fnode is not None:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1536 # See comments above.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1537 clnode = msng_mnfst_set[mnfstnode]
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1538 ndset = msng_filenode_set.setdefault(f, {})
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1539 ndset.setdefault(fnode, clnode)
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1540 return collect_msng_filenodes
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1541
11659 deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1542 # If we determine that a particular file or manifest node must be a
deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1543 # node that the recipient of the changegroup will already have, we can
deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1544 # also assume the recipient will have all the parents. This function
deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1545 # prunes them from the set of missing nodes.
deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1546 def prune(revlog, missingnodes):
8469 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1547 hasset = set()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1548 # If a 'missing' filenode thinks it belongs to a changenode we
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1549 # assume the recipient must have, then the recipient must have
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1550 # that filenode.
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1551 for n in missingnodes:
11662 a3bfdf212094 changegroupsubset: simplify knownheads/has_cl_set computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11661 diff changeset	1552 clrev = revlog.linkrev(revlog.rev(n))
a3bfdf212094 changegroupsubset: simplify knownheads/has_cl_set computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11661 diff changeset	1553 if clrev in commonrevs:
8469 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1554 hasset.add(n)
11661 b16fb5d55b83 changegroupsubset(): ancestors() is not inclusive, we need to remove the "heads" Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11660 diff changeset	1555 for n in hasset:
b16fb5d55b83 changegroupsubset(): ancestors() is not inclusive, we need to remove the "heads" Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11660 diff changeset	1556 missingnodes.pop(n, None)
11659 deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1557 for r in revlog.ancestors(*[revlog.rev(n) for n in hasset]):
deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1558 missingnodes.pop(revlog.node(r), None)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1559
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1560 # Add the nodes that were explicitly requested.
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1561 def add_extra_nodes(name, nodes):
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1562 if not extranodes or name not in extranodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1563 return
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1564
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1565 for node, linknode in extranodes[name]:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1566 if node not in nodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1567 nodes[node] = linknode
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1568
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1569 # Now that we have all theses utility functions to help out and
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1570 # logically divide up the task, generate the group.
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1571 def gengroup():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1572 # The set of changed files starts empty.
11648 801533a52799 changegroup(): use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11644 diff changeset	1573 changedfiles = set()
10356 bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1574 collect = changegroup.collector(cl, msng_mnfst_set, changedfiles)
10405 2d30d66a89ad whitespace cleanup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10396 diff changeset	1575
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1576 # Create a changenode group generator that will call our functions
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1577 # back to lookup the owning changenode and collect information.
10356 bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1578 group = cl.group(msng_cl_lst, identity, collect)
11665 1f7f8bc45240 changegroup(): use enumerate when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11664 diff changeset	1579 for cnt, chnk in enumerate(group):
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1580 yield chnk
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1581 # revlog.group yields three entries per node, so
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1582 # dividing by 3 gives an approximation of how many
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1583 # nodes have been processed.
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1584 self.ui.progress(_('bundling'), cnt / 3,
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1585 unit=_('changesets'))
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1586 changecount = cnt / 3
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1587 self.ui.progress(_('bundling'), None)
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1588
11659 deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1589 prune(mnfst, msng_mnfst_set)
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1590 add_extra_nodes(1, msng_mnfst_set)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1591 msng_mnfst_lst = msng_mnfst_set.keys()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1592 # Sort the manifestnodes by revision number.
9038 93fe89afc611 localrepo: removed unnecessary revkey sort helper Martin Geisler <mg@lazybytes.net> parents: 9032 diff changeset	1593 msng_mnfst_lst.sort(key=mnfst.rev)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1594 # Create a generator for the manifestnodes that calls our lookup
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1595 # and data collection functions back.
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1596 group = mnfst.group(msng_mnfst_lst,
898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1597 lambda mnode: msng_mnfst_set[mnode],
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1598 filenode_collector(changedfiles))
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1599 efiles = {}
11665 1f7f8bc45240 changegroup(): use enumerate when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11664 diff changeset	1600 for cnt, chnk in enumerate(group):
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1601 if cnt % 3 == 1:
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1602 mnode = chnk[:20]
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1603 efiles.update(mnfst.readdelta(mnode))
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1604 yield chnk
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1605 # see above comment for why we divide by 3
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1606 self.ui.progress(_('bundling'), cnt / 3,
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1607 unit=_('manifests'), total=changecount)
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1608 self.ui.progress(_('bundling'), None)
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1609 efiles = len(efiles)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1610
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1611 # These are no longer needed, dereference and toss the memory for
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1612 # them.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1613 msng_mnfst_lst = None
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1614 msng_mnfst_set.clear()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1615
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1616 if extranodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1617 for fname in extranodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1618 if isinstance(fname, int):
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1619 continue
7134 cb6395fc16a9 fix issue with strip() for revlog with non-monotonic linkrevs (issue1342) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7121 diff changeset	1620 msng_filenode_set.setdefault(fname, {})
11648 801533a52799 changegroup(): use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11644 diff changeset	1621 changedfiles.add(fname)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1622 # Go through all our files in order sorted by name.
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1623 for idx, fname in enumerate(sorted(changedfiles)):
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1624 filerevlog = self.file(fname)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1625 if not len(filerevlog):
5666 9d6ad26fab10 fix spelling error Matt Mackall <mpm@selenic.com> parents: 5657 diff changeset	1626 raise util.Abort(_("empty or missing revlog for %s") % fname)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1627 # Toss out the filenodes that the recipient isn't really
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1628 # missing.
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1629 missingfnodes = msng_filenode_set.pop(fname, {})
11659 deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1630 prune(filerevlog, missingfnodes)
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1631 add_extra_nodes(fname, missingfnodes)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1632 # If any filenodes are left, generate the group for them,
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1633 # otherwise don't bother.
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1634 if missingfnodes:
5368 61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5323 diff changeset	1635 yield changegroup.chunkheader(len(fname))
61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5323 diff changeset	1636 yield fname
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1637 # Sort the filenodes by their revision # (topological order)
898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1638 nodeiter = list(missingfnodes)
898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1639 nodeiter.sort(key=filerevlog.rev)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1640 # Create a group generator and only pass in a changenode
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1641 # lookup function as we need to collect no information
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1642 # from filenodes.
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1643 group = filerevlog.group(nodeiter,
898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1644 lambda fnode: missingfnodes[fnode])
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1645 for chnk in group:
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1646 # even though we print the same progress on
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1647 # most loop iterations, put the progress call
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1648 # here so that time estimates (if any) can be updated
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1649 self.ui.progress(
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1650 _('bundling'), idx, item=fname,
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1651 unit=_('files'), total=efiles)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1652 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1653 # Signal that no more groups are left.
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1967 diff changeset	1654 yield changegroup.closechunk()
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1655 self.ui.progress(_('bundling'), None)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1656
2150 f15c6394d90d fix a NameError in changegroupsubset Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2149 diff changeset	1657 if msng_cl_lst:
2149 43ce1c17e644 allow to pull from an empty repo without getting a backtrace Vincent Danjean <vdanjean@free.fr> parents: 2143 diff changeset	1658 self.hook('outgoing', node=hex(msng_cl_lst[0]), source=source)
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1659
12337 6a6149487817 bundle: encapsulate all bundle streams in unbundle class Matt Mackall <mpm@selenic.com> parents: 12335 diff changeset	1660 return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1661
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1662 def changegroup(self, basenodes, source):
7233 9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1663 # to avoid a race we use changegroupsubset() (issue1320)
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1664 return self.changegroupsubset(basenodes, self.heads(), source)
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1665
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1666 def _changegroup(self, nodes, source):
9437 1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1667 """Compute the changegroup of all nodes that we have that a recipient
1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1668 doesn't. Return a chunkbuffer object whose read() method will return
1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1669 successive changegroup chunks.
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1670
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1671 This is much easier than the previous function as we can assume that
7233 9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1672 the recipient has any changenode we aren't sending them.
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1673
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1674 nodes is the set of nodes to send"""
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1675
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1676 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1677
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1678 cl = self.changelog
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1679 revset = set([cl.rev(n) for n in nodes])
5763 e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	1680 self.changegroupinfo(nodes, source)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1681
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1682 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1683 return x
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1684
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1685 def gennodelst(log):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1686 for r in log:
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7237 diff changeset	1687 if log.linkrev(r) in revset:
9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7237 diff changeset	1688 yield log.node(r)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1689
11653 eefa362d0b45 changegroup(): used "linkrev" instead of "revlink" Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11652 diff changeset	1690 def lookuplinkrev_func(revlog):
eefa362d0b45 changegroup(): used "linkrev" instead of "revlink" Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11652 diff changeset	1691 def lookuplinkrev(n):
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7237 diff changeset	1692 return cl.node(revlog.linkrev(revlog.rev(n)))
11653 eefa362d0b45 changegroup(): used "linkrev" instead of "revlink" Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11652 diff changeset	1693 return lookuplinkrev
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1694
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1695 def gengroup():
9437 1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1696 '''yield a sequence of changegroup chunks (strings)'''
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1697 # construct a list of all changed files
11648 801533a52799 changegroup(): use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11644 diff changeset	1698 changedfiles = set()
10356 bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1699 mmfs = {}
bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1700 collect = changegroup.collector(cl, mmfs, changedfiles)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1701
11665 1f7f8bc45240 changegroup(): use enumerate when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11664 diff changeset	1702 for cnt, chnk in enumerate(cl.group(nodes, identity, collect)):
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1703 # revlog.group yields three entries per node, so
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1704 # dividing by 3 gives an approximation of how many
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1705 # nodes have been processed.
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1706 self.ui.progress(_('bundling'), cnt / 3, unit=_('changesets'))
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1707 yield chnk
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1708 changecount = cnt / 3
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1709 self.ui.progress(_('bundling'), None)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1710
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1711 mnfst = self.manifest
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1712 nodeiter = gennodelst(mnfst)
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1713 efiles = {}
11665 1f7f8bc45240 changegroup(): use enumerate when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11664 diff changeset	1714 for cnt, chnk in enumerate(mnfst.group(nodeiter,
1f7f8bc45240 changegroup(): use enumerate when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11664 diff changeset	1715 lookuplinkrev_func(mnfst))):
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1716 if cnt % 3 == 1:
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1717 mnode = chnk[:20]
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1718 efiles.update(mnfst.readdelta(mnode))
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1719 # see above comment for why we divide by 3
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1720 self.ui.progress(_('bundling'), cnt / 3,
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1721 unit=_('manifests'), total=changecount)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1722 yield chnk
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1723 efiles = len(efiles)
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1724 self.ui.progress(_('bundling'), None)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1725
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1726 for idx, fname in enumerate(sorted(changedfiles)):
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1727 filerevlog = self.file(fname)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1728 if not len(filerevlog):
5666 9d6ad26fab10 fix spelling error Matt Mackall <mpm@selenic.com> parents: 5657 diff changeset	1729 raise util.Abort(_("empty or missing revlog for %s") % fname)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1730 nodeiter = gennodelst(filerevlog)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1731 nodeiter = list(nodeiter)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1732 if nodeiter:
5368 61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5323 diff changeset	1733 yield changegroup.chunkheader(len(fname))
61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5323 diff changeset	1734 yield fname
11653 eefa362d0b45 changegroup(): used "linkrev" instead of "revlink" Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11652 diff changeset	1735 lookup = lookuplinkrev_func(filerevlog)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1736 for chnk in filerevlog.group(nodeiter, lookup):
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1737 self.ui.progress(
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1738 _('bundling'), idx, item=fname,
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1739 total=efiles, unit=_('files'))
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1740 yield chnk
13116 c36dad4f6e54 bundle progress: offer best-guess deterministic progress information Augie Fackler <durin42@gmail.com> parents: 13113 diff changeset	1741 self.ui.progress(_('bundling'), None)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1742
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1967 diff changeset	1743 yield changegroup.closechunk()
2107 7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1744
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1745 if nodes:
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1746 self.hook('outgoing', node=hex(nodes[0]), source=source)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1747
12337 6a6149487817 bundle: encapsulate all bundle streams in unbundle class Matt Mackall <mpm@selenic.com> parents: 12335 diff changeset	1748 return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN')
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1749
11442 ee1ed6afac21 addchangegroup: pass in lock to release it before changegroup hook is called Matt Mackall <mpm@selenic.com> parents: 11368 diff changeset	1750 def addchangegroup(self, source, srctype, url, emptyok=False, lock=None):
11153 9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1751 """Add the changegroup returned by source.read() to this repo.
9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1752 srctype is a string like 'push', 'pull', or 'unbundle'. url is
9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1753 the URL of the repo where this changegroup is coming from.
13271 952baa2f3325 addchangegroup: document the current locking semantics Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13253 diff changeset	1754 If lock is not None, the function takes ownership of the lock
952baa2f3325 addchangegroup: document the current locking semantics Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13253 diff changeset	1755 and releases it after the changegroup is added.
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1756
11153 9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1757 Return an integer summarizing the change to this repo:
3803 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	1758 - nothing changed or no source: 0
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	1759 - more heads than before: 1+added heads (2..n)
11153 9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1760 - fewer heads than before: -1-removed heads (-2..-n)
3803 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	1761 - number of heads stays the same: 1
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	1762 """
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1763 def csmap(x):
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1764 self.ui.debug("add changeset %s\n" % short(x))
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1765 return len(cl)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1766
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1767 def revmap(x):
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1768 return cl.rev(x)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1769
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1770 if not source:
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1771 return 0
1730 0f1d2c75db5e add prechangegroup and pretxnchangegroup hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1721 diff changeset	1772
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1773 self.hook('prechangegroup', throw=True, source=srctype, url=url)
1730 0f1d2c75db5e add prechangegroup and pretxnchangegroup hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1721 diff changeset	1774
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1775 changesets = files = revisions = 0
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1776 efiles = set()
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	1777
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1778 # write changelog data to temp files so concurrent readers will not see
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1779 # inconsistent view
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	1780 cl = self.changelog
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	1781 cl.delayupdate()
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	1782 oldheads = len(cl.heads())
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1783
10892 e39e94377eb2 transaction: use newlines to separate description elements Matt Mackall <mpm@selenic.com> parents: 10888 diff changeset	1784 tr = self.transaction("\n".join([srctype, urlmod.hidepassword(url)]))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1785 try:
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	1786 trp = weakref.proxy(tr)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1787 # pull off the changeset group
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1788 self.ui.status(_("adding changesets\n"))
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	1789 clstart = len(cl)
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1790 class prog(object):
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	1791 step = _('changesets')
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1792 count = 1
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1793 ui = self.ui
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1794 total = None
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1795 def __call__(self):
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1796 self.ui.progress(self.step, self.count, unit=_('chunks'),
5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1797 total=self.total)
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1798 self.count += 1
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1799 pr = prog()
12334 50946802593d bundle: refactor progress callback Matt Mackall <mpm@selenic.com> parents: 12333 diff changeset	1800 source.callback = pr
50946802593d bundle: refactor progress callback Matt Mackall <mpm@selenic.com> parents: 12333 diff changeset	1801
12335 e21fe9c5fb25 bundle: get rid of chunkiter Matt Mackall <mpm@selenic.com> parents: 12334 diff changeset	1802 if (cl.addgroup(source, csmap, trp) is None
12333 44c7dfc2f6a3 bundle: make getchunk() a method Matt Mackall <mpm@selenic.com> parents: 12296 diff changeset	1803 and not emptyok):
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1804 raise util.Abort(_("received changelog group is empty"))
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	1805 clend = len(cl)
59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	1806 changesets = clend - clstart
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1807 for c in xrange(clstart, clend):
5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1808 efiles.update(self[c].files())
5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1809 efiles = len(efiles)
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	1810 self.ui.progress(_('changesets'), None)
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1811
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1812 # pull off the manifest group
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1813 self.ui.status(_("adding manifests\n"))
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	1814 pr.step = _('manifests')
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1815 pr.count = 1
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1816 pr.total = changesets # manifests <= changesets
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1817 # no need to check for empty manifest group here:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1818 # if the result of the merge of 1 and 2 is the same in 3 and 4,
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1819 # no new manifest will be created and the manifest group will
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1820 # be empty during the pull
12335 e21fe9c5fb25 bundle: get rid of chunkiter Matt Mackall <mpm@selenic.com> parents: 12334 diff changeset	1821 self.manifest.addgroup(source, revmap, trp)
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	1822 self.ui.progress(_('manifests'), None)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1823
10418 5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1824 needfiles = {}
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1825 if self.ui.configbool('server', 'validate', default=False):
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1826 # validate incoming csets have their manifests
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1827 for cset in xrange(clstart, clend):
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1828 mfest = self.changelog.read(self.changelog.node(cset))[0]
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1829 mfest = self.manifest.readdelta(mfest)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1830 # store file nodes we must see
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1831 for f, n in mfest.iteritems():
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1832 needfiles.setdefault(f, set()).add(n)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1833
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1834 # process the files
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1835 self.ui.status(_("adding file changes\n"))
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1836 pr.step = 'files'
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1837 pr.count = 1
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1838 pr.total = efiles
12334 50946802593d bundle: refactor progress callback Matt Mackall <mpm@selenic.com> parents: 12333 diff changeset	1839 source.callback = None
50946802593d bundle: refactor progress callback Matt Mackall <mpm@selenic.com> parents: 12333 diff changeset	1840
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1841 while 1:
12333 44c7dfc2f6a3 bundle: make getchunk() a method Matt Mackall <mpm@selenic.com> parents: 12296 diff changeset	1842 f = source.chunk()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1843 if not f:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1844 break
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1845 self.ui.debug("adding %s revisions\n" % f)
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1846 pr()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1847 fl = self.file(f)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1848 o = len(fl)
12335 e21fe9c5fb25 bundle: get rid of chunkiter Matt Mackall <mpm@selenic.com> parents: 12334 diff changeset	1849 if fl.addgroup(source, revmap, trp) is None:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1850 raise util.Abort(_("received file revlog group is empty"))
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1851 revisions += len(fl) - o
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1852 files += 1
10418 5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1853 if f in needfiles:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1854 needs = needfiles[f]
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1855 for new in xrange(o, len(fl)):
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1856 n = fl.node(new)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1857 if n in needs:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1858 needs.remove(n)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1859 if not needs:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1860 del needfiles[f]
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	1861 self.ui.progress(_('files'), None)
10418 5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1862
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1863 for f, needs in needfiles.iteritems():
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1864 fl = self.file(f)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1865 for n in needs:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1866 try:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1867 fl.rev(n)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1868 except error.LookupError:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1869 raise util.Abort(
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1870 _('missing file data for %s:%s - run hg verify') %
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1871 (f, hex(n)))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1872
8392 7e5cbb09515b localrepo: use cl throughout in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8390 diff changeset	1873 newheads = len(cl.heads())
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1874 heads = ""
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1875 if oldheads and newheads != oldheads:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1876 heads = _(" (%+d heads)") % (newheads - oldheads)
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1877
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1878 self.ui.status(_("added %d changesets"
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1879 " with %d changes to %d files%s\n")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1880 % (changesets, revisions, files, heads))
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1881
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1882 if changesets > 0:
8392 7e5cbb09515b localrepo: use cl throughout in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8390 diff changeset	1883 p = lambda: cl.writepending() and self.root or ""
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1884 self.hook('pretxnchangegroup', throw=True,
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	1885 node=hex(cl.node(clstart)), source=srctype,
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	1886 url=url, pending=p)
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	1887
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	1888 # make changelog see real files again
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	1889 cl.finalize(trp)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1890
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1891 tr.close()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1892 finally:
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 11228 diff changeset	1893 tr.release()
11442 ee1ed6afac21 addchangegroup: pass in lock to release it before changegroup hook is called Matt Mackall <mpm@selenic.com> parents: 11368 diff changeset	1894 if lock:
ee1ed6afac21 addchangegroup: pass in lock to release it before changegroup hook is called Matt Mackall <mpm@selenic.com> parents: 11368 diff changeset	1895 lock.release()
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1896
1375 f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	1897 if changesets > 0:
5988 ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5985 diff changeset	1898 # forcefully update the on-disk branch cache
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1899 self.ui.debug("updating the branch cache\n")
12066 d01e28657429 localrepo: introduce method for explicit branch cache update Georg Brandl <georg@python.org> parents: 12035 diff changeset	1900 self.updatebranchcache()
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	1901 self.hook("changegroup", node=hex(cl.node(clstart)),
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1902 source=srctype, url=url)
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1903
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	1904 for i in xrange(clstart, clend):
8392 7e5cbb09515b localrepo: use cl throughout in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8390 diff changeset	1905 self.hook("incoming", node=hex(cl.node(i)),
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1906 source=srctype, url=url)
1316 b650bfdfc7ee Hook fixups mpm@selenic.com parents: 1280 diff changeset	1907
13365 f1c5294e9119 bookmarks: merge suspect addchangegroup into core Matt Mackall <mpm@selenic.com> parents: 13364 diff changeset	1908 # FIXME - why does this care about tip?
f1c5294e9119 bookmarks: merge suspect addchangegroup into core Matt Mackall <mpm@selenic.com> parents: 13364 diff changeset	1909 if newheads == oldheads:
f1c5294e9119 bookmarks: merge suspect addchangegroup into core Matt Mackall <mpm@selenic.com> parents: 13364 diff changeset	1910 bookmarks.update(self, self.dirstate.parents(), self['tip'].node())
f1c5294e9119 bookmarks: merge suspect addchangegroup into core Matt Mackall <mpm@selenic.com> parents: 13364 diff changeset	1911
3803 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	1912 # never return 0 here:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	1913 if newheads < oldheads:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	1914 return newheads - oldheads - 1
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	1915 else:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	1916 return newheads - oldheads + 1
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1917
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1918
12296 d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	1919 def stream_in(self, remote, requirements):
13390 327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1920 lock = self.lock()
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1921 try:
13390 327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1922 fp = remote.stream_out()
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1923 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1924 try:
13390 327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1925 resp = int(l)
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1926 except ValueError:
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1927 raise error.ResponseError(
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1928 _('Unexpected response from remote server:'), l)
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1929 if resp == 1:
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1930 raise util.Abort(_('operation forbidden by server'))
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1931 elif resp == 2:
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1932 raise util.Abort(_('locking the remote repository failed'))
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1933 elif resp != 0:
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1934 raise util.Abort(_('the server sent an unknown error code'))
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1935 self.ui.status(_('streaming all changes\n'))
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1936 l = fp.readline()
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1937 try:
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1938 total_files, total_bytes = map(int, l.split(' ', 1))
7063 be2daa324ddf Add missing catch of a TypeError Bernhard Leiner <bleiner@gmail.com> parents: 6877 diff changeset	1939 except (ValueError, TypeError):
7641 d2f753830f80 error: move UnexpectedOutput (now ResponseError) Matt Mackall <mpm@selenic.com> parents: 7640 diff changeset	1940 raise error.ResponseError(
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1941 _('Unexpected response from remote server:'), l)
13390 327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1942 self.ui.status(_('%d files to transfer, %s of data\n') %
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1943 (total_files, util.bytecount(total_bytes)))
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1944 start = time.time()
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1945 for i in xrange(total_files):
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1946 # XXX doesn't support '\n' or '\r' in filenames
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1947 l = fp.readline()
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1948 try:
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1949 name, size = l.split('\0', 1)
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1950 size = int(size)
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1951 except (ValueError, TypeError):
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1952 raise error.ResponseError(
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1953 _('Unexpected response from remote server:'), l)
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1954 self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size)))
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1955 # for backwards compat, name was partially encoded
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1956 ofp = self.sopener(store.decodedir(name), 'w')
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1957 for chunk in util.filechunkiter(fp, limit=size):
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1958 ofp.write(chunk)
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1959 ofp.close()
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1960 elapsed = time.time() - start
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1961 if elapsed <= 0:
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1962 elapsed = 0.001
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1963 self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') %
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1964 (util.bytecount(total_bytes), elapsed,
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1965 util.bytecount(total_bytes / elapsed)))
12296 d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	1966
13390 327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1967 # new requirements = old non-format requirements + new format-related
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1968 # requirements from the streamed-in repository
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1969 requirements.update(set(self.requirements) - self.supportedformats)
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1970 self._applyrequirements(requirements)
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1971 self._writerequirements()
12296 d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	1972
13390 327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1973 self.invalidate()
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1974 return len(self.heads()) + 1
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1975 finally:
327719a44b6a localrepo: acquire lock on stream_in Adrian Buehlmann <adrian@cadifra.com> parents: 13385 diff changeset	1976 lock.release()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1977
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	1978 def clone(self, remote, heads=[], stream=False):
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1979 '''clone remote repository.
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1980
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1981 keyword arguments:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1982 heads: list of revs to clone (forces use of pull)
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1983 stream: use streaming clone if possible'''
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1984
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1985 # now, all clients that can request uncompressed clones can
5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1986 # read repo formats supported by all servers that can serve
5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1987 # them.
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1988
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1989 # if revlog format changes, client will have to check version
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1990 # and format flags on "stream" capability, and use
5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1991 # uncompressed only if compatible.
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1992
12296 d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	1993 if stream and not heads:
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	1994 # 'stream' means remote revlog format is revlogv1 only
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	1995 if remote.capable('stream'):
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	1996 return self.stream_in(remote, set(('revlogv1',)))
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	1997 # otherwise, 'streamreqs' contains the remote revlog format
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	1998 streamreqs = remote.capable('streamreqs')
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	1999 if streamreqs:
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	2000 streamreqs = set(streamreqs.split(','))
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	2001 # if we support it, stream in and adjust our requirements
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	2002 if not streamreqs - self.supportedformats:
d7fff529d85d clone: only use stream when we understand the revlog format Sune Foldager <cryo@cyanite.org> parents: 12295 diff changeset	2003 return self.stream_in(remote, streamreqs)
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2004 return self.pull(remote, heads)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2005
11368 b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	2006 def pushkey(self, namespace, key, old, new):
b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	2007 return pushkey.push(self, namespace, key, old, new)
b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	2008
b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	2009 def listkeys(self, namespace):
b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	2010 return pushkey.list(self, namespace)
b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	2011
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2012 # used to avoid circular references so destructors work
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3773 diff changeset	2013 def aftertrans(files):
f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3773 diff changeset	2014 renamefiles = [tuple(t) for t in files]
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2015 def a():
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3773 diff changeset	2016 for src, dest in renamefiles:
f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3773 diff changeset	2017 util.rename(src, dest)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2018 return a
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2019
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	2020 def instance(ui, path, create):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	2021 return localrepository(ui, util.drop_scheme('file', path), create)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3164 diff changeset	2022
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	2023 def islocal(path):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	2024 return True

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/localrepo.py @ 13411:d4de90a612f7