mercurial-source: mercurial/localrepo.py annotate

annotate mercurial/localrepo.py @ 11681:eb07fbc21e9c

filectx: use cmp(self, fctx) instead of cmp(self, text) This allows more flexibility in implementation, and in particular, lets the context decide if revision text has to be loaded or not.

author	Nicolas Dumazet <nicdumz.commits@gmail.com>
date	Tue, 27 Jul 2010 23:40:46 +0900
parents	9df481f8036d
children	01778673aab7

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
3893 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3886 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
8312 b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8294 diff changeset	11 import changelog, dirstate, filelog, manifest, context
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
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8103 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
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8103 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'))
8803 87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	24 supported = set('revlogv1 store fncache shared'.split())
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	25
8189 d2899a856f9f ui: replace parentui mechanism with repo.baseui Matt Mackall <mpm@selenic.com> parents: 8156 diff changeset	26 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	27 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	28 self.root = os.path.realpath(util.expandpath(path))
4171 7b5723c95a82 Save an absolute path in repo.path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4168 diff changeset	29 self.path = os.path.join(self.root, ".hg")
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3797 diff changeset	30 self.origroot = path
a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3797 diff changeset	31 self.opener = util.opener(self.path)
a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3797 diff changeset	32 self.wopener = util.opener(self.root)
8801 9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	33 self.baseui = baseui
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	34 self.ui = baseui.copy()
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	35
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	36 try:
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	37 self.ui.readconfig(self.join("hgrc"), self.root)
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	38 extensions.loadall(self.ui)
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	39 except IOError:
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	40 pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	41
3032 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	42 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: 3016 diff changeset	43 if create:
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	44 if not os.path.exists(path):
11640 c3e8ab80ee90 init: create target directory recursively Mads Kiilerich <mads@kiilerich.com> parents: 11486 diff changeset	45 util.makedirs(path)
3032 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	46 os.mkdir(self.path)
4166 c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	47 requirements = ["revlogv1"]
8801 9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	48 if self.ui.configbool('format', 'usestore', True):
4164 fe41d9a186ab Allow disabling store format to work with absurdly long filenames Matt Mackall <mpm@selenic.com> parents: 4161 diff changeset	49 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: 4164 diff changeset	50 requirements.append("store")
8801 9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8800 diff changeset	51 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	52 requirements.append("fncache")
4166 c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	53 # create an invalid changelog
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	54 self.opener("00changelog.i", "a").write(
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	55 '\0\0\0\2' # represents revlogv2
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	56 ' 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: 4164 diff changeset	57 )
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	58 reqfile = self.opener("requires", "w")
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	59 for r in requirements:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	60 reqfile.write("%s\n" % r)
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	61 reqfile.close()
3032 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	62 else:
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	63 raise error.RepoError(_("repository %s not found") % path)
3032 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	64 elif create:
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	65 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	66 else:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	67 # find requirements
8262 3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	68 requirements = set()
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	69 try:
8262 3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	70 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	71 except IOError, inst:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	72 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	73 raise
8262 3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	74 for r in requirements - self.supported:
3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	75 raise error.RepoError(_("requirement '%s' not supported") % r)
405 99470ae6b424 Check if repository exists mpm@selenic.com parents: 402 diff changeset	76
8803 87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	77 self.sharedpath = self.path
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	78 try:
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	79 s = os.path.realpath(self.opener("sharedpath").read())
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	80 if not os.path.exists(s):
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	81 raise error.RepoError(
8908 105343f9f744 Fix warning: Seen unexpected token "%" Dongsheng Song <dongsheng.song@gmail.com> parents: 8813 diff changeset	82 _('.hg/sharedpath points to nonexistent directory %s') % s)
8803 87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	83 self.sharedpath = s
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	84 except IOError, inst:
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	85 if inst.errno != errno.ENOENT:
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	86 raise
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	87
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8801 diff changeset	88 self.store = store.store(requirements, self.sharedpath, util.opener)
6840 80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	89 self.spath = self.store.path
80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	90 self.sopener = self.store.opener
80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	91 self.sjoin = self.store.join
80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	92 self.opener.createmode = self.store.createmode
10322 d9a2bc2f776b add options dict to localrepo.store.opener and use it for defversion Vsevolod Solovyov <vsevolod.solovyov@gmail.com> parents: 10319 diff changeset	93 self.sopener.options = {}
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3797 diff changeset	94
9154 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	95 # 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: 9153 diff changeset	96 # 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: 9153 diff changeset	97 # '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: 9153 diff changeset	98 # 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: 9153 diff changeset	99 # constitute the in-memory cache of tags.
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	100 self._tags = None
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	101 self._tagtypes = None
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	102
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	103 self._branchcache = None # in UTF-8
6118 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6117 diff changeset	104 self._branchcachetip = None
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	105 self.nodetagscache = None
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	106 self.filterpats = {}
5965 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	107 self._datafilters = {}
4960 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	108 self._transref = self._lockref = self._wlockref = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	109
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	110 @propertycache
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	111 def changelog(self):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	112 c = changelog.changelog(self.sopener)
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	113 if 'HG_PENDING' in os.environ:
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	114 p = os.environ['HG_PENDING']
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	115 if p.startswith(self.root):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	116 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: 10319 diff changeset	117 self.sopener.options['defversion'] = c.version
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	118 return c
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	119
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	120 @propertycache
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	121 def manifest(self):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	122 return manifest.manifest(self.sopener)
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	123
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	124 @propertycache
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	125 def dirstate(self):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	126 return dirstate.dirstate(self.opener, self.ui, self.root)
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	127
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6745 diff changeset	128 def __getitem__(self, changeid):
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8515 diff changeset	129 if changeid is None:
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6745 diff changeset	130 return context.workingctx(self)
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6745 diff changeset	131 return context.changectx(self, changeid)
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6745 diff changeset	132
9929 ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	133 def __contains__(self, changeid):
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	134 try:
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	135 return bool(self.lookup(changeid))
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	136 except error.RepoLookupError:
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	137 return False
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	138
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	139 def __nonzero__(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	140 return True
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	141
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	142 def __len__(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	143 return len(self.changelog)
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	144
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	145 def __iter__(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	146 for i in xrange(len(self)):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	147 yield i
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	148
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	149 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	150 return 'file:' + self.root
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	151
1718 c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	152 def hook(self, name, throw=False, **args):
4623 fff50306e6dd hooks: separate hook code into a separate module Matt Mackall <mpm@selenic.com> parents: 4620 diff changeset	153 return hook.hook(self.ui, self, name, throw, **args)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	154
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	155 tag_disallowed = ':\r\n'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	156
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	157 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	158 if isinstance(names, str):
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	159 allchars = names
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	160 names = (names,)
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	161 else:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	162 allchars = ''.join(names)
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	163 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	164 if c in allchars:
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	165 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	166
11063 eb23c876c111 tag: warn users about tag/branch possible name conflicts Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11047 diff changeset	167 branches = self.branchmap()
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	168 for name in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	169 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	170 local=local)
11063 eb23c876c111 tag: warn users about tag/branch possible name conflicts Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11047 diff changeset	171 if name in branches:
eb23c876c111 tag: warn users about tag/branch possible name conflicts Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11047 diff changeset	172 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	173 " branch name\n") % name)
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	174
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	175 def writetags(fp, names, munge, prevtags):
5997 850494d62674 localrepo._tag: add a seek before writing the new tag Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5911 diff changeset	176 fp.seek(0, 2)
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	177 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: 4910 diff changeset	178 fp.write('\n')
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	179 for name in names:
6671 938eddd76237 tag: record tag we're superseding, if any (issue 1102) Matt Mackall <mpm@selenic.com> parents: 6646 diff changeset	180 m = munge and munge(name) or name
9154 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	181 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: 9153 diff changeset	182 old = self._tags.get(name, nullid)
6671 938eddd76237 tag: record tag we're superseding, if any (issue 1102) Matt Mackall <mpm@selenic.com> parents: 6646 diff changeset	183 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: 6646 diff changeset	184 fp.write('%s %s\n' % (hex(node), m))
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	185 fp.close()
5115 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4913 diff changeset	186
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	187 prevtags = ''
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	188 if local:
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	189 try:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	190 fp = self.opener('localtags', 'r+')
7874 553aa0cbeab6 cleanup: drop unused assignments Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7848 diff changeset	191 except IOError:
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	192 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: 4910 diff changeset	193 else:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	194 prevtags = fp.read()
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	195
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	196 # 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	197 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	198 for name in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	199 self.hook('tag', node=hex(node), tag=name, local=local)
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	200 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	201
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	202 try:
0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	203 fp = self.wfile('.hgtags', 'rb+')
0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	204 except IOError:
0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	205 fp = self.wfile('.hgtags', 'ab')
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	206 else:
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	207 prevtags = fp.read()
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	208
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	209 # 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	210 writetags(fp, names, encoding.fromlocal, prevtags)
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	211
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	212 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	213 self[None].add(['.hgtags'])
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	214
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	215 m = matchmod.exact(self.root, '', ['.hgtags'])
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	216 tagnode = self.commit(message, user, date, extra=extra, match=m)
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	217
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	218 for name in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	219 self.hook('tag', node=hex(node), tag=name, local=local)
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	220
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	221 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	222
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	223 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	224 '''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	225
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	226 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	227 string.
6334 7016f7fb8fe3 tab/space cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 6321 diff changeset	228
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	229 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	230 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	231 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	232
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	233 keyword arguments:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	234
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	235 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	236 (default False)
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	237
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	238 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	239
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	240 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	241
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	242 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	243
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2858 diff changeset	244 for x in self.status()[:5]:
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	245 if '.hgtags' in x:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	246 raise util.Abort(_('working copy of .hgtags is changed '
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	247 '(please commit .hgtags manually)'))
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	248
7814 4421abf8c85d tag: force load of tag cache Matt Mackall <mpm@selenic.com> parents: 7809 diff changeset	249 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	250 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	251
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	252 def tags(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	253 '''return a mapping of tag to node'''
9154 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	254 if self._tags is None:
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	255 (self._tags, self._tagtypes) = self._findtags()
9153 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9120 diff changeset	256
9154 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	257 return self._tags
4214 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	258
9153 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9120 diff changeset	259 def _findtags(self):
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9120 diff changeset	260 '''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: 9120 diff changeset	261 (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: 9120 diff changeset	262 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: 9120 diff changeset	263 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: 9120 diff changeset	264 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: 9120 diff changeset	265 duration of the localrepo object.'''
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9120 diff changeset	266
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9120 diff changeset	267 # XXX what tagtype should subclasses/extensions use? Currently
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9120 diff changeset	268 # 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: 9120 diff changeset	269 # 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: 9120 diff changeset	270 # 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: 9120 diff changeset	271 # quo fine?
4214 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	272
9156 b7837f0ed9fe localrepo: factor updatetags() out of readtags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9155 diff changeset	273 alltags = {} # map tag name to (node, hist)
5661 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	274 tagtypes = {}
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	275
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	276 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	277 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
5661 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	278
9160 4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9159 diff changeset	279 # 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: 9159 diff changeset	280 # 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: 9159 diff changeset	281 # 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: 9159 diff changeset	282 # local encoding.
9153 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9120 diff changeset	283 tags = {}
9155 234a230cc33b localrepo: improve readability of _findtags(), readtags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9154 diff changeset	284 for (name, (node, hist)) in alltags.iteritems():
234a230cc33b localrepo: improve readability of _findtags(), readtags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9154 diff changeset	285 if node != nullid:
9160 4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9159 diff changeset	286 tags[encoding.tolocal(name)] = node
9153 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9120 diff changeset	287 tags['tip'] = self.changelog.tip()
9160 4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9159 diff changeset	288 tagtypes = dict([(encoding.tolocal(name), value)
4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9159 diff changeset	289 for (name, value) in tagtypes.iteritems()])
9153 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9120 diff changeset	290 return (tags, tagtypes)
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	291
5661 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	292 def tagtype(self, tagname):
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	293 '''
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	294 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: 5642 diff changeset	295
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	296 'local' : a local tag
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	297 'global' : a global tag
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	298 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: 5642 diff changeset	299 '''
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	300
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	301 self.tags()
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5757 diff changeset	302
9154 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	303 return self._tagtypes.get(tagname)
5661 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5642 diff changeset	304
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	305 def tagslist(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	306 '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	307 l = []
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7596 diff changeset	308 for t, n in self.tags().iteritems():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	309 try:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	310 r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	311 except:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	312 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	313 l.append((r, t, n))
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	314 return [(t, n) for r, t, n in sorted(l)]
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	315
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	316 def nodetags(self, node):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	317 '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	318 if not self.nodetagscache:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	319 self.nodetagscache = {}
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7596 diff changeset	320 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	321 self.nodetagscache.setdefault(n, []).append(t)
11047 c7dbd6c4877a tags: return tags in sorted order Eric Eisner <ede@mit.edu> parents: 10970 diff changeset	322 for tags in self.nodetagscache.itervalues():
c7dbd6c4877a tags: return tags in sorted order Eric Eisner <ede@mit.edu> parents: 10970 diff changeset	323 tags.sort()
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	324 return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	325
6117 f89878df40fe move the reading of branch.cache from _branchtags to branchtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6116 diff changeset	326 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	327 # TODO: rename this function?
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	328 tiprev = len(self) - 1
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	329 if lrev != tiprev:
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10725 diff changeset	330 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	331 self._updatebranchcache(partial, ctxgen)
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	332 self._writebranchcache(partial, self.changelog.tip(), tiprev)
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	333
3823 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	334 return partial
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	335
9671 9471d9a900b4 transfer branchmap branch names over the wire in utf-8 Henrik Stuart <henrik.stuart@edlund.dk> parents: 9573 diff changeset	336 def branchmap(self):
10327 32197f7eceb3 localrepo: add a quick docstring for localrepo.branchmap() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10322 diff changeset	337 '''returns a dictionary {branch: [branchheads]}'''
9671 9471d9a900b4 transfer branchmap branch names over the wire in utf-8 Henrik Stuart <henrik.stuart@edlund.dk> parents: 9573 diff changeset	338 tip = self.changelog.tip()
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	339 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	340 return self._branchcache
9671 9471d9a900b4 transfer branchmap branch names over the wire in utf-8 Henrik Stuart <henrik.stuart@edlund.dk> parents: 9573 diff changeset	341
6118 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6117 diff changeset	342 oldtip = self._branchcachetip
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6117 diff changeset	343 self._branchcachetip = tip
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6117 diff changeset	344 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: 6117 diff changeset	345 partial, last, lrev = self._readbranchcache()
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6117 diff changeset	346 else:
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6117 diff changeset	347 lrev = self.changelog.rev(oldtip)
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	348 partial = self._branchcache
6118 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6117 diff changeset	349
6117 f89878df40fe move the reading of branch.cache from _branchtags to branchtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6116 diff changeset	350 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	351 # 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	352 self._branchcache = partial
3823 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	353
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	354 return self._branchcache
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	355
816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	356 def branchtags(self):
816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	357 '''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	358 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	359 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	360 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	361 tip = heads[-1]
9be6c5900c07 localrepo: cleanup branch tip computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	362 for h in reversed(heads):
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	363 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	364 tip = h
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	365 break
10392 9be6c5900c07 localrepo: cleanup branch tip computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	366 bt[bn] = tip
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	367 return bt
6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	368
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	369
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	370 def _readbranchcache(self):
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	371 partial = {}
3432 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3375 diff changeset	372 try:
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	373 f = self.opener("branchheads.cache")
3650 6f6696962986 don't use readline() to read branches.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3627 diff changeset	374 lines = f.read().split('\n')
6f6696962986 don't use readline() to read branches.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3627 diff changeset	375 f.close()
4415 1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	376 except (IOError, OSError):
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	377 return {}, nullid, nullrev
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	378
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	379 try:
4167 4574a8cb080f Store empty (default) branch in branch cache, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 4128 diff changeset	380 last, lrev = lines.pop(0).split(" ", 1)
3432 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3375 diff changeset	381 last, lrev = bin(last), int(lrev)
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	382 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	383 # invalidate the cache
6056 0ad2ffbf6b38 Print less scary warning when invalidating the branch cache. Thomas Arendsen Hein <thomas@intevation.de> parents: 6001 diff changeset	384 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	385 for l in lines:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	386 if not l:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	387 continue
4167 4574a8cb080f Store empty (default) branch in branch cache, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 4128 diff changeset	388 node, label = l.split(" ", 1)
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	389 partial.setdefault(label.strip(), []).append(bin(node))
7644 182b7114d35a error: move SignalInterrupt Matt Mackall <mpm@selenic.com> parents: 7641 diff changeset	390 except KeyboardInterrupt:
3761 9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	391 raise
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	392 except Exception, inst:
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	393 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	394 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	395 partial, last, lrev = {}, nullid, nullrev
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	396 return partial, last, lrev
3432 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3375 diff changeset	397
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	398 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	399 try:
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	400 f = self.opener("branchheads.cache", "w", atomictemp=True)
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	401 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	402 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	403 for node in nodes:
816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	404 f.write("%s %s\n" % (hex(node), label))
4329 cea5ba038a1d use atomictemp files to write branch.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4272 diff changeset	405 f.rename()
4415 1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	406 except (IOError, OSError):
3452 fcf14d87e0a4 If we can't write the branch cache, fail quietly. Matt Mackall <mpm@selenic.com> parents: 3450 diff changeset	407 pass
3432 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3375 diff changeset	408
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10725 diff changeset	409 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	410 # 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	411 newbranches = {}
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10725 diff changeset	412 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	413 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	414 # 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	415 # 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	416 # 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	417 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	418 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	419 bheads.extend(newnodes)
10920 39c69b5dc258 localrepo: simplify _updatebranchcache slightly Sune Foldager <cryo@cyanite.org> parents: 10912 diff changeset	420 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	421 continue
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	422 # 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	423 while newnodes:
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	424 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	425 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	426 continue
9119 d3b995dd4eab branch heads: optimise computation of branch head cache (issue1734) Henrik Stuart <hg@hstuart.dk> parents: 9093 diff changeset	427 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	428 reachable = self.changelog.reachable(latest, minbhrev)
10920 39c69b5dc258 localrepo: simplify _updatebranchcache slightly Sune Foldager <cryo@cyanite.org> parents: 10912 diff changeset	429 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	430 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	431 partial[branch] = bheads
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	432
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	433 def lookup(self, key):
7377 374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	434 if isinstance(key, int):
374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	435 return self.changelog.node(key)
374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	436 elif key == '.':
6738 369ddc9c0339 lookup: optimize '.' Matt Mackall <mpm@selenic.com> parents: 6732 diff changeset	437 return self.dirstate.parents()[0]
3795 bd7011246fab Add "null" pseudo-tag pointing to nullid Brendan Cully <brendan@kublai.com> parents: 3791 diff changeset	438 elif key == 'null':
bd7011246fab Add "null" pseudo-tag pointing to nullid Brendan Cully <brendan@kublai.com> parents: 3791 diff changeset	439 return nullid
7377 374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	440 elif key == 'tip':
374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	441 return self.changelog.tip()
3494 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	442 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	443 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	444 return n
3433 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3432 diff changeset	445 if key in self.tags():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	446 return self.tags()[key]
3433 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3432 diff changeset	447 if key in self.branchtags():
5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3432 diff changeset	448 return self.branchtags()[key]
3494 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	449 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	450 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	451 return n
8639 1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	452
1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	453 # 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	454 if key in self.dirstate.parents():
1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	455 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	456 % short(key))
4960 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	457 try:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	458 if len(key) == 20:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	459 key = hex(key)
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	460 except:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	461 pass
9423 1444a42f6052 Make distinct lookup error for localrepo.lookup Matt Mackall <mpm@selenic.com> parents: 9119 diff changeset	462 raise error.RepoLookupError(_("unknown revision '%s'") % key)
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	463
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	464 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	465 repo = remote or self
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	466 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	467 return key
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	468
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	469 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	470 return repo[key].branch()
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10926 diff changeset	471
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	472 def local(self):
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1100 diff changeset	473 return True
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	474
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	475 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	476 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	477
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	478 def wjoin(self, f):
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	479 return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	480
6522 cfeeac24fc1e repo: add rjoin method Bryan O'Sullivan <bos@serpentine.com> parents: 6407 diff changeset	481 def rjoin(self, f):
cfeeac24fc1e repo: add rjoin method Bryan O'Sullivan <bos@serpentine.com> parents: 6407 diff changeset	482 return os.path.join(self.root, util.pconvert(f))
6524 bd6bf5798f39 remove trailing whitespace introduced in cfeeac24fc1e Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6522 diff changeset	483
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	484 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	485 if f[0] == '/':
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	486 f = f[1:]
4267 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4232 diff changeset	487 return filelog.filelog(self.sopener, f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	488
6741 c9fbd6ec3489 context: avoid using None for working parent Matt Mackall <mpm@selenic.com> parents: 6738 diff changeset	489 def changectx(self, changeid):
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6745 diff changeset	490 return self[changeid]
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3197 diff changeset	491
3196 1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	492 def parents(self, changeid=None):
6744 2d54e7c1e69d context: clean up parents() Matt Mackall <mpm@selenic.com> parents: 6742 diff changeset	493 '''get list of changectxs for parents of changeid'''
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6745 diff changeset	494 return self[changeid].parents()
3196 1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	495
2564 55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	496 def filectx(self, path, changeid=None, fileid=None):
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	497 """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	498 fileid can be a file revision or node."""
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	499 return context.filectx(self, path, changeid, fileid)
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	500
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	501 def getcwd(self):
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	502 return self.dirstate.getcwd()
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	503
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4516 diff changeset	504 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	505 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	506
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	507 def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	508 return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	509
4265 81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4263 diff changeset	510 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: 4263 diff changeset	511 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: 4263 diff changeset	512
11677 9df481f8036d localrepo: refactor filter computation Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11669 diff changeset	513 def _loadfilter(self, filter):
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	514 if filter not in self.filterpats:
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	515 l = []
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	516 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	517 if cmd == '!':
b71a52f101dc Make it possible to disable filtering for a pattern. Mads Kiilerich <mads@kiilerich.com> parents: 7208 diff changeset	518 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	519 mf = matchmod.match(self.root, '', [pat])
5965 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	520 fn = None
6066 f3a8b5360100 Strip filter name from command before passing to filter function. Jesse Glick <jesse.glick@sun.com> parents: 6065 diff changeset	521 params = cmd
5965 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	522 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	523 if cmd.startswith(name):
5965 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	524 fn = filterfn
6066 f3a8b5360100 Strip filter name from command before passing to filter function. Jesse Glick <jesse.glick@sun.com> parents: 6065 diff changeset	525 params = cmd[len(name):].lstrip()
5965 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	526 break
11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	527 if not fn:
5966 f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5965 diff changeset	528 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: 5965 diff changeset	529 # Wrap old filters not supporting keyword arguments
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5965 diff changeset	530 if not inspect.getargspec(fn)[2]:
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5965 diff changeset	531 oldfn = fn
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5965 diff changeset	532 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	533 l.append((mf, fn, params))
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	534 self.filterpats[filter] = l
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	535
11677 9df481f8036d localrepo: refactor filter computation Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11669 diff changeset	536 def _filter(self, filter, filename, data):
9df481f8036d localrepo: refactor filter computation Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11669 diff changeset	537 self._loadfilter(filter)
9df481f8036d localrepo: refactor filter computation Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11669 diff changeset	538
5965 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	539 for mf, fn, cmd in self.filterpats[filter]:
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	540 if mf(filename):
9466 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	541 self.ui.debug("filtering %s through %s\n" % (filename, cmd))
5966 f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5965 diff changeset	542 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	543 break
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	544
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	545 return data
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	546
5965 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	547 def adddatafilter(self, name, filter):
11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	548 self._datafilters[name] = filter
11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	549
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	550 def wread(self, filename):
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	551 if self._link(filename):
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	552 data = os.readlink(self.wjoin(filename))
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	553 else:
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	554 data = self.wopener(filename, 'r').read()
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	555 return self._filter("encode", filename, data)
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	556
4006 67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	557 def wwrite(self, filename, data, flags):
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	558 data = self._filter("decode", filename, data)
5707 14789f30ac11 wwrite: simplify with util.set_flags Matt Mackall <mpm@selenic.com> parents: 5683 diff changeset	559 try:
14789f30ac11 wwrite: simplify with util.set_flags Matt Mackall <mpm@selenic.com> parents: 5683 diff changeset	560 os.unlink(self.wjoin(filename))
14789f30ac11 wwrite: simplify with util.set_flags Matt Mackall <mpm@selenic.com> parents: 5683 diff changeset	561 except OSError:
14789f30ac11 wwrite: simplify with util.set_flags Matt Mackall <mpm@selenic.com> parents: 5683 diff changeset	562 pass
6877 1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	563 if 'l' in flags:
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	564 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	565 else:
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	566 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	567 if 'x' in flags:
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	568 util.set_flags(self.wjoin(filename), False, True)
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	569
4005 656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 4004 diff changeset	570 def wwritedata(self, filename, data):
656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 4004 diff changeset	571 return self._filter("decode", filename, data)
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	572
10881 a685011ed38e localrepo: add desc parameter to transaction Steve Borho <steve@borho.org> parents: 10876 diff changeset	573 def transaction(self, desc):
8072 ecf7795479d5 transaction: support multiple, separate transactions Henrik Stuart <henrik.stuart@edlund.dk> parents: 7948 diff changeset	574 tr = self._transref and self._transref() or None
ecf7795479d5 transaction: support multiple, separate transactions Henrik Stuart <henrik.stuart@edlund.dk> parents: 7948 diff changeset	575 if tr and tr.running():
ecf7795479d5 transaction: support multiple, separate transactions Henrik Stuart <henrik.stuart@edlund.dk> parents: 7948 diff changeset	576 return tr.nest()
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	577
5865 e7127f669edb transactions: don't show a backtrace when journal exists Matt Mackall <mpm@selenic.com> parents: 5814 diff changeset	578 # 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	579 if os.path.exists(self.sjoin("journal")):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	580 raise error.RepoError(
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	581 _("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	582
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2354 diff changeset	583 # save dirstate for rollback
263 e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	584 try:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	585 ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	586 except IOError:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	587 ds = ""
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	588 self.opener("journal.dirstate", "w").write(ds)
5814 dd5a501cb97f restore branch after rollback (issue 902) Alexandre Vassalotti <mercurial-bugs@selenic.com> parents: 5812 diff changeset	589 self.opener("journal.branch", "w").write(self.dirstate.branch())
10892 e39e94377eb2 transaction: use newlines to separate description elements Matt Mackall <mpm@selenic.com> parents: 10888 diff changeset	590 self.opener("journal.desc", "w").write("%d\n%s\n" % (len(self), desc))
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	591
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	592 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	593 (self.join("journal.dirstate"), self.join("undo.dirstate")),
10881 a685011ed38e localrepo: add desc parameter to transaction Steve Borho <steve@borho.org> parents: 10876 diff changeset	594 (self.join("journal.branch"), self.join("undo.branch")),
a685011ed38e localrepo: add desc parameter to transaction Steve Borho <steve@borho.org> parents: 10876 diff changeset	595 (self.join("journal.desc"), self.join("undo.desc"))]
3498 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3497 diff changeset	596 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	597 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	598 aftertrans(renames),
6894 29772acb5d2a localrepo: kill _createmode Matt Mackall <mpm@selenic.com> parents: 6888 diff changeset	599 self.store.createmode)
4960 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	600 self._transref = weakref.ref(tr)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	601 return tr
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	602
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	603 def recover(self):
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8103 diff changeset	604 lock = self.lock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	605 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	606 if os.path.exists(self.sjoin("journal")):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	607 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	608 transaction.rollback(self.sopener, self.sjoin("journal"),
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	609 self.ui.warn)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	610 self.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	611 return True
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	612 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	613 self.ui.warn(_("no interrupted transaction available\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	614 return False
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	615 finally:
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8103 diff changeset	616 lock.release()
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	617
10882 f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	618 def rollback(self, dryrun=False):
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	619 wlock = lock = None
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	620 try:
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	621 wlock = self.wlock()
4438 3900f684a150 Fix hg import --exact bug that hangs hg on failure. Eric Hopper <hopper@omnifarious.org> parents: 4417 diff changeset	622 lock = self.lock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	623 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	624 try:
10892 e39e94377eb2 transaction: use newlines to separate description elements Matt Mackall <mpm@selenic.com> parents: 10888 diff changeset	625 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	626 if len(args) >= 3 and self.ui.verbose:
10893 468876bc3885 rollback: improve message Matt Mackall <mpm@selenic.com> parents: 10892 diff changeset	627 desc = _("rolling back to revision %s"
468876bc3885 rollback: improve message Matt Mackall <mpm@selenic.com> parents: 10892 diff changeset	628 " (undo %s: %s)\n") % (
11174 ba78a1bfbfd9 rollback: fix off-by-one in message Matt Mackall <mpm@selenic.com> parents: 11156 diff changeset	629 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	630 elif len(args) >= 2:
10893 468876bc3885 rollback: improve message Matt Mackall <mpm@selenic.com> parents: 10892 diff changeset	631 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	632 int(args[0]) - 1, args[1])
10892 e39e94377eb2 transaction: use newlines to separate description elements Matt Mackall <mpm@selenic.com> parents: 10888 diff changeset	633 except IOError:
10882 f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	634 desc = _("rolling back unknown transaction\n")
f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	635 self.ui.status(desc)
f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	636 if dryrun:
f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10881 diff changeset	637 return
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	638 transaction.rollback(self.sopener, self.sjoin("undo"),
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	639 self.ui.warn)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	640 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
6058 88b4d726332a Do not abort rollback if undo.branch isn't available, but warn. Thomas Arendsen Hein <thomas@intevation.de> parents: 6056 diff changeset	641 try:
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn. Thomas Arendsen Hein <thomas@intevation.de> parents: 6056 diff changeset	642 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	643 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	644 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	645 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	646 "current branch still is: %s\n")
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7930 diff changeset	647 % encoding.tolocal(self.dirstate.branch()))
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	648 self.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	649 self.dirstate.invalidate()
9158 09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9157 diff changeset	650 self.destroyed()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	651 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	652 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	653 return 1
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	654 finally:
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8103 diff changeset	655 release(lock, wlock)
162 5dcbe4d9a30c Implement recover and undo commands mpm@selenic.com parents: 161 diff changeset	656
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	657 def invalidatecaches(self):
9154 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	658 self._tags = None
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9153 diff changeset	659 self._tagtypes = None
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	660 self.nodetagscache = None
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	661 self._branchcache = None # in UTF-8
6118 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6117 diff changeset	662 self._branchcachetip = None
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	663
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	664 def invalidate(self):
bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	665 for a in "changelog manifest".split():
bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	666 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	667 delattr(self, a)
bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	668 self.invalidatecaches()
bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	669
4957 46e39935ce33 rename and simplify do_lock Matt Mackall <mpm@selenic.com> parents: 4956 diff changeset	670 def _lock(self, lockname, wait, releasefn, acquirefn, desc):
161 0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	671 try:
3498 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3497 diff changeset	672 l = lock.lock(lockname, 0, releasefn, desc=desc)
7640 7197812e8d44 error: move lock errors Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	673 except error.LockHeld, inst:
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	674 if not wait:
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	675 raise
3688 d92dad355000 Corrected "waiting for lock on repository FOO held by BAR" message. Thomas Arendsen Hein <thomas@intevation.de> parents: 3687 diff changeset	676 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	677 (desc, inst.locker))
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	678 # default to 600 seconds timeout
3498 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3497 diff changeset	679 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	680 releasefn, desc=desc)
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	681 if acquirefn:
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	682 acquirefn()
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	683 return l
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	684
4958 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4957 diff changeset	685 def lock(self, wait=True):
9309 cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9160 diff changeset	686 '''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: 9160 diff changeset	687 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: 9160 diff changeset	688 stripping). If you are opening a transaction, get a lock as well.)'''
8103 a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	689 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	690 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	691 l.lock()
a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	692 return l
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	693
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	694 l = self._lock(self.sjoin("lock"), wait, None, self.invalidate,
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	695 _('repository %s') % self.origroot)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	696 self._lockref = weakref.ref(l)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	697 return l
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	698
4958 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4957 diff changeset	699 def wlock(self, wait=True):
9309 cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9160 diff changeset	700 '''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: 9160 diff changeset	701 .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: 9160 diff changeset	702 Use this before modifying files in .hg.'''
8103 a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	703 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	704 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	705 l.lock()
a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	706 return l
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	707
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	708 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: 4960 diff changeset	709 self.dirstate.invalidate, _('working directory of %s') %
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	710 self.origroot)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	711 self._wlockref = weakref.ref(l)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	712 return l
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	713
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	714 def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist):
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	715 """
3300 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	716 commit an individual file as part of a larger transaction
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	717 """
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	718
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	719 fname = fctx.path()
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	720 text = fctx.data()
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	721 flog = self.file(fname)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	722 fparent1 = manifest1.get(fname, nullid)
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	723 fparent2 = fparent2o = manifest2.get(fname, nullid)
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	724
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	725 meta = {}
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	726 copy = fctx.renamed()
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	727 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: 3925 diff changeset	728 # 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	729 # 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	730 # 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: 3925 diff changeset	731 # 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: 3925 diff changeset	732 # 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: 3925 diff changeset	733 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	734 # 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: 3925 diff changeset	735 # \ / 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: 3925 diff changeset	736 # \- 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: 3925 diff changeset	737 # 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: 3925 diff changeset	738 # 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: 3925 diff changeset	739 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	740 # 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: 3925 diff changeset	741 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	742 # 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: 3925 diff changeset	743 # \ / 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: 3925 diff changeset	744 # \- 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: 3925 diff changeset	745 #
6874 8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6682 diff changeset	746
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	747 cfname = copy[0]
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	748 crev = manifest1.get(cfname)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	749 newfparent = fparent2
6874 8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6682 diff changeset	750
8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6682 diff changeset	751 if manifest2: # branch merge
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	752 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	753 if cfname in manifest2:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	754 crev = manifest2[cfname]
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	755 newfparent = fparent1
6874 8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6682 diff changeset	756
6875 0d714a48ab53 add a fix for issue 1175 Matt Mackall <mpm@selenic.com> parents: 6874 diff changeset	757 # 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	758 if not crev:
9466 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	759 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	760 (fname, cfname))
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	761 for ancestor in self['.'].ancestors():
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	762 if cfname in ancestor:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	763 crev = ancestor[cfname].filenode()
6876 077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6875 6840 diff changeset	764 break
6875 0d714a48ab53 add a fix for issue 1175 Matt Mackall <mpm@selenic.com> parents: 6874 diff changeset	765
9466 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	766 self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	767 meta["copy"] = cfname
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	768 meta["copyrev"] = hex(crev)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	769 fparent1, fparent2 = nullid, newfparent
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	770 elif fparent2 != nullid:
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	771 # 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	772 fparentancestor = flog.ancestor(fparent1, fparent2)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	773 if fparentancestor == fparent1:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	774 fparent1, fparent2 = fparent2, nullid
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	775 elif fparentancestor == fparent2:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	776 fparent2 = nullid
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	777
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	778 # is the file changed?
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	779 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	780 changelist.append(fname)
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	781 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	782
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	783 # are just the flags changed during merge?
10319 808c187fc556 localrepo: minor formatting - remove double space Henri Wiechers <hwiechers@gmail.com> parents: 10282 diff changeset	784 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	785 changelist.append(fname)
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	786
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	787 return fparent1
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	788
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	789 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	790 editor=False, extra={}):
8515 865e08a7d6b0 localrepo: update commit() docstrings Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 8512 diff changeset	791 """Add a new revision to current repository.
865e08a7d6b0 localrepo: update commit() docstrings Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 8512 diff changeset	792
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	793 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	794 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	795 supplied, it is called to get a commit message.
8515 865e08a7d6b0 localrepo: update commit() docstrings Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 8512 diff changeset	796 """
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	797
8715 8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	798 def fail(f, msg):
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	799 raise util.Abort('%s: %s' % (f, msg))
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	800
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	801 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	802 match = matchmod.always(self.root, '')
8715 8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	803
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	804 if not force:
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	805 vdirs = []
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	806 match.dir = vdirs.append
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	807 match.bad = fail
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	808
8405 7cbf8fcd2453 commit: push repo lock down into _commitctx Matt Mackall <mpm@selenic.com> parents: 8404 diff changeset	809 wlock = self.wlock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	810 try:
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	811 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	812 merge = len(wctx.parents()) > 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	813
10970 3213e8947975 localrepo.commit: use explicit variables, avoid creating new contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10969 diff changeset	814 if (not force and merge and match and
8510 ab0e3f7ea315 commit: some tidying Matt Mackall <mpm@selenic.com> parents: 8509 diff changeset	815 (match.files() or match.anypats())):
8397 613ac2856535 remove deprecated rawcommit Matt Mackall <mpm@selenic.com> parents: 8395 diff changeset	816 raise util.Abort(_('cannot partially commit a merge '
613ac2856535 remove deprecated rawcommit Matt Mackall <mpm@selenic.com> parents: 8395 diff changeset	817 '(do not specify files or patterns)'))
6706 716a1296e182 localrepo: replace dirstate by workingfilectx in filecommit() Patrick Mezard <pmezard@gmail.com> parents: 6705 diff changeset	818
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	819 changes = self.status(match=match, clean=force)
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	820 if force:
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	821 changes[0].extend(changes[6]) # mq may commit unchanged files
3619 7d3d603e7df9 localrepo: factor commit and rawcommit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3618 diff changeset	822
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	823 # check subrepos
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	824 subs = []
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	825 removedsubs = set()
b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	826 for p in wctx.parents():
b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	827 removedsubs.update(s for s in p.substate if match(s))
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	828 for s in wctx.substate:
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	829 removedsubs.discard(s)
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	830 if match(s) and wctx.sub(s).dirty():
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	831 subs.append(s)
11485 b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11442 diff changeset	832 if (subs or removedsubs):
b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232) Matt Mackall <mpm@selenic.com> parents: 11442 diff changeset	833 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	834 '.hgsub' in (wctx.modified() + wctx.added())):
11486 d3c3e2fdeb0c commit: add missing _() Matt Mackall <mpm@selenic.com> parents: 11485 diff changeset	835 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	836 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	837 changes[0].insert(0, '.hgsubstate')
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	838
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	839 # 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	840 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	841 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	842
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	843 for f in match.files():
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	844 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	845 continue
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	846 if f in changes[3]: # missing
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	847 fail(f, _('file not found!'))
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	848 if f in vdirs: # visited directory
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	849 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	850 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	851 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	852 break
bcb6e5bebd93 commit: trade O(n^2) file checks for O(n^2) dir checks Matt Mackall <mpm@selenic.com> parents: 8709 diff changeset	853 else:
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	854 fail(f, _("no match under directory!"))
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	855 elif f not in self.dirstate:
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	856 fail(f, _("file not tracked!"))
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	857
10970 3213e8947975 localrepo.commit: use explicit variables, avoid creating new contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10969 diff changeset	858 if (not force and not extra.get("close") and not merge
8510 ab0e3f7ea315 commit: some tidying Matt Mackall <mpm@selenic.com> parents: 8509 diff changeset	859 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	860 and wctx.branch() == wctx.p1().branch()):
8404 a2bc39ade36b commit: move 'nothing changed' test into commit() Matt Mackall <mpm@selenic.com> parents: 8403 diff changeset	861 return None
a2bc39ade36b commit: move 'nothing changed' test into commit() Matt Mackall <mpm@selenic.com> parents: 8403 diff changeset	862
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10547 diff changeset	863 ms = mergemod.mergestate(self)
6888 7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6882 diff changeset	864 for f in changes[0]:
7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6882 diff changeset	865 if f in ms and ms[f] == 'u':
7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6882 diff changeset	866 raise util.Abort(_("unresolved merge conflicts "
7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6882 diff changeset	867 "(see hg resolve)"))
8505 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8479 diff changeset	868
10969 ca052b484e56 context: remove parents parameter to workingctx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10960 diff changeset	869 cctx = context.workingctx(self, text, user, date, extra, changes)
8505 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8479 diff changeset	870 if editor:
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8954 diff changeset	871 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	872 edited = (text != cctx._text)
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	873
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	874 # commit subs
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	875 if subs or removedsubs:
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	876 state = wctx.substate.copy()
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	877 for s in 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	878 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	879 self.ui.status(_('committing subrepository %s\n') %
4a9bee613737 subrepo: print paths relative to upper repo root for push/pull/commit Edouard Gomez <ed.gomez@free.fr> parents: 11063 diff changeset	880 subrepo.relpath(sub))
4a9bee613737 subrepo: print paths relative to upper repo root for push/pull/commit Edouard Gomez <ed.gomez@free.fr> parents: 11063 diff changeset	881 sr = sub.commit(cctx._text, user, date)
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	882 state[s] = (state[s][0], sr)
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	883 subrepo.writestate(self, state)
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8803 diff changeset	884
9934 720f70b720d3 commit: save commit message so it's not destroyed by rollback. Greg Ward <greg-hg@gerg.ca> parents: 9929 diff changeset	885 # 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	886 # (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	887 # 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	888 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	889 msgfile.write(cctx._text)
9934 720f70b720d3 commit: save commit message so it's not destroyed by rollback. Greg Ward <greg-hg@gerg.ca> parents: 9929 diff changeset	890 msgfile.close()
720f70b720d3 commit: save commit message so it's not destroyed by rollback. Greg Ward <greg-hg@gerg.ca> parents: 9929 diff changeset	891
10970 3213e8947975 localrepo.commit: use explicit variables, avoid creating new contexts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10969 diff changeset	892 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	893 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	894 try:
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10436 diff changeset	895 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	896 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	897 except:
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	898 if edited:
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	899 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	900 self.ui.write(
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	901 _('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	902 raise
8505 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8479 diff changeset	903
8512 90f86a5330bb commit: tidy up mergestate slightly Matt Mackall <mpm@selenic.com> parents: 8511 diff changeset	904 # update dirstate and mergestate
8416 9dfee83c93c8 commit: hoist the rest of the dirstate manipulation out of commitctx Matt Mackall <mpm@selenic.com> parents: 8415 diff changeset	905 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	906 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	907 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	908 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	909 self.dirstate.setparents(ret)
8512 90f86a5330bb commit: tidy up mergestate slightly Matt Mackall <mpm@selenic.com> parents: 8511 diff changeset	910 ms.reset()
6710 0aa91f69a4c4 localrepo: extract _commitctx() from commit() Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	911 finally:
8405 7cbf8fcd2453 commit: push repo lock down into _commitctx Matt Mackall <mpm@selenic.com> parents: 8404 diff changeset	912 wlock.release()
6710 0aa91f69a4c4 localrepo: extract _commitctx() from commit() Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	913
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10436 diff changeset	914 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: 10436 diff changeset	915 return ret
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10436 diff changeset	916
8505 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8479 diff changeset	917 def commitctx(self, ctx, error=False):
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7072 diff changeset	918 """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	919 Revision information is passed via the context argument.
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7072 diff changeset	920 """
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6712 diff changeset	921
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	922 tr = lock = None
8507 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8505 diff changeset	923 removed = ctx.removed()
8414 2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	924 p1, p2 = ctx.p1(), ctx.p2()
2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	925 m1 = p1.manifest().copy()
2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	926 m2 = p2.manifest()
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	927 user = ctx.user()
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	928
8411 4d5916358abd commit: move lots of commitctx outside of the repo lock Matt Mackall <mpm@selenic.com> parents: 8410 diff changeset	929 lock = self.lock()
4d5916358abd commit: move lots of commitctx outside of the repo lock Matt Mackall <mpm@selenic.com> parents: 8410 diff changeset	930 try:
10881 a685011ed38e localrepo: add desc parameter to transaction Steve Borho <steve@borho.org> parents: 10876 diff changeset	931 tr = self.transaction("commit")
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	932 trp = weakref.proxy(tr)
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	933
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	934 # check in files
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	935 new = {}
6710 0aa91f69a4c4 localrepo: extract _commitctx() from commit() Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	936 changed = []
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	937 linkrev = len(self)
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	938 for f in sorted(ctx.modified() + ctx.added()):
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	939 self.ui.note(f + "\n")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	940 try:
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	941 fctx = ctx[f]
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	942 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	943 changed)
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	944 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	945 except OSError, inst:
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	946 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	947 raise
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	948 except IOError, inst:
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	949 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	950 if error or errcode and errcode != errno.ENOENT:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	951 self.ui.warn(_("trouble committing %s!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	952 raise
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	953 else:
8507 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8505 diff changeset	954 removed.append(f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	955
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	956 # update manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	957 m1.update(new)
8507 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8505 diff changeset	958 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: 8505 diff changeset	959 drop = [f for f in removed if f in m1]
a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8505 diff changeset	960 for f in drop:
a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8505 diff changeset	961 del m1[f]
8414 2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	962 mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(),
8507 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8505 diff changeset	963 p2.manifestnode(), (new, drop))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	964
8508 fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8507 diff changeset	965 # update changelog
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7732 diff changeset	966 self.changelog.delayupdate()
8508 fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8507 diff changeset	967 n = self.changelog.add(mn, changed + removed, ctx.description(),
fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8507 diff changeset	968 trp, p1.node(), p2.node(),
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	969 user, ctx.date(), ctx.extra().copy())
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7732 diff changeset	970 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: 10436 diff changeset	971 xp1, xp2 = p1.hex(), p2 and p2.hex() or ''
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	972 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: 7732 diff changeset	973 parent2=xp2, pending=p)
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7732 diff changeset	974 self.changelog.finalize(trp)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	975 tr.close()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	976
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	977 if self._branchcache:
6118 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6117 diff changeset	978 self.branchtags()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	979 return n
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	980 finally:
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 11228 diff changeset	981 if tr:
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 11228 diff changeset	982 tr.release()
8405 7cbf8fcd2453 commit: push repo lock down into _commitctx Matt Mackall <mpm@selenic.com> parents: 8404 diff changeset	983 lock.release()
660 2c83350784c3 Move commit hook after commit completes Matt Mackall <mpm@selenic.com> parents: 659 diff changeset	984
9158 09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9157 diff changeset	985 def destroyed(self):
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9157 diff changeset	986 '''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: 9157 diff changeset	987 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: 9157 diff changeset	988 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: 9157 diff changeset	989 # 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: 9157 diff changeset	990 # nodes, but I don't see an easy way for rollback() to do that
9159 f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9158 diff changeset	991
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9158 diff changeset	992 # Ensure the persistent tag cache is updated. Doing it now
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9158 diff changeset	993 # 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: 9158 diff changeset	994 # heads immediately after a strip/rollback. That in turn
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9158 diff changeset	995 # guarantees that "cachetip == currenttip" (comparing both rev
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9158 diff changeset	996 # 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: 9158 diff changeset	997
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9158 diff changeset	998 # 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: 9158 diff changeset	999 # 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: 9158 diff changeset	1000 # 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: 9158 diff changeset	1001 # 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	1002 self.invalidatecaches()
9158 09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9157 diff changeset	1003
6585 d3d1d39da2fa walk: remove cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	1004 def walk(self, match, node=None):
3563 26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	1005 '''
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	1006 walk recursively through the directory tree or a given
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	1007 changeset, finding all files matched by the match
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	1008 function
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	1009 '''
6783 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1010 return self[node].walk(match)
3563 26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	1011
6802 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6783 diff changeset	1012 def status(self, node1='.', node2=None, match=None,
6762 4faaa0535ea7 status: clean up all users for unknown files Matt Mackall <mpm@selenic.com> parents: 6757 diff changeset	1013 ignored=False, clean=False, unknown=False):
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1014 """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	1015
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1016 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	1017 If node2 is None, compare node1 with working directory.
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1018 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1019
6802 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6783 diff changeset	1020 def mfmatches(ctx):
97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6783 diff changeset	1021 mf = ctx.manifest().copy()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1022 for fn in mf.keys():
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1023 if not match(fn):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1024 del mf[fn]
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1025 return mf
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	1026
7090 7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1027 if isinstance(node1, context.changectx):
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1028 ctx1 = node1
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1029 else:
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1030 ctx1 = self[node1]
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1031 if isinstance(node2, context.changectx):
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1032 ctx2 = node2
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1033 else:
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1034 ctx2 = self[node2]
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1035
7435 5e13df32fb74 bundlerepo doesn't really have a dirstate, throw AttributeError if requested Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7415 diff changeset	1036 working = ctx2.rev() is None
6802 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6783 diff changeset	1037 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	1038 match = match or matchmod.always(self.root, self.getcwd())
6755 ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6752 diff changeset	1039 listignored, listclean, listunknown = ignored, clean, unknown
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	1040
7090 7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1041 # load earliest manifest first for caching reasons
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1042 if not working and ctx2.rev() < ctx1.rev():
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1043 ctx2.manifest()
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1044
7067 40d105a12cac status: don't warn about missing files present in base revision (issue1323) Matt Mackall <mpm@selenic.com> parents: 7064 diff changeset	1045 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	1046 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	1047 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	1048 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	1049 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	1050
6803 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1051 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	1052 subrepos = []
054549ccb680 status: avoid performance regression when no .hgsub is present Matt Mackall <mpm@selenic.com> parents: 11154 diff changeset	1053 if '.hgsub' in self.dirstate:
054549ccb680 status: avoid performance regression when no .hgsub is present Matt Mackall <mpm@selenic.com> parents: 11154 diff changeset	1054 subrepos = ctx1.substate.keys()
10178 24ce8f0c0a39 dirstate: don't check state of subrepo directories Augie Fackler <durin42@gmail.com> parents: 10011 diff changeset	1055 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	1056 listclean, listunknown)
6803 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1057 cmp, modified, added, removed, deleted, unknown, ignored, clean = s
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1058
6803 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1059 # check for any possibly clean files
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1060 if parentworking and cmp:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1061 fixup = []
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1062 # 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	1063 for f in sorted(cmp):
6803 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1064 if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f)
11681 eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11677 diff changeset	1065 or ctx1[f].cmp(ctx2[f])):
6803 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1066 modified.append(f)
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1067 else:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1068 fixup.append(f)
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1069
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1070 # update dirstate for files that are actually clean
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1071 if fixup:
11669 c47cb3193c53 localrepo.status: move fixup concatenation inside if block for clarity Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11665 diff changeset	1072 if listclean:
c47cb3193c53 localrepo.status: move fixup concatenation inside if block for clarity Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11665 diff changeset	1073 clean += fixup
c47cb3193c53 localrepo.status: move fixup concatenation inside if block for clarity Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11665 diff changeset	1074
6803 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1075 try:
8647 cb74433f9b41 localrepo: move comment Adrian Buehlmann <adrian@cadifra.com> parents: 8646 diff changeset	1076 # updating the dirstate is optional
cb74433f9b41 localrepo: move comment Adrian Buehlmann <adrian@cadifra.com> parents: 8646 diff changeset	1077 # 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	1078 wlock = self.wlock(False)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1079 try:
6803 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1080 for f in fixup:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1081 self.dirstate.normal(f)
8646 60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1082 finally:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1083 wlock.release()
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1084 except error.LockError:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1085 pass
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1086
6802 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6783 diff changeset	1087 if not parentworking:
97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6783 diff changeset	1088 mf1 = mfmatches(ctx1)
6803 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1089 if working:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1090 # we are comparing working dir against non-parent
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1091 # generate a pseudo-manifest for the working dir
6802 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6783 diff changeset	1092 mf2 = mfmatches(self['.'])
6803 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1093 for f in cmp + modified + added:
6802 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6783 diff changeset	1094 mf2[f] = None
6817 cf319797d61c minor status fixups Matt Mackall <mpm@selenic.com> parents: 6810 diff changeset	1095 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	1096 for f in removed:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1097 if f in mf2:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1098 del mf2[f]
6803 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1099 else:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1100 # we are comparing two revisions
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1101 deleted, unknown, ignored = [], [], []
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6802 diff changeset	1102 mf2 = mfmatches(ctx2)
4370 4ddc6d374265 localrepository.status: only acquire wlock if actually needed. Bryan O'Sullivan <bos@serpentine.com> parents: 4334 diff changeset	1103
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1104 modified, added, clean = [], [], []
6827 c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1105 for fn in mf2:
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5913 diff changeset	1106 if fn in mf1:
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4623 diff changeset	1107 if (mf1.flags(fn) != mf2.flags(fn) or
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4623 diff changeset	1108 (mf1[fn] != mf2[fn] and
11681 eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11677 diff changeset	1109 (mf2[fn] or ctx1[fn].cmp(ctx2[fn])))):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1110 modified.append(fn)
6755 ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6752 diff changeset	1111 elif listclean:
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1112 clean.append(fn)
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1113 del mf1[fn]
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1114 else:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1115 added.append(fn)
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	1116 removed = mf1.keys()
ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	1117
6827 c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1118 r = modified, added, removed, deleted, unknown, ignored, clean
c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1119 [l.sort() for l in r]
c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1120 return r
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1121
8800 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8731 diff changeset	1122 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	1123 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	1124 # sort the output in rev descending order
8800 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8731 diff changeset	1125 heads = [(-self.changelog.rev(h), h) for h in heads]
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	1126 return [n for (r, n) in sorted(heads)]
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1127
8694 ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default John Mulligan <phlogistonjohn@asynchrono.us> parents: 8681 diff changeset	1128 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	1129 '''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	1130
c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1131 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	1132 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	1133 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	1134 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	1135 '''
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6745 diff changeset	1136 if branch is None:
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6745 diff changeset	1137 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	1138 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	1139 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	1140 return []
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	1141 # 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	1142 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	1143 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	1144 # 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	1145 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	1146 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	1147 if not closed:
7670 e5f445c94226 kill some trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7656 diff changeset	1148 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	1149 ('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	1150 return bheads
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1151
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1152 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	1153 if not nodes:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1154 nodes = [self.changelog.tip()]
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1155 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1156 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1157 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	1158 while 1:
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1159 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1160 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	1161 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	1162 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1163 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1164 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1165
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1166 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1167 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1168
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1169 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1170 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1171 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1172
7708 a32847fa0df0 wire protocol: avoid infinite loop (issue1483) Matt Mackall <mpm@selenic.com> parents: 7570 diff changeset	1173 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	1174 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1175 if i == f:
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	1176 l.append(n)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1177 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1178 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1179 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1180
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1181 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1182
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1183 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1184
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1185 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: 4960 diff changeset	1186 lock = self.lock()
2816 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1187 try:
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	1188 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	1189 force=force)
3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	1190 common, fetch, rheads = tmp
2816 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1191 if not fetch:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1192 self.ui.status(_("no changes found\n"))
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1193 return 0
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1194
10840 60b42f318a6d clone: no race possible, we can use changegroup() and have smaller urls Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10772 diff changeset	1195 if fetch == [nullid]:
60b42f318a6d clone: no race possible, we can use changegroup() and have smaller urls Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10772 diff changeset	1196 self.ui.status(_("requesting all changes\n"))
60b42f318a6d clone: no race possible, we can use changegroup() and have smaller urls Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10772 diff changeset	1197 elif heads is None and remote.capable('changegroupsubset'):
60b42f318a6d clone: no race possible, we can use changegroup() and have smaller urls Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10772 diff changeset	1198 # issue1320, avoid a race if remote changed after discovery
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1199 heads = rheads
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1200
2816 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1201 if heads is None:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1202 cg = remote.changegroup(fetch, 'pull')
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1203 else:
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1204 if not remote.capable('changegroupsubset'):
8663 45f626a39def wrap string literals in error messages Martin Geisler <mg@lazybytes.net> parents: 8647 diff changeset	1205 raise util.Abort(_("Partial pull cannot be done because "
45f626a39def wrap string literals in error messages Martin Geisler <mg@lazybytes.net> parents: 8647 diff changeset	1206 "other repository doesn't support "
45f626a39def wrap string literals in error messages Martin Geisler <mg@lazybytes.net> parents: 8647 diff changeset	1207 "changegroupsubset."))
2816 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1208 cg = remote.changegroupsubset(fetch, heads, 'pull')
11442 ee1ed6afac21 addchangegroup: pass in lock to release it before changegroup hook is called Matt Mackall <mpm@selenic.com> parents: 11368 diff changeset	1209 return self.addchangegroup(cg, 'pull', remote.url(), lock=lock)
2816 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1210 finally:
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8103 diff changeset	1211 lock.release()
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1212
11211 e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11177 diff changeset	1213 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	1214 '''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	1215 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	1216 - 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	1217 - 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	1218 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	1219 - 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	1220 '''
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1221 # 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	1222 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1223 # 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	1224 # 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	1225 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1226 # 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	1227 # servers, http servers).
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1228
11598 5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1229 lock = None
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1230 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	1231 if not unbundle:
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1232 lock = remote.lock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1233 try:
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11230 diff changeset	1234 ret = discovery.prepush(self, remote, force, revs, newbranch)
11598 5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1235 if ret[0] is None:
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1236 # and here we return 0 for "nothing to push" or 1 for
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1237 # "something to push but I refuse"
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1238 return ret[1]
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1239
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1240 cg, remote_heads = ret
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1241 if unbundle:
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1242 # local repo finds heads on server, finds out what revs it must
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1243 # push. once revs transferred, if server finds it has
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1244 # different heads (someone else won commit/push race), server
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1245 # aborts.
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1246 if force:
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1247 remote_heads = ['force']
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1248 # ssh: return remote's addchangegroup()
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1249 # http: return remote's addchangegroup() or 0 for error
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1250 return remote.unbundle(cg, remote_heads, 'push')
5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1251 else:
11442 ee1ed6afac21 addchangegroup: pass in lock to release it before changegroup hook is called Matt Mackall <mpm@selenic.com> parents: 11368 diff changeset	1252 # we return an integer indicating remote head count change
ee1ed6afac21 addchangegroup: pass in lock to release it before changegroup hook is called Matt Mackall <mpm@selenic.com> parents: 11368 diff changeset	1253 return remote.addchangegroup(cg, 'push', self.url(), lock=lock)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1254 finally:
11598 5be142109ed4 localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11486 diff changeset	1255 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	1256 lock.release()
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1257
5763 e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	1258 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	1259 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	1260 self.ui.status(_("%d changesets found\n") % len(nodes))
3510 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1261 if self.ui.debugflag:
9466 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1262 self.ui.debug("list of changesets:\n")
3510 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1263 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	1264 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	1265
5905 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1266 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	1267 """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	1268 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	1269 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	1270 successive changegroup chunks.
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1271
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1272 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	1273 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	1274 is non-trivial.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1275
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1276 Another wrinkle is doing the reverse, figuring out which changeset in
5905 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1277 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	1278
5905 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1279 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: 5904 diff changeset	1280 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: 5904 diff changeset	1281 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: 5904 diff changeset	1282 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: 5904 diff changeset	1283 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: 5904 diff changeset	1284 the linkrev.
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1285 """
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1286
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1287 # Set up some initial variables
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1288 # 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	1289 cl = self.changelog
11660 5d62df44cac0 changegroupsubset(): move comment at the right place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11659 diff changeset	1290 # 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	1291 # 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	1292 # 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	1293 # 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	1294 if not bases:
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1295 bases = [nullid]
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1296 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	1297
7233 9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1298 if extranodes is None:
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1299 # 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	1300 heads.sort()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1301 allheads = self.heads()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1302 allheads.sort()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1303 if heads == allheads:
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1304 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	1305
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1306 # slow path
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1307 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1308
5763 e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	1309 self.changegroupinfo(msng_cl_lst, source)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1310
11662 a3bfdf212094 changegroupsubset: simplify knownheads/has_cl_set computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11661 diff changeset	1311 # 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	1312 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	1313
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1314 # 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	1315 mnfst = self.manifest
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1316 # 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	1317 msng_mnfst_set = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1318 # 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	1319 msng_filenode_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1320
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	1321 junk = mnfst.index[len(mnfst) - 1] # Get around a bug in lazyindex
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1322 junk = None
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1323
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1324 # 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	1325 # 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	1326 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1327 return x
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1328
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1329 # 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	1330 # 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	1331 def filenode_collector(changedfiles):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1332 # 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	1333 # 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	1334 # 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	1335 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1336 # 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	1337 # 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	1338 # 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	1339 def collect_msng_filenodes(mnfstnode):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1340 r = mnfst.rev(mnfstnode)
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	1341 if r - 1 in mnfst.parentrevs(r):
a9836feb5a8c changegroupsubset: readdelta() can be used if the previous rev is a parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10010 diff changeset	1342 # 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	1343 # we only need to see a diff.
5182 012dbf88b9b2 remove unneeded imports of mdiff Matt Mackall <mpm@selenic.com> parents: 5141 diff changeset	1344 deltamf = mnfst.readdelta(mnfstnode)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1345 # For each line in the delta
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7596 diff changeset	1346 for f, fnode in deltamf.iteritems():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1347 # 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	1348 # about.
11648 801533a52799 changegroup(): use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11644 diff changeset	1349 if f in changedfiles:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1350 # Get the changenode this manifest belongs to
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1351 clnode = msng_mnfst_set[mnfstnode]
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1352 # 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	1353 # there isn't one already.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1354 ndset = msng_filenode_set.setdefault(f, {})
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1355 # 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	1356 # 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	1357 ndset.setdefault(fnode, clnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1358 else:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1359 # Otherwise we need a full manifest.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1360 m = mnfst.read(mnfstnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1361 # For every file in we care about.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1362 for f in changedfiles:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1363 fnode = m.get(f, None)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1364 # If it's in the manifest
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1365 if fnode is not None:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1366 # See comments above.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1367 clnode = msng_mnfst_set[mnfstnode]
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1368 ndset = msng_filenode_set.setdefault(f, {})
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1369 ndset.setdefault(fnode, clnode)
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1370 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	1371
11659 deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1372 # 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	1373 # 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	1374 # 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	1375 # 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	1376 def prune(revlog, missingnodes):
8467 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1377 hasset = set()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1378 # 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	1379 # 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	1380 # that filenode.
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1381 for n in missingnodes:
11662 a3bfdf212094 changegroupsubset: simplify knownheads/has_cl_set computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11661 diff changeset	1382 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	1383 if clrev in commonrevs:
8467 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1384 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	1385 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	1386 missingnodes.pop(n, None)
11659 deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1387 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	1388 missingnodes.pop(revlog.node(r), None)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1389
5905 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1390 # 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: 5904 diff changeset	1391 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: 5904 diff changeset	1392 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: 5904 diff changeset	1393 return
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1394
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1395 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: 5904 diff changeset	1396 if node not in nodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1397 nodes[node] = linknode
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1398
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1399 # 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	1400 # 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	1401 def gengroup():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1402 # 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	1403 changedfiles = set()
10356 bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1404 collect = changegroup.collector(cl, msng_mnfst_set, changedfiles)
10405 2d30d66a89ad whitespace cleanup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10396 diff changeset	1405
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1406 # 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	1407 # 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	1408 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	1409 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	1410 yield chnk
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1411 self.ui.progress(_('bundling changes'), cnt, unit=_('chunks'))
10724 cb0a7faa29ea progress: drop extra args for pos=None calls (issue2087) Matt Mackall <mpm@selenic.com> parents: 10699 diff changeset	1412 self.ui.progress(_('bundling changes'), None)
10433 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10431 diff changeset	1413
11659 deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1414 prune(mnfst, msng_mnfst_set)
5905 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1415 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	1416 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	1417 # Sort the manifestnodes by revision number.
9038 93fe89afc611 localrepo: removed unnecessary revkey sort helper Martin Geisler <mg@lazybytes.net> parents: 9032 diff changeset	1418 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	1419 # 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	1420 # 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	1421 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	1422 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	1423 filenode_collector(changedfiles))
11665 1f7f8bc45240 changegroup(): use enumerate when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11664 diff changeset	1424 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	1425 yield chnk
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1426 self.ui.progress(_('bundling manifests'), cnt, unit=_('chunks'))
10724 cb0a7faa29ea progress: drop extra args for pos=None calls (issue2087) Matt Mackall <mpm@selenic.com> parents: 10699 diff changeset	1427 self.ui.progress(_('bundling manifests'), None)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1428
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1429 # 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	1430 # them.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1431 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	1432 msng_mnfst_set.clear()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1433
5905 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1434 if extranodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1435 for fname in extranodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1436 if isinstance(fname, int):
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5904 diff changeset	1437 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	1438 msng_filenode_set.setdefault(fname, {})
11648 801533a52799 changegroup(): use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11644 diff changeset	1439 changedfiles.add(fname)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1440 # Go through all our files in order sorted by name.
10433 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10431 diff changeset	1441 cnt = 0
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	1442 for fname in sorted(changedfiles):
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1443 filerevlog = self.file(fname)
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	1444 if not len(filerevlog):
5670 9d6ad26fab10 fix spelling error Matt Mackall <mpm@selenic.com> parents: 5661 diff changeset	1445 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	1446 # 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	1447 # missing.
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1448 missingfnodes = msng_filenode_set.pop(fname, {})
11659 deecf1953e7b changegroupsubset(): refactor the prune() functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11654 diff changeset	1449 prune(filerevlog, missingfnodes)
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1450 add_extra_nodes(fname, missingfnodes)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1451 # 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	1452 # otherwise don't bother.
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1453 if missingfnodes:
5370 61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5319 diff changeset	1454 yield changegroup.chunkheader(len(fname))
61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5319 diff changeset	1455 yield fname
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1456 # 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	1457 nodeiter = list(missingfnodes)
898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1458 nodeiter.sort(key=filerevlog.rev)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1459 # 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	1460 # 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	1461 # from filenodes.
11654 898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1462 group = filerevlog.group(nodeiter,
898a5305f342 changegroupsubset(): change variable names, simplify lookup logic Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11653 diff changeset	1463 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	1464 for chnk in group:
10433 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10431 diff changeset	1465 self.ui.progress(
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1466 _('bundling files'), cnt, item=fname, unit=_('chunks'))
10433 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10431 diff changeset	1467 cnt += 1
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1468 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1469 # 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	1470 yield changegroup.closechunk()
10724 cb0a7faa29ea progress: drop extra args for pos=None calls (issue2087) Matt Mackall <mpm@selenic.com> parents: 10699 diff changeset	1471 self.ui.progress(_('bundling files'), None)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1472
2150 f15c6394d90d fix a NameError in changegroupsubset Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2149 diff changeset	1473 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	1474 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	1475
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1476 return util.chunkbuffer(gengroup())
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1477
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1478 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	1479 # 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	1480 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	1481
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1482 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	1483 """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	1484 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	1485 successive changegroup chunks.
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1486
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1487 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	1488 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	1489
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1490 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	1491
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1492 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1493
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1494 cl = self.changelog
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1495 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	1496 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	1497
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1498 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1499 return x
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1500
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	1501 def gennodelst(log):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	1502 for r in log:
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7237 diff changeset	1503 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	1504 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	1505
11653 eefa362d0b45 changegroup(): used "linkrev" instead of "revlink" Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11652 diff changeset	1506 def lookuplinkrev_func(revlog):
eefa362d0b45 changegroup(): used "linkrev" instead of "revlink" Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11652 diff changeset	1507 def lookuplinkrev(n):
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7237 diff changeset	1508 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	1509 return lookuplinkrev
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1510
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1511 def gengroup():
9437 1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1512 '''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	1513 # 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	1514 changedfiles = set()
10356 bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1515 mmfs = {}
bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1516 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	1517
11665 1f7f8bc45240 changegroup(): use enumerate when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11664 diff changeset	1518 for cnt, chnk in enumerate(cl.group(nodes, identity, collect)):
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1519 self.ui.progress(_('bundling changes'), cnt, unit=_('chunks'))
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1520 yield chnk
10724 cb0a7faa29ea progress: drop extra args for pos=None calls (issue2087) Matt Mackall <mpm@selenic.com> parents: 10699 diff changeset	1521 self.ui.progress(_('bundling changes'), None)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1522
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1523 mnfst = self.manifest
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1524 nodeiter = gennodelst(mnfst)
11665 1f7f8bc45240 changegroup(): use enumerate when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 11664 diff changeset	1525 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	1526 lookuplinkrev_func(mnfst))):
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1527 self.ui.progress(_('bundling manifests'), cnt, unit=_('chunks'))
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1528 yield chnk
10724 cb0a7faa29ea progress: drop extra args for pos=None calls (issue2087) Matt Mackall <mpm@selenic.com> parents: 10699 diff changeset	1529 self.ui.progress(_('bundling manifests'), None)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1530
10433 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10431 diff changeset	1531 cnt = 0
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	1532 for fname in sorted(changedfiles):
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1533 filerevlog = self.file(fname)
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	1534 if not len(filerevlog):
5670 9d6ad26fab10 fix spelling error Matt Mackall <mpm@selenic.com> parents: 5661 diff changeset	1535 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	1536 nodeiter = gennodelst(filerevlog)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1537 nodeiter = list(nodeiter)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1538 if nodeiter:
5370 61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5319 diff changeset	1539 yield changegroup.chunkheader(len(fname))
61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5319 diff changeset	1540 yield fname
11653 eefa362d0b45 changegroup(): used "linkrev" instead of "revlink" Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11652 diff changeset	1541 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	1542 for chnk in filerevlog.group(nodeiter, lookup):
10433 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10431 diff changeset	1543 self.ui.progress(
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1544 _('bundling files'), cnt, item=fname, unit=_('chunks'))
10433 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10431 diff changeset	1545 cnt += 1
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1546 yield chnk
10724 cb0a7faa29ea progress: drop extra args for pos=None calls (issue2087) Matt Mackall <mpm@selenic.com> parents: 10699 diff changeset	1547 self.ui.progress(_('bundling files'), None)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1548
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1967 diff changeset	1549 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	1550
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1551 if nodes:
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1552 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	1553
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1554 return util.chunkbuffer(gengroup())
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1555
11442 ee1ed6afac21 addchangegroup: pass in lock to release it before changegroup hook is called Matt Mackall <mpm@selenic.com> parents: 11368 diff changeset	1556 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	1557 """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	1558 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	1559 the URL of the repo where this changegroup is coming from.
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1560
11153 9936ed1d04f4 push: document return values between various repo methods. Greg Ward <greg-hg@gerg.ca> parents: 11112 diff changeset	1561 Return an integer summarizing the change to this repo:
3797 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1562 - 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: 3795 diff changeset	1563 - 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	1564 - fewer heads than before: -1-removed heads (-2..-n)
3797 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1565 - 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: 3795 diff changeset	1566 """
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1567 def csmap(x):
9466 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1568 self.ui.debug("add changeset %s\n" % short(x))
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	1569 return len(cl)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1570
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1571 def revmap(x):
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1572 return cl.rev(x)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1573
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1574 if not source:
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1575 return 0
1730 0f1d2c75db5e add prechangegroup and pretxnchangegroup hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1721 diff changeset	1576
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1577 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	1578
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1579 changesets = files = revisions = 0
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1580 efiles = set()
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	1581
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1582 # 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	1583 # inconsistent view
4270 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4267 diff changeset	1584 cl = self.changelog
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4267 diff changeset	1585 cl.delayupdate()
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4267 diff changeset	1586 oldheads = len(cl.heads())
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1587
10892 e39e94377eb2 transaction: use newlines to separate description elements Matt Mackall <mpm@selenic.com> parents: 10888 diff changeset	1588 tr = self.transaction("\n".join([srctype, urlmod.hidepassword(url)]))
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1589 try:
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	1590 trp = weakref.proxy(tr)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1591 # pull off the changeset group
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1592 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	1593 clstart = len(cl)
10431 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1594 class prog(object):
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	1595 step = _('changesets')
10431 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1596 count = 1
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1597 ui = self.ui
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1598 total = None
10431 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1599 def __call__(self):
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1600 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	1601 total=self.total)
10431 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1602 self.count += 1
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1603 pr = prog()
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1604 chunkiter = changegroup.chunkiter(source, progress=pr)
6646 602f7c1ab954 drop superfluous param from revlog.addgroup() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6632 diff changeset	1605 if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1606 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	1607 clend = len(cl)
59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	1608 changesets = clend - clstart
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1609 for c in xrange(clstart, clend):
5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1610 efiles.update(self[c].files())
5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1611 efiles = len(efiles)
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	1612 self.ui.progress(_('changesets'), None)
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1613
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1614 # pull off the manifest group
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1615 self.ui.status(_("adding manifests\n"))
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	1616 pr.step = _('manifests')
10431 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1617 pr.count = 1
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1618 pr.total = changesets # manifests <= changesets
10431 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1619 chunkiter = changegroup.chunkiter(source, progress=pr)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1620 # 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: 4958 diff changeset	1621 # 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: 4958 diff changeset	1622 # 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: 4958 diff changeset	1623 # be empty during the pull
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	1624 self.manifest.addgroup(chunkiter, revmap, trp)
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	1625 self.ui.progress(_('manifests'), None)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1626
10418 5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1627 needfiles = {}
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1628 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	1629 # 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	1630 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	1631 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	1632 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	1633 # 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	1634 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	1635 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	1636
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1637 # process the files
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1638 self.ui.status(_("adding file changes\n"))
10431 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1639 pr.step = 'files'
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	1640 pr.count = 1
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1641 pr.total = efiles
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1642 while 1:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1643 f = changegroup.getchunk(source)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1644 if not f:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1645 break
9466 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1646 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	1647 pr()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1648 fl = self.file(f)
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	1649 o = len(fl)
10888 5e18023820a9 progress: show approximate progress info for pull Matt Mackall <mpm@selenic.com> parents: 10886 diff changeset	1650 chunkiter = changegroup.chunkiter(source)
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	1651 if fl.addgroup(chunkiter, revmap, trp) is None:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1652 raise util.Abort(_("received file revlog group is empty"))
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	1653 revisions += len(fl) - o
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1654 files += 1
10418 5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1655 if f in needfiles:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1656 needs = needfiles[f]
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1657 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	1658 n = fl.node(new)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1659 if n in needs:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1660 needs.remove(n)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1661 if not needs:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1662 del needfiles[f]
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	1663 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	1664
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1665 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	1666 fl = self.file(f)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1667 for n in needs:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1668 try:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1669 fl.rev(n)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1670 except error.LookupError:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1671 raise util.Abort(
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	1672 _('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	1673 (f, hex(n)))
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1674
8392 7e5cbb09515b localrepo: use cl throughout in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8390 diff changeset	1675 newheads = len(cl.heads())
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1676 heads = ""
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1677 if oldheads and newheads != oldheads:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1678 heads = _(" (%+d heads)") % (newheads - oldheads)
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1679
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1680 self.ui.status(_("added %d changesets"
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1681 " with %d changes to %d files%s\n")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1682 % (changesets, revisions, files, heads))
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1683
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1684 if changesets > 0:
8392 7e5cbb09515b localrepo: use cl throughout in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8390 diff changeset	1685 p = lambda: cl.writepending() and self.root or ""
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1686 self.hook('pretxnchangegroup', throw=True,
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	1687 node=hex(cl.node(clstart)), source=srctype,
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7732 diff changeset	1688 url=url, pending=p)
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7732 diff changeset	1689
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7732 diff changeset	1690 # make changelog see real files again
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7732 diff changeset	1691 cl.finalize(trp)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1692
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1693 tr.close()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1694 finally:
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 11228 diff changeset	1695 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	1696 if lock:
ee1ed6afac21 addchangegroup: pass in lock to release it before changegroup hook is called Matt Mackall <mpm@selenic.com> parents: 11368 diff changeset	1697 lock.release()
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1698
1375 f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	1699 if changesets > 0:
6000 ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5997 diff changeset	1700 # forcefully update the on-disk branch cache
9466 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1701 self.ui.debug("updating the branch cache\n")
6000 ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5997 diff changeset	1702 self.branchtags()
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	1703 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	1704 source=srctype, url=url)
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1705
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	1706 for i in xrange(clstart, clend):
8392 7e5cbb09515b localrepo: use cl throughout in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8390 diff changeset	1707 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	1708 source=srctype, url=url)
1316 b650bfdfc7ee Hook fixups mpm@selenic.com parents: 1280 diff changeset	1709
3797 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1710 # never return 0 here:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1711 if newheads < oldheads:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1712 return newheads - oldheads - 1
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1713 else:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1714 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	1715
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1716
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1717 def stream_in(self, remote):
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1718 fp = remote.stream_out()
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1719 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1720 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1721 resp = int(l)
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1722 except ValueError:
7641 d2f753830f80 error: move UnexpectedOutput (now ResponseError) Matt Mackall <mpm@selenic.com> parents: 7640 diff changeset	1723 raise error.ResponseError(
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1724 _('Unexpected response from remote server:'), l)
3687 d5dd0a2a44bc Handle locking exceptions if streaming clone can't lock the repo. (Issue324) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	1725 if resp == 1:
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1726 raise util.Abort(_('operation forbidden by server'))
3687 d5dd0a2a44bc Handle locking exceptions if streaming clone can't lock the repo. (Issue324) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	1727 elif resp == 2:
d5dd0a2a44bc Handle locking exceptions if streaming clone can't lock the repo. (Issue324) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	1728 raise util.Abort(_('locking the remote repository failed'))
d5dd0a2a44bc Handle locking exceptions if streaming clone can't lock the repo. (Issue324) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	1729 elif resp != 0:
d5dd0a2a44bc Handle locking exceptions if streaming clone can't lock the repo. (Issue324) Thomas Arendsen Hein <thomas@intevation.de> parents: 3684 diff changeset	1730 raise util.Abort(_('the server sent an unknown error code'))
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1731 self.ui.status(_('streaming all changes\n'))
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1732 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1733 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1734 total_files, total_bytes = map(int, l.split(' ', 1))
6407 12377957948d fix error spotted by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6385 diff changeset	1735 except (ValueError, TypeError):
7641 d2f753830f80 error: move UnexpectedOutput (now ResponseError) Matt Mackall <mpm@selenic.com> parents: 7640 diff changeset	1736 raise error.ResponseError(
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1737 _('Unexpected response from remote server:'), l)
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1738 self.ui.status(_('%d files to transfer, %s of data\n') %
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1739 (total_files, util.bytecount(total_bytes)))
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1740 start = time.time()
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1741 for i in xrange(total_files):
3720 5cc99f4b5041 add a comment about '\n' and '\r' and streaming clone Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3713 diff changeset	1742 # XXX doesn't support '\n' or '\r' in filenames
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1743 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1744 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1745 name, size = l.split('\0', 1)
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1746 size = int(size)
7063 be2daa324ddf Add missing catch of a TypeError Bernhard Leiner <bleiner@gmail.com> parents: 6877 diff changeset	1747 except (ValueError, TypeError):
7641 d2f753830f80 error: move UnexpectedOutput (now ResponseError) Matt Mackall <mpm@selenic.com> parents: 7640 diff changeset	1748 raise error.ResponseError(
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1749 _('Unexpected response from remote server:'), l)
9466 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1750 self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size)))
8531 810387f59696 filelog encoding: move the encoding/decoding into store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1751 # for backwards compat, name was partially encoded
810387f59696 filelog encoding: move the encoding/decoding into store Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1752 ofp = self.sopener(store.decodedir(name), 'w')
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1753 for chunk in util.filechunkiter(fp, limit=size):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1754 ofp.write(chunk)
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1755 ofp.close()
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1756 elapsed = time.time() - start
4128 43d8f7466920 localrepo: stream_in may raise ZeroDivisionError with nul float elapsed argument. Patrick Mezard <pmezard@gmail.com> parents: 4058 diff changeset	1757 if elapsed <= 0:
43d8f7466920 localrepo: stream_in may raise ZeroDivisionError with nul float elapsed argument. Patrick Mezard <pmezard@gmail.com> parents: 4058 diff changeset	1758 elapsed = 0.001
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1759 self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') %
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1760 (util.bytecount(total_bytes), elapsed,
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1761 util.bytecount(total_bytes / elapsed)))
4614 3a645af7fb76 localrepo and dirstate: rename reload to invalidate Matt Mackall <mpm@selenic.com> parents: 4582 diff changeset	1762 self.invalidate()
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1763 return len(self.heads()) + 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1764
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	1765 def clone(self, remote, heads=[], stream=False):
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1766 '''clone remote repository.
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1767
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1768 keyword arguments:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1769 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	1770 stream: use streaming clone if possible'''
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1771
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1772 # 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	1773 # 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	1774 # them.
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1775
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1776 # 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	1777 # 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	1778 # uncompressed only if compatible.
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1779
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	1780 if stream and not heads and remote.capable('stream'):
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1781 return self.stream_in(remote)
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1782 return self.pull(remote, heads)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1783
11368 b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	1784 def pushkey(self, namespace, key, old, new):
b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	1785 return pushkey.push(self, namespace, key, old, new)
b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	1786
b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	1787 def listkeys(self, namespace):
b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	1788 return pushkey.list(self, namespace)
b9eb005c54ad pushkey: add localrepo support Matt Mackall <mpm@selenic.com> parents: 11303 diff changeset	1789
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1790 # 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: 3774 diff changeset	1791 def aftertrans(files):
f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	1792 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	1793 def a():
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	1794 for src, dest in renamefiles:
f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	1795 util.rename(src, dest)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1796 return a
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1797
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	1798 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	1799 return localrepository(ui, util.drop_scheme('file', path), create)
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3197 diff changeset	1800
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	1801 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	1802 return True

Mercurial > hg > mercurial-source

annotate mercurial/localrepo.py @ 11681:eb07fbc21e9c