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

annotate mercurial/localrepo.py @ 11154:17031fea4e95 stable

expand paths to local repository or bundle in appropriate classes This avoids problem with unexpanded paths when it's not possible to expand it at higher level (for example, if file:~/path/ is supplied as path in schemes).

author	Alexander Solovyov <piranha@piranha.org.ua>
date	Mon, 07 Dec 2009 12:31:45 +0200
parents	a101a743c570
children	b203a95fe68b 054549ccb680

rev	line source
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	1 # localrepo.py - read/write repository class for mercurial
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9954 diff changeset	6 # GNU General Public License version 2 or any later version.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 6210 diff changeset	8 from node import bin, hex, nullid, nullrev, short
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	10 import repo, changegroup, subrepo
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
6603 41eb20cc1c02 match: remove files arg from repo.status and friends Matt Mackall <mpm@selenic.com> parents: 6587 diff changeset	14 import match as match_
6888 7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6884 diff changeset	15 import merge as merge_
9149 abb7d4d43a5f Factor tags module out of localrepo (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9148 diff changeset	16 import tags as tags_
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	17 from lock import release
8731 f037187a6f68 cleanup: removed unused imports Henri Wiechers <hwiechers@gmail.com> parents: 8715 diff changeset	18 import weakref, stat, errno, os, time, inspect
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	19 propertycache = util.propertycache
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	20
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	21 class localrepository(repo.repository):
8562 e3495c399006 named branches: server branchmap wire protocol support (issue736) Henrik Stuart <henrik.stuart@edlund.dk> parents: 8531 diff changeset	22 capabilities = set(('lookup', 'changegroupsubset', 'branchmap'))
8799 87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	23 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	24
8189 d2899a856f9f ui: replace parentui mechanism with repo.baseui Matt Mackall <mpm@selenic.com> parents: 8156 diff changeset	25 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	26 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	27 self.root = os.path.realpath(util.expandpath(path))
4170 7b5723c95a82 Save an absolute path in repo.path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4168 diff changeset	28 self.path = os.path.join(self.root, ".hg")
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	29 self.origroot = path
a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	30 self.opener = util.opener(self.path)
a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	31 self.wopener = util.opener(self.root)
8797 9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	32 self.baseui = baseui
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	33 self.ui = baseui.copy()
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	34
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	35 try:
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	36 self.ui.readconfig(self.join("hgrc"), self.root)
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	37 extensions.loadall(self.ui)
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	38 except IOError:
9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	39 pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	40
3035 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	41 if not os.path.isdir(self.path):
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	42 if create:
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	43 if not os.path.exists(path):
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	44 os.mkdir(path)
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	45 os.mkdir(self.path)
4166 c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	46 requirements = ["revlogv1"]
8797 9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	47 if self.ui.configbool('format', 'usestore', True):
4163 fe41d9a186ab Allow disabling store format to work with absurdly long filenames Matt Mackall <mpm@selenic.com> parents: 4161 diff changeset	48 os.mkdir(os.path.join(self.path, "store"))
4166 c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	49 requirements.append("store")
8797 9ed150d2fbd5 repo: set up ui and extensions earlier Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	50 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	51 requirements.append("fncache")
4166 c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	52 # create an invalid changelog
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	53 self.opener("00changelog.i", "a").write(
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	54 '\0\0\0\2' # represents revlogv2
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	55 ' dummy changelog to prevent using the old repo layout'
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4163 diff changeset	56 )
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	57 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	58 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	59 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	60 reqfile.close()
3035 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	61 else:
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	62 raise error.RepoError(_("repository %s not found") % path)
3035 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	63 elif create:
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	64 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	65 else:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	66 # find requirements
8262 3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	67 requirements = set()
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	68 try:
8262 3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	69 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	70 except IOError, inst:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	71 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	72 raise
8262 3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	73 for r in requirements - self.supported:
3d7b1d97230d localrepo: use set for requirements Matt Mackall <mpm@selenic.com> parents: 8260 diff changeset	74 raise error.RepoError(_("requirement '%s' not supported") % r)
405 99470ae6b424 Check if repository exists mpm@selenic.com parents: 402 diff changeset	75
8799 87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	76 self.sharedpath = self.path
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	77 try:
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	78 s = os.path.realpath(self.opener("sharedpath").read())
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	79 if not os.path.exists(s):
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	80 raise error.RepoError(
8908 105343f9f744 Fix warning: Seen unexpected token "%" Dongsheng Song <dongsheng.song@gmail.com> parents: 8813 diff changeset	81 _('.hg/sharedpath points to nonexistent directory %s') % s)
8799 87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	82 self.sharedpath = s
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	83 except IOError, inst:
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	84 if inst.errno != errno.ENOENT:
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	85 raise
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	86
87d1fd40f57e repo: add internal support for sharing store directories Matt Mackall <mpm@selenic.com> parents: 8797 diff changeset	87 self.store = store.store(requirements, self.sharedpath, util.opener)
6840 80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	88 self.spath = self.store.path
80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	89 self.sopener = self.store.opener
80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	90 self.sjoin = self.store.join
80e51429cb9a introduce store classes Adrian Buehlmann <adrian@cadifra.com> parents: 6839 diff changeset	91 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: 10320 diff changeset	92 self.sopener.options = {}
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3803 diff changeset	93
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	94 # These two define the set of tags for this repository. _tags
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	95 # maps tag name to node; _tagtypes maps tag name to 'global' or
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	96 # 'local'. (Global tags are defined by .hgtags across all
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	97 # heads, and local tags are defined in .hg/localtags.) They
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	98 # constitute the in-memory cache of tags.
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	99 self._tags = None
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	100 self._tagtypes = None
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	101
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	102 self._branchcache = None # in UTF-8
6121 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	103 self._branchcachetip = None
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	104 self.nodetagscache = None
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	105 self.filterpats = {}
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	106 self._datafilters = {}
4916 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	107 self._transref = self._lockref = self._wlockref = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	108
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	109 @propertycache
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	110 def changelog(self):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	111 c = changelog.changelog(self.sopener)
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	112 if 'HG_PENDING' in os.environ:
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	113 p = os.environ['HG_PENDING']
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	114 if p.startswith(self.root):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	115 c.readpending('00changelog.i.a')
10322 d9a2bc2f776b add options dict to localrepo.store.opener and use it for defversion Vsevolod Solovyov <vsevolod.solovyov@gmail.com> parents: 10320 diff changeset	116 self.sopener.options['defversion'] = c.version
8260 54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	117 return c
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	118
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	119 @propertycache
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	120 def manifest(self):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	121 return manifest.manifest(self.sopener)
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	122
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	123 @propertycache
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	124 def dirstate(self):
54a4b520bd7d localrepo: use propertycache Matt Mackall <mpm@selenic.com> parents: 8244 diff changeset	125 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	126
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	127 def __getitem__(self, changeid):
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8515 diff changeset	128 if changeid is None:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	129 return context.workingctx(self)
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	130 return context.changectx(self, changeid)
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	131
9924 ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	132 def __contains__(self, changeid):
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	133 try:
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	134 return bool(self.lookup(changeid))
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	135 except error.RepoLookupError:
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	136 return False
ea3acaae25bb localrepo: support 'rev in repo' syntax Alexander Solovyov <piranha@piranha.org.ua> parents: 9820 diff changeset	137
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	138 def __nonzero__(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	139 return True
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	140
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	141 def __len__(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	142 return len(self.changelog)
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	143
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	144 def __iter__(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	145 for i in xrange(len(self)):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	146 yield i
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	147
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	148 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	149 return 'file:' + self.root
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	150
1718 c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	151 def hook(self, name, throw=False, **args):
4622 fff50306e6dd hooks: separate hook code into a separate module Matt Mackall <mpm@selenic.com> parents: 4619 diff changeset	152 return hook.hook(self.ui, self, name, throw, **args)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	153
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	154 tag_disallowed = ':\r\n'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	155
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	156 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	157 if isinstance(names, str):
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	158 allchars = names
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	159 names = (names,)
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	160 else:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	161 allchars = ''.join(names)
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	162 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	163 if c in allchars:
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	164 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	165
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	166 for name in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	167 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	168 local=local)
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	169
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	170 def writetags(fp, names, munge, prevtags):
5985 850494d62674 localrepo._tag: add a seek before writing the new tag Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5882 diff changeset	171 fp.seek(0, 2)
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	172 if prevtags and prevtags[-1] != '\n':
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	173 fp.write('\n')
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	174 for name in names:
6671 938eddd76237 tag: record tag we're superseding, if any (issue 1102) Matt Mackall <mpm@selenic.com> parents: 6647 diff changeset	175 m = munge and munge(name) or name
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	176 if self._tagtypes and name in self._tagtypes:
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	177 old = self._tags.get(name, nullid)
6671 938eddd76237 tag: record tag we're superseding, if any (issue 1102) Matt Mackall <mpm@selenic.com> parents: 6647 diff changeset	178 fp.write('%s %s\n' % (hex(old), m))
938eddd76237 tag: record tag we're superseding, if any (issue 1102) Matt Mackall <mpm@selenic.com> parents: 6647 diff changeset	179 fp.write('%s %s\n' % (hex(node), m))
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	180 fp.close()
5081 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4932 diff changeset	181
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	182 prevtags = ''
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	183 if local:
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	184 try:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	185 fp = self.opener('localtags', 'r+')
7875 553aa0cbeab6 cleanup: drop unused assignments Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7848 diff changeset	186 except IOError:
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	187 fp = self.opener('localtags', 'a')
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	188 else:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	189 prevtags = fp.read()
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	190
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	191 # 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	192 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	193 for name in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	194 self.hook('tag', node=hex(node), tag=name, local=local)
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	195 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	196
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	197 try:
0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	198 fp = self.wfile('.hgtags', 'rb+')
0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	199 except IOError:
0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	200 fp = self.wfile('.hgtags', 'ab')
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	201 else:
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	202 prevtags = fp.read()
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	203
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	204 # 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	205 writetags(fp, names, encoding.fromlocal, prevtags)
4932 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4929 diff changeset	206
8402 0ad521500424 tag: drop unused use_dirstate and parent from _tag() Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	207 if '.hgtags' not in self.dirstate:
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	208 self.add(['.hgtags'])
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
8705 509083f54e52 tag: use match.exact for commit Matt Mackall <mpm@selenic.com> parents: 8699 diff changeset	210 m = match_.exact(self.root, '', ['.hgtags'])
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	211 tagnode = self.commit(message, user, date, extra=extra, match=m)
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	212
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	213 for name in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	214 self.hook('tag', node=hex(node), tag=name, local=local)
4118 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	215
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	216 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	217
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	218 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	219 '''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	220
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	221 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	222 string.
6334 7016f7fb8fe3 tab/space cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 6321 diff changeset	223
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	224 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	225 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	226 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	227
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	228 keyword arguments:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	229
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6312 diff changeset	230 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	231 (default False)
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 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	234
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	235 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	236
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	237 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	238
2875 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	239 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	240 if '.hgtags' in x:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	241 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	242 '(please commit .hgtags manually)'))
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	243
7814 4421abf8c85d tag: force load of tag cache Matt Mackall <mpm@selenic.com> parents: 7803 diff changeset	244 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	245 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	246
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	247 def tags(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	248 '''return a mapping of tag to node'''
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	249 if self._tags is None:
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	250 (self._tags, self._tagtypes) = self._findtags()
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	251
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	252 return self._tags
4210 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4178 diff changeset	253
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	254 def _findtags(self):
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	255 '''Do the hard work of finding tags. Return a pair of dicts
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	256 (tags, tagtypes) where tags maps tag name to node, and tagtypes
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	257 maps tag name to a string like \'global\' or \'local\'.
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	258 Subclasses or extensions are free to add their own tags, but
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	259 should be aware that the returned dicts will be retained for the
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	260 duration of the localrepo object.'''
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	261
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	262 # XXX what tagtype should subclasses/extensions use? Currently
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	263 # mq and bookmarks add tags, but do not set the tagtype at all.
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	264 # Should each extension invent its own tag type? Should there
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	265 # be one tagtype for all such "virtual" tags? Or is the status
6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	266 # quo fine?
4210 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4178 diff changeset	267
9148 b7837f0ed9fe localrepo: factor updatetags() out of readtags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9147 diff changeset	268 alltags = {} # map tag name to (node, hist)
5657 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	269 tagtypes = {}
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	270
9149 abb7d4d43a5f Factor tags module out of localrepo (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9148 diff changeset	271 tags_.findglobaltags(self.ui, self, alltags, tagtypes)
abb7d4d43a5f Factor tags module out of localrepo (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9148 diff changeset	272 tags_.readlocaltags(self.ui, self, alltags, tagtypes)
5657 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	273
9152 4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	274 # Build the return dicts. Have to re-encode tag names because
4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	275 # the tags module always uses UTF-8 (in order not to lose info
4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	276 # writing to the cache), but the rest of Mercurial wants them in
4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	277 # local encoding.
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	278 tags = {}
9147 234a230cc33b localrepo: improve readability of _findtags(), readtags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9146 diff changeset	279 for (name, (node, hist)) in alltags.iteritems():
234a230cc33b localrepo: improve readability of _findtags(), readtags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9146 diff changeset	280 if node != nullid:
9152 4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	281 tags[encoding.tolocal(name)] = node
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	282 tags['tip'] = self.changelog.tip()
9152 4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	283 tagtypes = dict([(encoding.tolocal(name), value)
4017291c4c48 tags: support 'instant' tag retrieval (issue548) Greg Ward <greg-hg@gerg.ca> parents: 9151 diff changeset	284 for (name, value) in tagtypes.iteritems()])
9145 6b03f93b8ff3 localrepo: factor _findtags() out of tags() (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9134 diff changeset	285 return (tags, tagtypes)
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	286
5657 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	287 def tagtype(self, tagname):
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	288 '''
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	289 return the type of the given tag. result can be:
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	290
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	291 'local' : a local tag
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	292 'global' : a global tag
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	293 None : tag does not exist
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	294 '''
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	295
47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	296 self.tags()
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5757 diff changeset	297
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	298 return self._tagtypes.get(tagname)
5657 47915bf68c44 Properly check tag's existence as a local/global tag when removing it. Osku Salerma <osku@iki.fi> parents: 5637 diff changeset	299
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	300 def tagslist(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	301 '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	302 l = []
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7599 diff changeset	303 for t, n in self.tags().iteritems():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	304 try:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	305 r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	306 except:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	307 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	308 l.append((r, t, n))
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	309 return [(t, n) for r, t, n in sorted(l)]
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	310
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	311 def nodetags(self, node):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	312 '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	313 if not self.nodetagscache:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	314 self.nodetagscache = {}
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7599 diff changeset	315 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	316 self.nodetagscache.setdefault(n, []).append(t)
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	317 return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	318
6120 f89878df40fe move the reading of branch.cache from _branchtags to branchtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6119 diff changeset	319 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	320 # TODO: rename this function?
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	321 tiprev = len(self) - 1
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	322 if lrev != tiprev:
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10725 diff changeset	323 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	324 self._updatebranchcache(partial, ctxgen)
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	325 self._writebranchcache(partial, self.changelog.tip(), tiprev)
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	326
3826 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3803 diff changeset	327 return partial
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3803 diff changeset	328
9671 9471d9a900b4 transfer branchmap branch names over the wire in utf-8 Henrik Stuart <henrik.stuart@edlund.dk> parents: 9569 diff changeset	329 def branchmap(self):
10327 32197f7eceb3 localrepo: add a quick docstring for localrepo.branchmap() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10322 diff changeset	330 '''returns a dictionary {branch: [branchheads]}'''
9671 9471d9a900b4 transfer branchmap branch names over the wire in utf-8 Henrik Stuart <henrik.stuart@edlund.dk> parents: 9569 diff changeset	331 tip = self.changelog.tip()
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	332 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	333 return self._branchcache
9671 9471d9a900b4 transfer branchmap branch names over the wire in utf-8 Henrik Stuart <henrik.stuart@edlund.dk> parents: 9569 diff changeset	334
6121 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	335 oldtip = self._branchcachetip
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	336 self._branchcachetip = tip
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	337 if oldtip is None or oldtip not in self.changelog.nodemap:
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	338 partial, last, lrev = self._readbranchcache()
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	339 else:
7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	340 lrev = self.changelog.rev(oldtip)
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	341 partial = self._branchcache
6121 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	342
6120 f89878df40fe move the reading of branch.cache from _branchtags to branchtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6119 diff changeset	343 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	344 # 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	345 self._branchcache = partial
3826 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3803 diff changeset	346
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	347 return self._branchcache
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	348
816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	349 def branchtags(self):
816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	350 '''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	351 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	352 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	353 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	354 tip = heads[-1]
9be6c5900c07 localrepo: cleanup branch tip computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	355 for h in reversed(heads):
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	356 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	357 tip = h
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	358 break
10392 9be6c5900c07 localrepo: cleanup branch tip computation Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10371 diff changeset	359 bt[bn] = tip
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	360 return bt
6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	361
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	362
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	363 def _readbranchcache(self):
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	364 partial = {}
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	365 try:
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	366 f = self.opener("branchheads.cache")
3668 6f6696962986 don't use readline() to read branches.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3664 diff changeset	367 lines = f.read().split('\n')
6f6696962986 don't use readline() to read branches.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3664 diff changeset	368 f.close()
4415 1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	369 except (IOError, OSError):
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	370 return {}, nullid, nullrev
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	371
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	372 try:
4167 4574a8cb080f Store empty (default) branch in branch cache, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 4128 diff changeset	373 last, lrev = lines.pop(0).split(" ", 1)
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	374 last, lrev = bin(last), int(lrev)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	375 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	376 # invalidate the cache
6056 0ad2ffbf6b38 Print less scary warning when invalidating the branch cache. Thomas Arendsen Hein <thomas@intevation.de> parents: 6001 diff changeset	377 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	378 for l in lines:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	379 if not l:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	380 continue
4167 4574a8cb080f Store empty (default) branch in branch cache, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 4128 diff changeset	381 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	382 partial.setdefault(label.strip(), []).append(bin(node))
7644 182b7114d35a error: move SignalInterrupt Matt Mackall <mpm@selenic.com> parents: 7641 diff changeset	383 except KeyboardInterrupt:
3761 9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	384 raise
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	385 except Exception, inst:
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	386 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	387 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	388 partial, last, lrev = {}, nullid, nullrev
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	389 return partial, last, lrev
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	390
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	391 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	392 try:
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	393 f = self.opener("branchheads.cache", "w", atomictemp=True)
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	394 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	395 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	396 for node in nodes:
816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	397 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: 4266 diff changeset	398 f.rename()
4415 1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	399 except (IOError, OSError):
3452 fcf14d87e0a4 If we can't write the branch cache, fail quietly. Matt Mackall <mpm@selenic.com> parents: 3450 diff changeset	400 pass
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	401
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10725 diff changeset	402 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	403 # 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	404 newbranches = {}
10770 fe39f0160c74 localrepo: change _updatebranchcache to use a context generator Sune Foldager <cryo@cyanite.org> parents: 10725 diff changeset	405 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	406 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	407 # 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	408 # 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	409 # 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	410 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	411 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	412 bheads.extend(newnodes)
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	413 if len(bheads) < 2:
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	414 continue
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	415 newbheads = []
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	416 # 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	417 while newnodes:
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	418 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	419 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	420 continue
9120 d3b995dd4eab branch heads: optimise computation of branch head cache (issue1734) Henrik Stuart <hg@hstuart.dk> parents: 9093 diff changeset	421 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	422 reachable = self.changelog.reachable(latest, minbhrev)
8954 e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	423 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	424 newbheads.insert(0, latest)
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	425 bheads.extend(newbheads)
e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 8916 diff changeset	426 partial[branch] = bheads
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	427
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	428 def lookup(self, key):
7377 374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	429 if isinstance(key, int):
374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	430 return self.changelog.node(key)
374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	431 elif key == '.':
6736 369ddc9c0339 lookup: optimize '.' Matt Mackall <mpm@selenic.com> parents: 6732 diff changeset	432 return self.dirstate.parents()[0]
3801 bd7011246fab Add "null" pseudo-tag pointing to nullid Brendan Cully <brendan@kublai.com> parents: 3791 diff changeset	433 elif key == 'null':
bd7011246fab Add "null" pseudo-tag pointing to nullid Brendan Cully <brendan@kublai.com> parents: 3791 diff changeset	434 return nullid
7377 374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	435 elif key == 'tip':
374a6b3ac623 lookup: fast-paths for int and 'tip' Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	436 return self.changelog.tip()
3453 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	437 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	438 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	439 return n
3418 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	440 if key in self.tags():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	441 return self.tags()[key]
3418 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	442 if key in self.branchtags():
5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	443 return self.branchtags()[key]
3453 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	444 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	445 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	446 return n
8639 1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	447
1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	448 # 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	449 if key in self.dirstate.parents():
1323dddf8078 lookup: check for dirstate damage on failure Matt Mackall <mpm@selenic.com> parents: 8567 diff changeset	450 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	451 % short(key))
4916 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	452 try:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	453 if len(key) == 20:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	454 key = hex(key)
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	455 except:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	456 pass
9423 1444a42f6052 Make distinct lookup error for localrepo.lookup Matt Mackall <mpm@selenic.com> parents: 9120 diff changeset	457 raise error.RepoLookupError(_("unknown revision '%s'") % key)
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	458
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	459 def local(self):
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	460 return True
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	461
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	462 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	463 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	464
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	465 def wjoin(self, f):
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	466 return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	467
6526 cfeeac24fc1e repo: add rjoin method Bryan O'Sullivan <bos@serpentine.com> parents: 6407 diff changeset	468 def rjoin(self, f):
cfeeac24fc1e repo: add rjoin method Bryan O'Sullivan <bos@serpentine.com> parents: 6407 diff changeset	469 return os.path.join(self.root, util.pconvert(f))
6528 bd6bf5798f39 remove trailing whitespace introduced in cfeeac24fc1e Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6526 diff changeset	470
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	471 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	472 if f[0] == '/':
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	473 f = f[1:]
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4232 diff changeset	474 return filelog.filelog(self.sopener, f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	475
6739 c9fbd6ec3489 context: avoid using None for working parent Matt Mackall <mpm@selenic.com> parents: 6736 diff changeset	476 def changectx(self, changeid):
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	477 return self[changeid]
3218 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3164 diff changeset	478
3163 1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	479 def parents(self, changeid=None):
6742 2d54e7c1e69d context: clean up parents() Matt Mackall <mpm@selenic.com> parents: 6740 diff changeset	480 '''get list of changectxs for parents of changeid'''
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	481 return self[changeid].parents()
3163 1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	482
2564 55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	483 def filectx(self, path, changeid=None, fileid=None):
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	484 """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	485 fileid can be a file revision or node."""
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	486 return context.filectx(self, path, changeid, fileid)
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	487
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	488 def getcwd(self):
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	489 return self.dirstate.getcwd()
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	490
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4516 diff changeset	491 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	492 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	493
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	494 def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	495 return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	496
4275 81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	497 def _link(self, f):
81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	498 return os.path.islink(self.wjoin(f))
81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	499
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	500 def _filter(self, filter, filename, data):
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	501 if filter not in self.filterpats:
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	502 l = []
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	503 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	504 if cmd == '!':
b71a52f101dc Make it possible to disable filtering for a pattern. Mads Kiilerich <mads@kiilerich.com> parents: 7208 diff changeset	505 continue
8567 fea40a677d43 match: add some default args Matt Mackall <mpm@selenic.com> parents: 8566 diff changeset	506 mf = match_.match(self.root, '', [pat])
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	507 fn = None
6066 f3a8b5360100 Strip filter name from command before passing to filter function. Jesse Glick <jesse.glick@sun.com> parents: 6065 diff changeset	508 params = cmd
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	509 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	510 if cmd.startswith(name):
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	511 fn = filterfn
6066 f3a8b5360100 Strip filter name from command before passing to filter function. Jesse Glick <jesse.glick@sun.com> parents: 6065 diff changeset	512 params = cmd[len(name):].lstrip()
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	513 break
11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	514 if not fn:
5967 f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	515 fn = lambda s, c, **kwargs: util.filter(s, c)
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	516 # Wrap old filters not supporting keyword arguments
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	517 if not inspect.getargspec(fn)[2]:
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	518 oldfn = fn
f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	519 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	520 l.append((mf, fn, params))
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	521 self.filterpats[filter] = l
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	522
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	523 for mf, fn, cmd in self.filterpats[filter]:
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	524 if mf(filename):
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	525 self.ui.debug("filtering %s through %s\n" % (filename, cmd))
5967 f8ad3b76e923 Provide better context for custom Python encode/decode filters. Jesse Glick <jesse.glick@sun.com> parents: 5966 diff changeset	526 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	527 break
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	528
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	529 return data
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	530
5966 11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	531 def adddatafilter(self, name, filter):
11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	532 self._datafilters[name] = filter
11af38a592ae Register data filters in a localrepo instead of util Patrick Mezard <pmezard@gmail.com> parents: 5915 diff changeset	533
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	534 def wread(self, filename):
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	535 if self._link(filename):
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	536 data = os.readlink(self.wjoin(filename))
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	537 else:
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	538 data = self.wopener(filename, 'r').read()
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	539 return self._filter("encode", filename, data)
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	540
4006 67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	541 def wwrite(self, filename, data, flags):
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	542 data = self._filter("decode", filename, data)
5703 14789f30ac11 wwrite: simplify with util.set_flags Matt Mackall <mpm@selenic.com> parents: 5688 diff changeset	543 try:
14789f30ac11 wwrite: simplify with util.set_flags Matt Mackall <mpm@selenic.com> parents: 5688 diff changeset	544 os.unlink(self.wjoin(filename))
14789f30ac11 wwrite: simplify with util.set_flags Matt Mackall <mpm@selenic.com> parents: 5688 diff changeset	545 except OSError:
14789f30ac11 wwrite: simplify with util.set_flags Matt Mackall <mpm@selenic.com> parents: 5688 diff changeset	546 pass
6877 1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	547 if 'l' in flags:
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	548 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	549 else:
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	550 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	551 if 'x' in flags:
1d38f3605b20 util: set_flags shouldn't know about repo flag formats Matt Mackall <mpm@selenic.com> parents: 6875 diff changeset	552 util.set_flags(self.wjoin(filename), False, True)
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	553
4005 656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 4004 diff changeset	554 def wwritedata(self, filename, data):
656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 4004 diff changeset	555 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	556
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	557 def transaction(self):
8072 ecf7795479d5 transaction: support multiple, separate transactions Henrik Stuart <henrik.stuart@edlund.dk> parents: 7948 diff changeset	558 tr = self._transref and self._transref() or None
ecf7795479d5 transaction: support multiple, separate transactions Henrik Stuart <henrik.stuart@edlund.dk> parents: 7948 diff changeset	559 if tr and tr.running():
ecf7795479d5 transaction: support multiple, separate transactions Henrik Stuart <henrik.stuart@edlund.dk> parents: 7948 diff changeset	560 return tr.nest()
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	561
5865 e7127f669edb transactions: don't show a backtrace when journal exists Matt Mackall <mpm@selenic.com> parents: 5814 diff changeset	562 # 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	563 if os.path.exists(self.sjoin("journal")):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	564 raise error.RepoError(
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	565 _("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	566
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2354 diff changeset	567 # save dirstate for rollback
263 e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	568 try:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	569 ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	570 except IOError:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	571 ds = ""
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	572 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	573 self.opener("journal.branch", "w").write(self.dirstate.branch())
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	574
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3773 diff changeset	575 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	576 (self.join("journal.dirstate"), self.join("undo.dirstate")),
dd5a501cb97f restore branch after rollback (issue 902) Alexandre Vassalotti <mercurial-bugs@selenic.com> parents: 5812 diff changeset	577 (self.join("journal.branch"), self.join("undo.branch"))]
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	578 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	579 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	580 aftertrans(renames),
6894 29772acb5d2a localrepo: kill _createmode Matt Mackall <mpm@selenic.com> parents: 6888 diff changeset	581 self.store.createmode)
4916 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	582 self._transref = weakref.ref(tr)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	583 return tr
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	584
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	585 def recover(self):
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	586 lock = self.lock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	587 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	588 if os.path.exists(self.sjoin("journal")):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	589 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	590 transaction.rollback(self.sopener, self.sjoin("journal"),
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	591 self.ui.warn)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	592 self.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	593 return True
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	594 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	595 self.ui.warn(_("no interrupted transaction available\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	596 return False
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	597 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	598 lock.release()
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	599
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	600 def rollback(self):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	601 wlock = lock = None
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	602 try:
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	603 wlock = self.wlock()
4438 3900f684a150 Fix hg import --exact bug that hangs hg on failure. Eric Hopper <hopper@omnifarious.org> parents: 4417 diff changeset	604 lock = self.lock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	605 if os.path.exists(self.sjoin("undo")):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	606 self.ui.status(_("rolling back last transaction\n"))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	607 transaction.rollback(self.sopener, self.sjoin("undo"),
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	608 self.ui.warn)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	609 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	610 try:
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn. Thomas Arendsen Hein <thomas@intevation.de> parents: 6056 diff changeset	611 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	612 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	613 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	614 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	615 "current branch still is: %s\n")
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7930 diff changeset	616 % encoding.tolocal(self.dirstate.branch()))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	617 self.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	618 self.dirstate.invalidate()
9150 09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	619 self.destroyed()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	620 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	621 self.ui.warn(_("no rollback information available\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	622 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	623 release(lock, wlock)
162 5dcbe4d9a30c Implement recover and undo commands mpm@selenic.com parents: 161 diff changeset	624
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	625 def invalidatecaches(self):
9146 5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	626 self._tags = None
5614a628d173 localrepo: rename in-memory tag cache instance attributes (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9145 diff changeset	627 self._tagtypes = None
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	628 self.nodetagscache = None
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	629 self._branchcache = None # in UTF-8
6121 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	630 self._branchcachetip = None
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	631
10547 bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	632 def invalidate(self):
bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	633 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	634 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	635 delattr(self, a)
bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	636 self.invalidatecaches()
bae9bb09166b strip: invalidate all caches after stripping (fixes issue1951) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10522 diff changeset	637
4913 46e39935ce33 rename and simplify do_lock Matt Mackall <mpm@selenic.com> parents: 4912 diff changeset	638 def _lock(self, lockname, wait, releasefn, acquirefn, desc):
161 0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	639 try:
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	640 l = lock.lock(lockname, 0, releasefn, desc=desc)
7640 7197812e8d44 error: move lock errors Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	641 except error.LockHeld, inst:
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	642 if not wait:
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	643 raise
3688 d92dad355000 Corrected "waiting for lock on repository FOO held by BAR" message. Thomas Arendsen Hein <thomas@intevation.de> parents: 3687 diff changeset	644 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	645 (desc, inst.locker))
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	646 # default to 600 seconds timeout
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	647 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	648 releasefn, desc=desc)
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	649 if acquirefn:
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	650 acquirefn()
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	651 return l
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	652
4914 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4913 diff changeset	653 def lock(self, wait=True):
9309 cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	654 '''Lock the repository store (.hg/store) and return a weak reference
cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	655 to the lock. Use this before modifying the store (e.g. committing or
cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	656 stripping). If you are opening a transaction, get a lock as well.)'''
8108 a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	657 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	658 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	659 l.lock()
a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	660 return l
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	661
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	662 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: 4916 diff changeset	663 _('repository %s') % self.origroot)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	664 self._lockref = weakref.ref(l)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	665 return l
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	666
4914 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4913 diff changeset	667 def wlock(self, wait=True):
9309 cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	668 '''Lock the non-store parts of the repository (everything under
cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	669 .hg except .hg/store) and return a weak reference to the lock.
cfdcb7a465af localrepo: document the locking scheme a little better Greg Ward <greg-hg@gerg.ca> parents: 9152 diff changeset	670 Use this before modifying files in .hg.'''
8108 a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	671 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	672 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	673 l.lock()
a26d33749bd8 made repo locks recursive and deprecate refcounting based lock releasing Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8072 diff changeset	674 return l
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	675
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	676 l = self._lock(self.join("wlock"), wait, self.dirstate.write,
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	677 self.dirstate.invalidate, _('working directory of %s') %
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	678 self.origroot)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	679 self._wlockref = weakref.ref(l)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	680 return l
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	681
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	682 def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist):
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	683 """
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	684 commit an individual file as part of a larger transaction
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	685 """
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	686
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	687 fname = fctx.path()
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	688 text = fctx.data()
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	689 flog = self.file(fname)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	690 fparent1 = manifest1.get(fname, nullid)
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	691 fparent2 = fparent2o = manifest2.get(fname, nullid)
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	692
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	693 meta = {}
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	694 copy = fctx.renamed()
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	695 if copy and copy[0] != fname:
4058 e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	696 # 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	697 # 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	698 # of this new revision. If this is a merge, the first
4058 e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	699 # parent will be the nullid (meaning "look up the copy data")
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	700 # and the second one will be the other parent. For example:
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	701 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	702 # 0 --- 1 --- 3 rev1 changes file foo
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	703 # \ / rev2 renames foo to bar and changes it
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	704 # \- 2 -/ rev3 should have bar with all changes and
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	705 # should record that bar descends from
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	706 # bar in rev2 and foo in rev1
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	707 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	708 # this allows this merge to succeed:
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	709 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	710 # 0 --- 1 --- 3 rev4 reverts the content change from rev2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	711 # \ / merging rev3 and rev4 should use bar@rev2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	712 # \- 2 --- 4 as the merge base
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3923 diff changeset	713 #
6874 8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6680 diff changeset	714
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	715 cfname = copy[0]
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	716 crev = manifest1.get(cfname)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	717 newfparent = fparent2
6874 8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6680 diff changeset	718
8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6680 diff changeset	719 if manifest2: # branch merge
8244 99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	720 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	721 if cfname in manifest2:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	722 crev = manifest2[cfname]
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	723 newfparent = fparent1
6874 8dc21876261e commit: simplify file copy logic Matt Mackall <mpm@selenic.com> parents: 6680 diff changeset	724
6875 0d714a48ab53 add a fix for issue 1175 Matt Mackall <mpm@selenic.com> parents: 6874 diff changeset	725 # 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	726 if not crev:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	727 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	728 (fname, cfname))
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	729 for ancestor in self['.'].ancestors():
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	730 if cfname in ancestor:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	731 crev = ancestor[cfname].filenode()
6876 077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6875 6840 diff changeset	732 break
6875 0d714a48ab53 add a fix for issue 1175 Matt Mackall <mpm@selenic.com> parents: 6874 diff changeset	733
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	734 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	735 meta["copy"] = cfname
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	736 meta["copyrev"] = hex(crev)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	737 fparent1, fparent2 = nullid, newfparent
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	738 elif fparent2 != nullid:
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	739 # 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	740 fparentancestor = flog.ancestor(fparent1, fparent2)
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	741 if fparentancestor == fparent1:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	742 fparent1, fparent2 = fparent2, nullid
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	743 elif fparentancestor == fparent2:
99d7e2db8da8 localrepo: Refactor var names in filecommit to improve readability. Martijn Pieters <mj@zopatista.com> parents: 8239 diff changeset	744 fparent2 = nullid
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	745
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	746 # is the file changed?
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	747 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	748 changelist.append(fname)
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	749 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	750
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	751 # are just the flags changed during merge?
10320 808c187fc556 localrepo: minor formatting - remove double space Henri Wiechers <hwiechers@gmail.com> parents: 10282 diff changeset	752 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	753 changelist.append(fname)
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	754
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	755 return fparent1
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	756
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	757 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	758 editor=False, extra={}):
8515 865e08a7d6b0 localrepo: update commit() docstrings Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 8503 diff changeset	759 """Add a new revision to current repository.
865e08a7d6b0 localrepo: update commit() docstrings Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 8503 diff changeset	760
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	761 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	762 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	763 supplied, it is called to get a commit message.
8515 865e08a7d6b0 localrepo: update commit() docstrings Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 8503 diff changeset	764 """
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	765
8715 8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	766 def fail(f, msg):
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	767 raise util.Abort('%s: %s' % (f, msg))
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	768
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	769 if not match:
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	770 match = match_.always(self.root, '')
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	771
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	772 if not force:
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	773 vdirs = []
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	774 match.dir = vdirs.append
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	775 match.bad = fail
8c667f4c482e commit: move some setup outside the lock Matt Mackall <mpm@selenic.com> parents: 8712 diff changeset	776
8405 7cbf8fcd2453 commit: push repo lock down into _commitctx Matt Mackall <mpm@selenic.com> parents: 8404 diff changeset	777 wlock = self.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	778 try:
8397 613ac2856535 remove deprecated rawcommit Matt Mackall <mpm@selenic.com> parents: 8395 diff changeset	779 p1, p2 = self.dirstate.parents()
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	780 wctx = self[None]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	781
8501 ab0e3f7ea315 commit: some tidying Matt Mackall <mpm@selenic.com> parents: 8500 diff changeset	782 if (not force and p2 != nullid and match and
ab0e3f7ea315 commit: some tidying Matt Mackall <mpm@selenic.com> parents: 8500 diff changeset	783 (match.files() or match.anypats())):
8397 613ac2856535 remove deprecated rawcommit Matt Mackall <mpm@selenic.com> parents: 8395 diff changeset	784 raise util.Abort(_('cannot partially commit a merge '
613ac2856535 remove deprecated rawcommit Matt Mackall <mpm@selenic.com> parents: 8395 diff changeset	785 '(do not specify files or patterns)'))
6706 716a1296e182 localrepo: replace dirstate by workingfilectx in filecommit() Patrick Mezard <pmezard@gmail.com> parents: 6705 diff changeset	786
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	787 changes = self.status(match=match, clean=force)
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	788 if force:
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8705 diff changeset	789 changes[0].extend(changes[6]) # mq may commit unchanged files
3621 7d3d603e7df9 localrepo: factor commit and rawcommit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3620 diff changeset	790
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	791 # check subrepos
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	792 subs = []
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	793 removedsubs = set()
b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	794 for p in wctx.parents():
b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	795 removedsubs.update(s for s in p.substate if match(s))
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	796 for s in wctx.substate:
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	797 removedsubs.discard(s)
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	798 if match(s) and wctx.sub(s).dirty():
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	799 subs.append(s)
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	800 if (subs or removedsubs) and '.hgsubstate' not in changes[0]:
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	801 changes[0].insert(0, '.hgsubstate')
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	802
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	803 # 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	804 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	805 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	806
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	807 for f in match.files():
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	808 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	809 continue
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	810 if f in changes[3]: # missing
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	811 fail(f, _('file not found!'))
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	812 if f in vdirs: # visited directory
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	813 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	814 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	815 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	816 break
bcb6e5bebd93 commit: trade O(n^2) file checks for O(n^2) dir checks Matt Mackall <mpm@selenic.com> parents: 8709 diff changeset	817 else:
8709 b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	818 fail(f, _("no match under directory!"))
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	819 elif f not in self.dirstate:
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	820 fail(f, _("file not tracked!"))
b9e0ddb04c5c commit: move explicit file checking into repo.commit Matt Mackall <mpm@selenic.com> parents: 8707 diff changeset	821
8501 ab0e3f7ea315 commit: some tidying Matt Mackall <mpm@selenic.com> parents: 8500 diff changeset	822 if (not force and not extra.get("close") and p2 == nullid
ab0e3f7ea315 commit: some tidying Matt Mackall <mpm@selenic.com> parents: 8500 diff changeset	823 and not (changes[0] or changes[1] or changes[2])
ab0e3f7ea315 commit: some tidying Matt Mackall <mpm@selenic.com> parents: 8500 diff changeset	824 and self[None].branch() == self['.'].branch()):
8404 a2bc39ade36b commit: move 'nothing changed' test into commit() Matt Mackall <mpm@selenic.com> parents: 8403 diff changeset	825 return None
a2bc39ade36b commit: move 'nothing changed' test into commit() Matt Mackall <mpm@selenic.com> parents: 8403 diff changeset	826
6888 7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6884 diff changeset	827 ms = merge_.mergestate(self)
7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6884 diff changeset	828 for f in changes[0]:
7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6884 diff changeset	829 if f in ms and ms[f] == 'u':
7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6884 diff changeset	830 raise util.Abort(_("unresolved merge conflicts "
7c36a4fb05a3 make commit fail when committing unresolved files Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6884 diff changeset	831 "(see hg resolve)"))
8496 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8481 diff changeset	832
8712 dd3ebf81af43 commit: rename wctx to cctx Matt Mackall <mpm@selenic.com> parents: 8710 diff changeset	833 cctx = context.workingctx(self, (p1, p2), text, user, date,
6711 86e1f603a369 localrepo: do not expose workingctx options Patrick Mezard <pmezard@gmail.com> parents: 6710 diff changeset	834 extra, changes)
8496 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8481 diff changeset	835 if editor:
8994 4a1187d3cb00 commit: report modified subrepos in commit editor Matt Mackall <mpm@selenic.com> parents: 8954 diff changeset	836 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	837 edited = (text != cctx._text)
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	838
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	839 # commit subs
10522 b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo Saint Germain <saintger@gmail.com> parents: 10519 diff changeset	840 if subs or removedsubs:
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	841 state = wctx.substate.copy()
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	842 for s in subs:
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	843 self.ui.status(_('committing subrepository %s\n') % s)
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	844 sr = wctx.sub(s).commit(cctx._text, user, date)
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	845 state[s] = (state[s][0], sr)
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	846 subrepo.writestate(self, state)
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8799 diff changeset	847
9934 720f70b720d3 commit: save commit message so it's not destroyed by rollback. Greg Ward <greg-hg@gerg.ca> parents: 9924 diff changeset	848 # 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	849 # (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	850 # 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	851 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	852 msgfile.write(cctx._text)
9934 720f70b720d3 commit: save commit message so it's not destroyed by rollback. Greg Ward <greg-hg@gerg.ca> parents: 9924 diff changeset	853 msgfile.close()
720f70b720d3 commit: save commit message so it's not destroyed by rollback. Greg Ward <greg-hg@gerg.ca> parents: 9924 diff changeset	854
9935 48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	855 try:
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	856 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '')
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	857 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	858 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	859 except:
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	860 if edited:
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	861 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	862 self.ui.write(
48b81d9bca8d commit: if relevant, tell user their commit message was saved. Greg Ward <greg-hg@gerg.ca> parents: 9934 diff changeset	863 _('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	864 raise
8496 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8481 diff changeset	865
8503 90f86a5330bb commit: tidy up mergestate slightly Matt Mackall <mpm@selenic.com> parents: 8502 diff changeset	866 # 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	867 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	868 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	869 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	870 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	871 self.dirstate.setparents(ret)
8503 90f86a5330bb commit: tidy up mergestate slightly Matt Mackall <mpm@selenic.com> parents: 8502 diff changeset	872 ms.reset()
6710 0aa91f69a4c4 localrepo: extract _commitctx() from commit() Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	873 finally:
8405 7cbf8fcd2453 commit: push repo lock down into _commitctx Matt Mackall <mpm@selenic.com> parents: 8404 diff changeset	874 wlock.release()
6710 0aa91f69a4c4 localrepo: extract _commitctx() from commit() Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	875
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	876 self.hook("commit", node=hex(ret), parent1=hookp1, parent2=hookp2)
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	877 return ret
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	878
8496 a21605de1509 commit: move editor outside transaction Matt Mackall <mpm@selenic.com> parents: 8481 diff changeset	879 def commitctx(self, ctx, error=False):
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7072 diff changeset	880 """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	881 Revision information is passed via the context argument.
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7072 diff changeset	882 """
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6712 diff changeset	883
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	884 tr = lock = None
8498 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	885 removed = ctx.removed()
8414 2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	886 p1, p2 = ctx.p1(), ctx.p2()
2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	887 m1 = p1.manifest().copy()
2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	888 m2 = p2.manifest()
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	889 user = ctx.user()
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	890
8411 4d5916358abd commit: move lots of commitctx outside of the repo lock Matt Mackall <mpm@selenic.com> parents: 8410 diff changeset	891 lock = self.lock()
4d5916358abd commit: move lots of commitctx outside of the repo lock Matt Mackall <mpm@selenic.com> parents: 8410 diff changeset	892 try:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	893 tr = self.transaction()
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	894 trp = weakref.proxy(tr)
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	895
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	896 # check in files
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	897 new = {}
6710 0aa91f69a4c4 localrepo: extract _commitctx() from commit() Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	898 changed = []
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	899 linkrev = len(self)
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	900 for f in sorted(ctx.modified() + ctx.added()):
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	901 self.ui.note(f + "\n")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	902 try:
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	903 fctx = ctx[f]
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	904 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	905 changed)
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8400 diff changeset	906 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	907 except OSError, inst:
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	908 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	909 raise
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	910 except IOError, inst:
e553a425751d convert: differentiate between IOError and OSError on commitctx() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 10263 diff changeset	911 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	912 if error or errcode and errcode != errno.ENOENT:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	913 self.ui.warn(_("trouble committing %s!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	914 raise
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	915 else:
8498 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	916 removed.append(f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	917
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	918 # update manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	919 m1.update(new)
8498 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	920 removed = [f for f in sorted(removed) if f in m1 or f in m2]
a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	921 drop = [f for f in removed if f in m1]
a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	922 for f in drop:
a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	923 del m1[f]
8414 2348ce25849b commitctx: use contexts more fully Matt Mackall <mpm@selenic.com> parents: 8412 diff changeset	924 mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(),
8498 a5182c39766a commit: simplify manifest commit Matt Mackall <mpm@selenic.com> parents: 8496 diff changeset	925 p2.manifestnode(), (new, drop))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	926
8499 fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8498 diff changeset	927 # update changelog
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	928 self.changelog.delayupdate()
8499 fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8498 diff changeset	929 n = self.changelog.add(mn, changed + removed, ctx.description(),
fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8498 diff changeset	930 trp, p1.node(), p2.node(),
8412 2bf4f380f6ab commitctx: eliminate some variables Matt Mackall <mpm@selenic.com> parents: 8411 diff changeset	931 user, ctx.date(), ctx.extra().copy())
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	932 p = lambda: self.changelog.writepending() and self.root or ""
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10435 diff changeset	933 xp1, xp2 = p1.hex(), p2 and p2.hex() or ''
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	934 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	935 parent2=xp2, pending=p)
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	936 self.changelog.finalize(trp)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	937 tr.close()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	938
9674 603b23c6967b localrepo/branchcache: kill unused localrepo.branchcache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9673 diff changeset	939 if self._branchcache:
6121 7336aeff1a1d automatically update the branch cache when tip changes Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6120 diff changeset	940 self.branchtags()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	941 return n
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	942 finally:
6710 0aa91f69a4c4 localrepo: extract _commitctx() from commit() Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	943 del tr
8405 7cbf8fcd2453 commit: push repo lock down into _commitctx Matt Mackall <mpm@selenic.com> parents: 8404 diff changeset	944 lock.release()
660 2c83350784c3 Move commit hook after commit completes Matt Mackall <mpm@selenic.com> parents: 659 diff changeset	945
9150 09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	946 def destroyed(self):
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	947 '''Inform the repository that nodes have been destroyed.
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	948 Intended for use by strip and rollback, so there's a common
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	949 place for anything that has to be done after destroying history.'''
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	950 # XXX it might be nice if we could take the list of destroyed
09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	951 # nodes, but I don't see an easy way for rollback() to do that
9151 f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	952
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	953 # Ensure the persistent tag cache is updated. Doing it now
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	954 # means that the tag cache only has to worry about destroyed
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	955 # heads immediately after a strip/rollback. That in turn
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	956 # guarantees that "cachetip == currenttip" (comparing both rev
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	957 # and node) always means no nodes have been added or destroyed.
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	958
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	959 # XXX this is suboptimal when qrefresh'ing: we strip the current
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	960 # head, refresh the tag cache, then immediately add a new head.
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	961 # But I think doing it this way is necessary for the "instant
f528d1a93491 tags: implement persistent tag caching (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9150 diff changeset	962 # 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	963 self.invalidatecaches()
9150 09a1ee498756 localrepo: add destroyed() method for strip/rollback to use (issue548). Greg Ward <greg-hg@gerg.ca> parents: 9149 diff changeset	964
6585 d3d1d39da2fa walk: remove cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	965 def walk(self, match, node=None):
3532 26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	966 '''
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	967 walk recursively through the directory tree or a given
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	968 changeset, finding all files matched by the match
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	969 function
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	970 '''
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	971 return self[node].walk(match)
3532 26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	972
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	973 def status(self, node1='.', node2=None, match=None,
6760 4faaa0535ea7 status: clean up all users for unknown files Matt Mackall <mpm@selenic.com> parents: 6755 diff changeset	974 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	975 """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	976
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	977 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	978 If node2 is None, compare node1 with working directory.
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	979 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	980
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	981 def mfmatches(ctx):
97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	982 mf = ctx.manifest().copy()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	983 for fn in mf.keys():
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	984 if not match(fn):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	985 del mf[fn]
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	986 return mf
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	987
7090 7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	988 if isinstance(node1, context.changectx):
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	989 ctx1 = node1
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	990 else:
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	991 ctx1 = self[node1]
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	992 if isinstance(node2, context.changectx):
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	993 ctx2 = node2
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	994 else:
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	995 ctx2 = self[node2]
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	996
7435 5e13df32fb74 bundlerepo doesn't really have a dirstate, throw AttributeError if requested Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7415 diff changeset	997 working = ctx2.rev() is None
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	998 parentworking = working and ctx1 == self['.']
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	999 match = match or match_.always(self.root, self.getcwd())
6753 ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	1000 listignored, listclean, listunknown = ignored, clean, unknown
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	1001
7090 7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1002 # load earliest manifest first for caching reasons
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1003 if not working and ctx2.rev() < ctx1.rev():
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1004 ctx2.manifest()
7b5c063b0b94 diff: pass contexts to status Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	1005
7067 40d105a12cac status: don't warn about missing files present in base revision (issue1323) Matt Mackall <mpm@selenic.com> parents: 7064 diff changeset	1006 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	1007 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	1008 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	1009 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	1010 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	1011
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1012 if working: # we need to scan the working dir
10176 24ce8f0c0a39 dirstate: don't check state of subrepo directories Augie Fackler <durin42@gmail.com> parents: 10011 diff changeset	1013 subrepos = ctx1.substate.keys()
24ce8f0c0a39 dirstate: don't check state of subrepo directories Augie Fackler <durin42@gmail.com> parents: 10011 diff changeset	1014 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	1015 listclean, listunknown)
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1016 cmp, modified, added, removed, deleted, unknown, ignored, clean = s
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	1017
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1018 # check for any possibly clean files
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1019 if parentworking and cmp:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1020 fixup = []
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1021 # 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	1022 for f in sorted(cmp):
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1023 if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f)
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1024 or ctx1[f].cmp(ctx2[f].data())):
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1025 modified.append(f)
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1026 else:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1027 fixup.append(f)
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1028
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1029 if listclean:
6827 c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1030 clean += fixup
4912 312c845edef5 simplify dirstate fixups in repo.status() Matt Mackall <mpm@selenic.com> parents: 4910 diff changeset	1031
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1032 # update dirstate for files that are actually clean
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1033 if fixup:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1034 try:
8647 cb74433f9b41 localrepo: move comment Adrian Buehlmann <adrian@cadifra.com> parents: 8646 diff changeset	1035 # updating the dirstate is optional
cb74433f9b41 localrepo: move comment Adrian Buehlmann <adrian@cadifra.com> parents: 8646 diff changeset	1036 # 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	1037 wlock = self.wlock(False)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1038 try:
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1039 for f in fixup:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1040 self.dirstate.normal(f)
8646 60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1041 finally:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1042 wlock.release()
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1043 except error.LockError:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1044 pass
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1045
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1046 if not parentworking:
97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1047 mf1 = mfmatches(ctx1)
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1048 if working:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1049 # we are comparing working dir against non-parent
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1050 # generate a pseudo-manifest for the working dir
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1051 mf2 = mfmatches(self['.'])
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1052 for f in cmp + modified + added:
6769 97c12b1ed1e0 status: use contexts Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1053 mf2[f] = None
6817 cf319797d61c minor status fixups Matt Mackall <mpm@selenic.com> parents: 6810 diff changeset	1054 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	1055 for f in removed:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1056 if f in mf2:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1057 del mf2[f]
6770 854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1058 else:
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1059 # we are comparing two revisions
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1060 deleted, unknown, ignored = [], [], []
854b907527e5 status: various cleanups Matt Mackall <mpm@selenic.com> parents: 6769 diff changeset	1061 mf2 = mfmatches(ctx2)
4372 4ddc6d374265 localrepository.status: only acquire wlock if actually needed. Bryan O'Sullivan <bos@serpentine.com> parents: 4335 diff changeset	1062
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1063 modified, added, clean = [], [], []
6827 c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1064 for fn in mf2:
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5913 diff changeset	1065 if fn in mf1:
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4622 diff changeset	1066 if (mf1.flags(fn) != mf2.flags(fn) or
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4622 diff changeset	1067 (mf1[fn] != mf2[fn] and
6817 cf319797d61c minor status fixups Matt Mackall <mpm@selenic.com> parents: 6810 diff changeset	1068 (mf2[fn] or ctx1[fn].cmp(ctx2[fn].data())))):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1069 modified.append(fn)
6753 ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	1070 elif listclean:
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1071 clean.append(fn)
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1072 del mf1[fn]
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1073 else:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1074 added.append(fn)
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	1075 removed = mf1.keys()
ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	1076
6827 c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1077 r = modified, added, removed, deleted, unknown, ignored, clean
c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1078 [l.sort() for l in r]
c978d6752dbb dirstate.walk: push sorting up Matt Mackall <mpm@selenic.com> parents: 6817 diff changeset	1079 return r
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	1080
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1081 def add(self, list):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1082 wlock = self.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1083 try:
5688 883d887c6408 commands: add exits(1) if a specified file cannot be added (issue 891) Patrick Mezard <pmezard@gmail.com> parents: 5666 diff changeset	1084 rejected = []
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	1085 for f in list:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1086 p = self.wjoin(f)
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	1087 try:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1088 st = os.lstat(p)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1089 except:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1090 self.ui.warn(_("%s does not exist!\n") % f)
5688 883d887c6408 commands: add exits(1) if a specified file cannot be added (issue 891) Patrick Mezard <pmezard@gmail.com> parents: 5666 diff changeset	1091 rejected.append(f)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1092 continue
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1093 if st.st_size > 10000000:
10725 00d46934ee35 localrepo: more specific warning on adding large files Martin Geisler <mg@lazybytes.net> parents: 10698 diff changeset	1094 self.ui.warn(_("%s: up to %d MB of RAM may be required "
00d46934ee35 localrepo: more specific warning on adding large files Martin Geisler <mg@lazybytes.net> parents: 10698 diff changeset	1095 "to manage this file\n"
00d46934ee35 localrepo: more specific warning on adding large files Martin Geisler <mg@lazybytes.net> parents: 10698 diff changeset	1096 "(use 'hg revert %s' to cancel the "
00d46934ee35 localrepo: more specific warning on adding large files Martin Geisler <mg@lazybytes.net> parents: 10698 diff changeset	1097 "pending addition)\n")
00d46934ee35 localrepo: more specific warning on adding large files Martin Geisler <mg@lazybytes.net> parents: 10698 diff changeset	1098 % (f, 3 * st.st_size // 1000000, f))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1099 if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1100 self.ui.warn(_("%s not added: only files and symlinks "
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1101 "supported currently\n") % f)
5688 883d887c6408 commands: add exits(1) if a specified file cannot be added (issue 891) Patrick Mezard <pmezard@gmail.com> parents: 5666 diff changeset	1102 rejected.append(p)
5206 6a1d2dd96b8e abort when adding a file in merged state Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5175 diff changeset	1103 elif self.dirstate[f] in 'amn':
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1104 self.ui.warn(_("%s already tracked!\n") % f)
5207 212de429e000 make hg add of a removed file unremove the file Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5206 diff changeset	1105 elif self.dirstate[f] == 'r':
5210 90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5207 diff changeset	1106 self.dirstate.normallookup(f)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1107 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1108 self.dirstate.add(f)
5688 883d887c6408 commands: add exits(1) if a specified file cannot be added (issue 891) Patrick Mezard <pmezard@gmail.com> parents: 5666 diff changeset	1109 return rejected
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1110 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1111 wlock.release()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1112
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1113 def forget(self, list):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1114 wlock = self.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1115 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1116 for f in list:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1117 if self.dirstate[f] != 'a':
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1118 self.ui.warn(_("%s not added!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1119 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1120 self.dirstate.forget(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1121 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1122 wlock.release()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1123
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1124 def remove(self, list, unlink=False):
8646 60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1125 if unlink:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1126 for f in list:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1127 try:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1128 util.unlink(self.wjoin(f))
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1129 except OSError, inst:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1130 if inst.errno != errno.ENOENT:
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1131 raise
60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1132 wlock = self.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1133 try:
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	1134 for f in list:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1135 if unlink and os.path.exists(self.wjoin(f)):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1136 self.ui.warn(_("%s still exists!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1137 elif self.dirstate[f] == 'a':
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1138 self.dirstate.forget(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1139 elif f not in self.dirstate:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1140 self.ui.warn(_("%s not tracked!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1141 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1142 self.dirstate.remove(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1143 finally:
8646 60f9e574b6eb localrepo: use lock.release for single lock Simon Heimberg <simohe@besonet.ch> parents: 8639 diff changeset	1144 wlock.release()
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	1145
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1146 def undelete(self, list):
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1147 manifests = [self.manifest.read(self.changelog.read(p)[0])
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1148 for p in self.dirstate.parents() if p != nullid]
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1149 wlock = self.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1150 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1151 for f in list:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1152 if self.dirstate[f] != 'r':
6953 63b5f4c73c98 i18n: mark strings for translation in Mercurial Martin Geisler <mg@daimi.au.dk> parents: 6923 diff changeset	1153 self.ui.warn(_("%s not removed!\n") % f)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1154 else:
5323 46455285c6b5 Merge with crew-stable Patrick Mezard <pmezard@gmail.com> parents: 5272 5317 diff changeset	1155 m = f in manifests[0] and manifests[0] or manifests[1]
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1156 t = self.file(f).read(m[f])
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1157 self.wwrite(f, t, m.flags(f))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1158 self.dirstate.normal(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1159 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1160 wlock.release()
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	1161
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1162 def copy(self, source, dest):
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1163 p = self.wjoin(dest)
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1164 if not (os.path.exists(p) or os.path.islink(p)):
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1165 self.ui.warn(_("%s does not exist!\n") % dest)
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1166 elif not (os.path.isfile(p) or os.path.islink(p)):
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1167 self.ui.warn(_("copy failed: %s is not a file or a "
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1168 "symbolic link\n") % dest)
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1169 else:
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1170 wlock = self.wlock()
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1171 try:
7121 b801d6e5dc83 rename: handle renaming to a target marked removed Matt Mackall <mpm@selenic.com> parents: 7090 diff changeset	1172 if self.dirstate[dest] in '?r':
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1173 self.dirstate.add(dest)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1174 self.dirstate.copy(source, dest)
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1175 finally:
496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1176 wlock.release()
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	1177
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8731 diff changeset	1178 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	1179 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	1180 # sort the output in rev descending order
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8731 diff changeset	1181 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	1182 return [n for (r, n) in sorted(heads)]
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1183
8694 ca8d05e1f1d1 localrepo: set heads and branchheads to be closed=False by default John Mulligan <phlogistonjohn@asynchrono.us> parents: 8680 diff changeset	1184 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	1185 '''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	1186
c295a82a020b localrepo: fix bugs in branchheads and add docstring Sune Foldager <cryo@cyanite.org> parents: 9423 diff changeset	1187 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	1188 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	1189 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	1190 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	1191 '''
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	1192 if branch is None:
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	1193 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	1194 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	1195 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	1196 return []
7654 816b708f23af store all heads of a branch in the branch cache John Mulligan <phlogistonjohn@asynchrono.us> parents: 7644 diff changeset	1197 # 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	1198 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	1199 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	1200 # 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	1201 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	1202 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	1203 if not closed:
7670 e5f445c94226 kill some trailing whitespace Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7656 diff changeset	1204 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	1205 ('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	1206 return bheads
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1207
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1208 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	1209 if not nodes:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1210 nodes = [self.changelog.tip()]
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1211 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1212 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1213 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	1214 while 1:
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1215 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1216 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	1217 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	1218 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1219 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1220 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1221
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1222 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1223 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1224
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1225 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1226 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1227 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1228
7708 a32847fa0df0 wire protocol: avoid infinite loop (issue1483) Matt Mackall <mpm@selenic.com> parents: 7564 diff changeset	1229 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	1230 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1231 if i == f:
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	1232 l.append(n)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1233 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1234 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1235 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1236
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1237 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1238
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1239 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1240
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1241 def findincoming(self, remote, base=None, heads=None, force=False):
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1242 """Return list of roots of the subsets of missing nodes from remote
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1243
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1244 If base dict is specified, assume that these nodes and their parents
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1245 exist on the remote side and that no child of a node of base exists
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1246 in both remote and self.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1247 Furthermore base will be updated to include the nodes that exists
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1248 in self and remote but no children exists in self and remote.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1249 If a list of heads is specified, return only nodes which are heads
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1250 or ancestors of these heads.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1251
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1252 All the ancestors of base are in self and in remote.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1253 All the descendants of the list returned are missing in self.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1254 (and so we know that the rest of the nodes are missing in remote, see
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1255 outgoing)
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1256 """
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1257 return self.findcommonincoming(remote, base, heads, force)[1]
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1258
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1259 def findcommonincoming(self, remote, base=None, heads=None, force=False):
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1260 """Return a tuple (common, missing roots, heads) used to identify
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1261 missing nodes from remote.
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1262
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1263 If base dict is specified, assume that these nodes and their parents
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1264 exist on the remote side and that no child of a node of base exists
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1265 in both remote and self.
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1266 Furthermore base will be updated to include the nodes that exists
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1267 in self and remote but no children exists in self and remote.
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1268 If a list of heads is specified, return only nodes which are heads
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1269 or ancestors of these heads.
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1270
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1271 All the ancestors of base are in self and in remote.
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1272 """
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1273 m = self.changelog.nodemap
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1274 search = []
8156 9fd0822c2ec3 localrepo: use sets in findcommonincoming Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	1275 fetch = set()
9fd0822c2ec3 localrepo: use sets in findcommonincoming Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	1276 seen = set()
9fd0822c2ec3 localrepo: use sets in findcommonincoming Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	1277 seenbranch = set()
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8515 diff changeset	1278 if base is None:
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1279 base = {}
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	1280
2108 30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1281 if not heads:
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1282 heads = remote.heads()
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1283
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1284 if self.changelog.tip() == nullid:
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1285 base[nullid] = 1
2108 30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1286 if heads != [nullid]:
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1287 return [nullid], [nullid], list(heads)
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1288 return [nullid], [], []
2108 30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1289
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1290 # assume we're closer to the tip than the root
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1291 # and start by examining the heads
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1292 self.ui.status(_("searching for changes\n"))
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1293
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1294 unknown = []
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1295 for h in heads:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1296 if h not in m:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1297 unknown.append(h)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1298 else:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1299 base[h] = 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1300
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1301 heads = unknown
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1302 if not unknown:
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1303 return base.keys(), [], []
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1304
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1305 req = set(unknown)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1306 reqcnt = 0
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1307
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1308 # search through remote branches
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1309 # a 'branch' here is a linear segment of history, with four parts:
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1310 # head, root, first parent, second parent
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1311 # (a branch always has two parents (or none) by definition)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1312 unknown = remote.branches(unknown)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1313 while unknown:
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1314 r = []
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1315 while unknown:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1316 n = unknown.pop(0)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1317 if n[0] in seen:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1318 continue
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1319
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1320 self.ui.debug("examining %s:%s\n"
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1321 % (short(n[0]), short(n[1])))
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1322 if n[0] == nullid: # found the end of the branch
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1323 pass
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1324 elif n in seenbranch:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1325 self.ui.debug("branch already found\n")
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1326 continue
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1327 elif n[1] and n[1] in m: # do we know the base?
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1328 self.ui.debug("found incomplete branch %s:%s\n"
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1329 % (short(n[0]), short(n[1])))
7237 b9bf36905b55 findincoming: build the correct list from the start Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7234 diff changeset	1330 search.append(n[0:2]) # schedule branch range for scanning
8156 9fd0822c2ec3 localrepo: use sets in findcommonincoming Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	1331 seenbranch.add(n)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1332 else:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1333 if n[1] not in seen and n[1] not in fetch:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1334 if n[2] in m and n[3] in m:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1335 self.ui.debug("found new changeset %s\n" %
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1336 short(n[1]))
8156 9fd0822c2ec3 localrepo: use sets in findcommonincoming Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	1337 fetch.add(n[1]) # earliest unknown
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1338 for p in n[2:4]:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1339 if p in m:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1340 base[p] = 1 # latest known
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1341
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1342 for p in n[2:4]:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1343 if p not in req and p not in m:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1344 r.append(p)
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1345 req.add(p)
8156 9fd0822c2ec3 localrepo: use sets in findcommonincoming Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	1346 seen.add(n[0])
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1347
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1348 if r:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1349 reqcnt += 1
10519 f75db9927429 progress: mark units for translation Martin Geisler <mg@lazybytes.net> parents: 10510 diff changeset	1350 self.ui.progress(_('searching'), reqcnt, unit=_('queries'))
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1351 self.ui.debug("request %d: %s\n" %
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1352 (reqcnt, " ".join(map(short, r))))
3473 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3452 diff changeset	1353 for p in xrange(0, len(r), 10):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1354 for b in remote.branches(r[p:p + 10]):
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1355 self.ui.debug("received %s:%s\n" %
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1356 (short(b[0]), short(b[1])))
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1357 unknown.append(b)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1358
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1359 # do binary search on the branches we found
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1360 while search:
7208 acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1361 newsearch = []
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1362 reqcnt += 1
10519 f75db9927429 progress: mark units for translation Martin Geisler <mg@lazybytes.net> parents: 10510 diff changeset	1363 self.ui.progress(_('searching'), reqcnt, unit=_('queries'))
7208 acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1364 for n, l in zip(search, remote.between(search)):
acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1365 l.append(n[1])
acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1366 p = n[0]
acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1367 f = 1
acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1368 for i in l:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1369 self.ui.debug("narrowing %d:%d %s\n" % (f, len(l), short(i)))
7208 acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1370 if i in m:
acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1371 if f <= 2:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1372 self.ui.debug("found new branch changeset %s\n" %
7208 acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1373 short(p))
8156 9fd0822c2ec3 localrepo: use sets in findcommonincoming Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	1374 fetch.add(p)
7208 acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1375 base[i] = 1
acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1376 else:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1377 self.ui.debug("narrowed branch search to %s:%s\n"
7208 acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1378 % (short(p), short(i)))
acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1379 newsearch.append((p, i))
acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1380 break
acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1381 p, f = i, f * 2
acb87c5b4aeb findincoming: do the binary search in branches in parallel Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7134 diff changeset	1382 search = newsearch
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1383
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1384 # sanity check our fetch list
8156 9fd0822c2ec3 localrepo: use sets in findcommonincoming Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	1385 for f in fetch:
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1386 if f in m:
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	1387 raise error.RepoError(_("already have changeset ")
1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	1388 + short(f[:4]))
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1389
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1390 if base.keys() == [nullid]:
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1391 if force:
d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1392 self.ui.warn(_("warning: repository is unrelated\n"))
d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1393 else:
d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1394 raise util.Abort(_("repository is unrelated"))
511 9f67222186bd Disallow merging of unrelated projects mpm@selenic.com parents: 504 diff changeset	1395
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1396 self.ui.debug("found new changesets starting at " +
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1397 " ".join([short(f) for f in fetch]) + "\n")
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1398
10519 f75db9927429 progress: mark units for translation Martin Geisler <mg@lazybytes.net> parents: 10510 diff changeset	1399 self.ui.progress(_('searching'), None, unit=_('queries'))
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1400 self.ui.debug("%d total queries\n" % reqcnt)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1401
8156 9fd0822c2ec3 localrepo: use sets in findcommonincoming Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	1402 return base.keys(), list(fetch), heads
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	1403
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1404 def findoutgoing(self, remote, base=None, heads=None, force=False):
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1405 """Return list of nodes that are roots of subsets not in remote
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1406
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1407 If base dict is specified, assume that these nodes and their parents
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1408 exist on the remote side.
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1409 If a list of heads is specified, return only nodes which are heads
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1410 or ancestors of these heads, and return a second element which
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1411 contains all remote heads which get new children.
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1412 """
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8515 diff changeset	1413 if base is None:
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1414 base = {}
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1415 self.findincoming(remote, base, heads, force=force)
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1416
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1417 self.ui.debug("common changesets up to "
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1418 + " ".join(map(short, base.keys())) + "\n")
05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1419
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1420 remain = set(self.changelog.nodemap)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1421
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1422 # prune everything remote has from the tree
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1423 remain.remove(nullid)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1424 remove = base.keys()
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1425 while remove:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1426 n = remove.pop(0)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1427 if n in remain:
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1428 remain.remove(n)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1429 for p in self.changelog.parents(n):
637 31e090c34d3b Fix up the broken bits in findoutgoing Matt Mackall <mpm@selenic.com> parents: 636 diff changeset	1430 remove.append(p)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1431
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1432 # find every node whose parents have been pruned
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1433 subset = []
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1434 # find every remote head that will get new children
8469 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1435 updated_heads = set()
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1436 for n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1437 p1, p2 = self.changelog.parents(n)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1438 if p1 not in remain and p2 not in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1439 subset.append(n)
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1440 if heads:
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1441 if p1 in heads:
8469 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1442 updated_heads.add(p1)
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1443 if p2 in heads:
8469 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1444 updated_heads.add(p2)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1445
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1446 # this is the set of all roots we have to push
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1447 if heads:
8469 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1448 return subset, list(updated_heads)
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1449 else:
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1450 return subset
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1451
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1452 def pull(self, remote, heads=None, force=False):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4916 diff changeset	1453 lock = self.lock()
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1454 try:
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1455 common, fetch, rheads = self.findcommonincoming(remote, heads=heads,
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1456 force=force)
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1457 if not fetch:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1458 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	1459 return 0
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1460
10863 60b42f318a6d clone: no race possible, we can use changegroup() and have smaller urls Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10772 diff changeset	1461 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	1462 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	1463 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	1464 # 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	1465 heads = rheads
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1466
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1467 if heads is None:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1468 cg = remote.changegroup(fetch, 'pull')
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1469 else:
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7377 diff changeset	1470 if not remote.capable('changegroupsubset'):
8663 45f626a39def wrap string literals in error messages Martin Geisler <mg@lazybytes.net> parents: 8647 diff changeset	1471 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	1472 "other repository doesn't support "
45f626a39def wrap string literals in error messages Martin Geisler <mg@lazybytes.net> parents: 8647 diff changeset	1473 "changegroupsubset."))
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1474 cg = remote.changegroupsubset(fetch, heads, 'pull')
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1475 return self.addchangegroup(cg, 'pull', remote.url())
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1476 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1477 lock.release()
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1478
1781 284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1479 def push(self, remote, force=False, revs=None):
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1480 # 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	1481 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1482 # 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	1483 # 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	1484 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1485 # 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	1486 # servers, http servers).
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1487
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1488 if remote.capable('unbundle'):
2463 6ab016edd5c4 localrepository.push: propagate return value Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1489 return self.push_unbundle(remote, force, revs)
6ab016edd5c4 localrepository.push: propagate return value Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1490 return self.push_addchangegroup(remote, force, revs)
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1491
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1492 def prepush(self, remote, force, revs):
9437 1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1493 '''Analyze the local and remote repositories and determine which
1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1494 changesets need to be pushed to the remote. Return a tuple
1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1495 (changegroup, remoteheads). changegroup is a readable file-like
1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1496 object whose read() returns successive changegroup chunks ready to
1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1497 be sent over the wire. remoteheads is the list of remote heads.
1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1498 '''
7460 3342e6ada4b9 push: use the fast changegroup() path on push Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7435 diff changeset	1499 common = {}
2021 fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1500 remote_heads = remote.heads()
7460 3342e6ada4b9 push: use the fast changegroup() path on push Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7435 diff changeset	1501 inc = self.findincoming(remote, common, remote_heads, force=force)
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1502
10925 a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1503 cl = self.changelog
7460 3342e6ada4b9 push: use the fast changegroup() path on push Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7435 diff changeset	1504 update, updated_heads = self.findoutgoing(remote, common, remote_heads)
10925 a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1505 outg, bases, heads = cl.nodesbetween(update, revs)
8564 6b9ec23b09fc named branches: improve pre-push logic (issue736) Sune Foldager <cryo@cyanite.org> parents: 8562 diff changeset	1506
1781 284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1507 if not bases:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1508 self.ui.status(_("no changes found\n"))
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1509 return None, 1
10925 a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1510
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1511 if not force and remote_heads != [nullid]:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1512
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1513 def fail_multiple_heads(unsynced, branch=None):
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1514 if branch:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1515 msg = _("abort: push creates new remote heads"
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1516 " on branch '%s'!\n") % branch
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1517 else:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1518 msg = _("abort: push creates new remote heads!\n")
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1519 self.ui.warn(msg)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1520 if unsynced:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1521 self.ui.status(_("(you should pull and merge or"
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1522 " use push -f to force)\n"))
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1523 else:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1524 self.ui.status(_("(did you forget to merge?"
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1525 " use push -f to force)\n"))
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1526 return None, 0
3684 975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1527
10925 a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1528 if remote.capable('branchmap'):
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1529 # Check for each named branch if we're creating new remote heads.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1530 # To be a remote head after push, node must be either:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1531 # - unknown locally
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1532 # - a local outgoing head descended from update
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1533 # - a remote head that's known locally and not
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1534 # ancestral to an outgoing head
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1535 #
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1536 # New named branches cannot be created without --force.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1537
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1538 # 1. Create set of branches involved in the push.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1539 branches = set(self[n].branch() for n in outg)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1540
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1541 # 2. Check for new branches on the remote.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1542 remotemap = remote.branchmap()
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1543 newbranches = branches - set(remotemap)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1544 if newbranches: # new branch requires --force
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1545 branchnames = ', '.join("%s" % b for b in newbranches)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1546 self.ui.warn(_("abort: push creates "
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1547 "new remote branches: %s!\n")
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1548 % branchnames)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1549 self.ui.status(_("(use 'hg push -f' to force)\n"))
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1550 return None, 0
10353 36b6b5ef7820 prepush: rename variables, refactor Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10327 diff changeset	1551
10925 a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1552 # 3. Construct the initial oldmap and newmap dicts.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1553 # They contain information about the remote heads before and
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1554 # after the push, respectively.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1555 # Heads not found locally are not included in either dict,
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1556 # since they won't be affected by the push.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1557 # unsynced contains all branches with incoming changesets.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1558 oldmap = {}
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1559 newmap = {}
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1560 unsynced = set()
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1561 for branch in branches:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1562 remoteheads = remotemap[branch]
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1563 prunedheads = [h for h in remoteheads if h in cl.nodemap]
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1564 oldmap[branch] = prunedheads
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1565 newmap[branch] = list(prunedheads)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1566 if len(remoteheads) > len(prunedheads):
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1567 unsynced.add(branch)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1568
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1569 # 4. Update newmap with outgoing changes.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1570 # This will possibly add new heads and remove existing ones.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1571 ctxgen = (self[n] for n in outg)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1572 self._updatebranchcache(newmap, ctxgen)
3684 975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1573
10925 a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1574 # 5. Check for new heads.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1575 # If there are more heads after the push than before, a suitable
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1576 # warning, depending on unsynced status, is displayed.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1577 for branch in branches:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1578 if len(newmap[branch]) > len(oldmap[branch]):
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1579 return fail_multiple_heads(branch in unsynced, branch)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1580
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1581 # 6. Check for unsynced changes on involved branches.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1582 if unsynced:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1583 self.ui.warn(_("note: unsynced remote changes!\n"))
3684 975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1584
10925 a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1585 else:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1586 # Old servers: Check for new topological heads.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1587 # Code based on _updatebranchcache.
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1588 newheads = set(h for h in remote_heads if h in cl.nodemap)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1589 oldheadcnt = len(newheads)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1590 newheads.update(outg)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1591 if len(newheads) > 1:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1592 for latest in reversed(outg):
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1593 if latest not in newheads:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1594 continue
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1595 minhrev = min(cl.rev(h) for h in newheads)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1596 reachable = cl.reachable(latest, cl.node(minhrev))
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1597 reachable.remove(latest)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1598 newheads.difference_update(reachable)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1599 if len(newheads) > oldheadcnt:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1600 return fail_multiple_heads(inc)
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1601 if inc:
a101a743c570 prepush: rewrite most of the code from scratch Sune Foldager <cryo@cyanite.org> parents: 10908 diff changeset	1602 self.ui.warn(_("note: unsynced remote changes!\n"))
3682 20912eb2667d reorder tests in prepush Matt Mackall <mpm@selenic.com> parents: 3675 diff changeset	1603
1781 284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1604 if revs is None:
7460 3342e6ada4b9 push: use the fast changegroup() path on push Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7435 diff changeset	1605 # use the fast path, no race possible on push
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1606 nodes = self.changelog.findmissing(common.keys())
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1607 cg = self._changegroup(nodes, 'push')
1781 284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1608 else:
1782 b9671b41e360 merge with crew Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1781 1754 diff changeset	1609 cg = self.changegroupsubset(update, revs, 'push')
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1610 return cg, remote_heads
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1611
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1612 def push_addchangegroup(self, remote, force, revs):
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1613 lock = remote.lock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1614 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1615 ret = self.prepush(remote, force, revs)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1616 if ret[0] is not None:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1617 cg, remote_heads = ret
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1618 return remote.addchangegroup(cg, 'push', self.url())
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1619 return ret[1]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1620 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8108 diff changeset	1621 lock.release()
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1622
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1623 def push_unbundle(self, remote, force, revs):
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1624 # local repo finds heads on server, finds out what revs it
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1625 # must push. once revs transferred, if server finds it has
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1626 # different heads (someone else won commit/push race), server
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1627 # aborts.
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1628
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1629 ret = self.prepush(remote, force, revs)
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1630 if ret[0] is not None:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1631 cg, remote_heads = ret
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1632 if force:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1633 remote_heads = ['force']
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1634 return remote.unbundle(cg, remote_heads, 'push')
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1635 return ret[1]
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1636
5763 e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	1637 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	1638 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	1639 self.ui.status(_("%d changesets found\n") % len(nodes))
3513 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1640 if self.ui.debugflag:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	1641 self.ui.debug("list of changesets:\n")
3513 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1642 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	1643 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	1644
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1645 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	1646 """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	1647 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	1648 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	1649 successive changegroup chunks.
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1650
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1651 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	1652 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	1653 is non-trivial.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1654
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1655 Another wrinkle is doing the reverse, figuring out which changeset in
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1656 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	1657
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1658 The caller can specify some nodes that must be included in the
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1659 changegroup using the extranodes argument. It should be a dict
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1660 where the keys are the filenames (or 1 for the manifest), and the
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1661 values are lists of (node, linknode) tuples, where node is a wanted
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1662 node and linknode is the changelog node that should be transmitted as
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1663 the linkrev.
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1664 """
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1665
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1666 # Set up some initial variables
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1667 # 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	1668 cl = self.changelog
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1669 # msng is short for missing - compute the list of changesets in this
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1670 # changegroup.
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1671 if not bases:
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1672 bases = [nullid]
0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1673 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	1674
7233 9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1675 if extranodes is None:
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1676 # 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	1677 heads.sort()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1678 allheads = self.heads()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1679 allheads.sort()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7229 diff changeset	1680 if heads == allheads:
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1681 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	1682
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1683 # slow path
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1684 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1685
5763 e20de0caf8e7 Show number of changesets written to bundle files by default (issue569) Thomas Arendsen Hein <thomas@intevation.de> parents: 5760 diff changeset	1686 self.changegroupinfo(msng_cl_lst, source)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1687 # Some bases may turn out to be superfluous, and some heads may be
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1688 # too. nodesbetween will return the minimal set of bases and heads
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1689 # necessary to re-create the changegroup.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1690
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1691 # Known heads are the list of heads that it is assumed the recipient
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1692 # of this changegroup will know about.
8469 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1693 knownheads = set()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1694 # We assume that all parents of bases are known heads.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1695 for n in bases:
8481 a9dab5a0f85b localrepo: use set.update for bulk updates Martin Geisler <mg@lazybytes.net> parents: 8469 diff changeset	1696 knownheads.update(cl.parents(n))
a9dab5a0f85b localrepo: use set.update for bulk updates Martin Geisler <mg@lazybytes.net> parents: 8469 diff changeset	1697 knownheads.discard(nullid)
8469 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1698 knownheads = list(knownheads)
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1699 if knownheads:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1700 # Now that we know what heads are known, we can compute which
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1701 # changesets are known. The recipient must know about all
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1702 # changesets required to reach the known heads from the null
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1703 # changeset.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1704 has_cl_set, junk, junk = cl.nodesbetween(None, knownheads)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1705 junk = None
8239 f802b4706a53 localrepo: corrected outdated comment Martin Geisler <mg@lazybytes.net> parents: 8238 diff changeset	1706 # Transform the list into a set.
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1707 has_cl_set = set(has_cl_set)
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1708 else:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1709 # If there were no known heads, the recipient cannot be assumed to
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1710 # know about any changesets.
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1711 has_cl_set = set()
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1712
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1713 # 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	1714 mnfst = self.manifest
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1715 # 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	1716 msng_mnfst_set = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1717 # 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	1718 msng_filenode_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1719
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1720 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	1721 junk = None
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1722
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1723 # 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	1724 # 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	1725 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1726 return x
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1727
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1728 # If we determine that a particular file or manifest node must be a
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1729 # node that the recipient of the changegroup will already have, we can
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1730 # also assume the recipient will have all the parents. This function
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1731 # prunes them from the set of missing nodes.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1732 def prune_parents(revlog, hasset, msngset):
10010 2fce96916d97 changegroupsubset: simplify parents pruning Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9955 diff changeset	1733 for r in revlog.ancestors(*[revlog.rev(n) for n in hasset]):
2fce96916d97 changegroupsubset: simplify parents pruning Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9955 diff changeset	1734 msngset.pop(revlog.node(r), None)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1735
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1736 # Use the information collected in collect_manifests_and_files to say
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1737 # which changenode any manifestnode belongs to.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1738 def lookup_manifest_link(mnfstnode):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1739 return msng_mnfst_set[mnfstnode]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1740
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1741 # 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	1742 # 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	1743 def filenode_collector(changedfiles):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1744 # 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	1745 # 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	1746 # 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	1747 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1748 # 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	1749 # 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	1750 # 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	1751 def collect_msng_filenodes(mnfstnode):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1752 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	1753 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	1754 # 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	1755 # we only need to see a diff.
5175 012dbf88b9b2 remove unneeded imports of mdiff Matt Mackall <mpm@selenic.com> parents: 5158 diff changeset	1756 deltamf = mnfst.readdelta(mnfstnode)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1757 # For each line in the delta
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7599 diff changeset	1758 for f, fnode in deltamf.iteritems():
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1759 f = changedfiles.get(f, None)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1760 # 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	1761 # about.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1762 if f is not None:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1763 # Get the changenode this manifest belongs to
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1764 clnode = msng_mnfst_set[mnfstnode]
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1765 # 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	1766 # there isn't one already.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1767 ndset = msng_filenode_set.setdefault(f, {})
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1768 # 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	1769 # 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	1770 ndset.setdefault(fnode, clnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1771 else:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1772 # Otherwise we need a full manifest.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1773 m = mnfst.read(mnfstnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1774 # For every file in we care about.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1775 for f in changedfiles:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1776 fnode = m.get(f, None)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1777 # If it's in the manifest
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1778 if fnode is not None:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1779 # See comments above.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1780 clnode = msng_mnfst_set[mnfstnode]
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1781 ndset = msng_filenode_set.setdefault(f, {})
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1782 ndset.setdefault(fnode, clnode)
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1783 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	1784
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1785 # We have a list of filenodes we think we need for a file, lets remove
8238 f795d24aebc3 localrepo: fixed typos in comments Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	1786 # all those we know the recipient must have.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1787 def prune_filenodes(f, filerevlog):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1788 msngset = msng_filenode_set[f]
8469 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1789 hasset = set()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1790 # 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	1791 # 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	1792 # that filenode.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1793 for n in msngset:
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7237 diff changeset	1794 clnode = cl.node(filerevlog.linkrev(filerevlog.rev(n)))
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1795 if clnode in has_cl_set:
8469 cb897f10e54a localrepo: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8416 diff changeset	1796 hasset.add(n)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1797 prune_parents(filerevlog, hasset, msngset)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1798
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1799 # A function generator function that sets up the a context for the
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1800 # inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1801 def lookup_filenode_link_func(fname):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1802 msngset = msng_filenode_set[fname]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1803 # Lookup the changenode the filenode belongs to.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1804 def lookup_filenode_link(fnode):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1805 return msngset[fnode]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1806 return lookup_filenode_link
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1807
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1808 # Add the nodes that were explicitly requested.
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1809 def add_extra_nodes(name, nodes):
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1810 if not extranodes or name not in extranodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1811 return
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1812
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1813 for node, linknode in extranodes[name]:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1814 if node not in nodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1815 nodes[node] = linknode
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1816
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1817 # 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	1818 # 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	1819 def gengroup():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1820 # The set of changed files starts empty.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1821 changedfiles = {}
10356 bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1822 collect = changegroup.collector(cl, msng_mnfst_set, changedfiles)
10405 2d30d66a89ad whitespace cleanup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10396 diff changeset	1823
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1824 # 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	1825 # 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	1826 group = cl.group(msng_cl_lst, identity, collect)
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1827 cnt = 0
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1828 for chnk in group:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1829 yield chnk
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1830 self.ui.progress(_('bundling changes'), cnt, unit=_('chunks'))
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1831 cnt += 1
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1832 self.ui.progress(_('bundling changes'), None, unit=_('chunks'))
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1833
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1834
10357 0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1835 # Figure out which manifest nodes (of the ones we think might be
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1836 # part of the changegroup) the recipient must know about and
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1837 # remove them from the changegroup.
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1838 has_mnfst_set = set()
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1839 for n in msng_mnfst_set:
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1840 # If a 'missing' manifest thinks it belongs to a changenode
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1841 # the recipient is assumed to have, obviously the recipient
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1842 # must have that manifest.
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1843 linknode = cl.node(mnfst.linkrev(mnfst.rev(n)))
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1844 if linknode in has_cl_set:
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1845 has_mnfst_set.add(n)
0d64b30b35c3 localrepo: inline single-use nested function Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10356 diff changeset	1846 prune_parents(mnfst, has_mnfst_set, msng_mnfst_set)
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1847 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	1848 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	1849 # Sort the manifestnodes by revision number.
9038 93fe89afc611 localrepo: removed unnecessary revkey sort helper Martin Geisler <mg@lazybytes.net> parents: 9032 diff changeset	1850 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	1851 # 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	1852 # and data collection functions back.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1853 group = mnfst.group(msng_mnfst_lst, lookup_manifest_link,
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1854 filenode_collector(changedfiles))
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1855 cnt = 0
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1856 for chnk in group:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1857 yield chnk
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1858 self.ui.progress(_('bundling manifests'), cnt, unit=_('chunks'))
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1859 cnt += 1
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1860 self.ui.progress(_('bundling manifests'), None, unit=_('chunks'))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1861
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1862 # 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	1863 # them.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1864 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	1865 msng_mnfst_set.clear()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1866
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1867 if extranodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1868 for fname in extranodes:
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1869 if isinstance(fname, int):
afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1870 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	1871 msng_filenode_set.setdefault(fname, {})
5908 afa1e6122be7 changegroupsubset: accept list of per-revlog nodes to include Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5907 diff changeset	1872 changedfiles[fname] = 1
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1873 # Go through all our files in order sorted by name.
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1874 cnt = 0
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	1875 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	1876 filerevlog = self.file(fname)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1877 if not len(filerevlog):
5666 9d6ad26fab10 fix spelling error Matt Mackall <mpm@selenic.com> parents: 5657 diff changeset	1878 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	1879 # 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	1880 # missing.
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5913 diff changeset	1881 if fname in msng_filenode_set:
1630 5ecf05541e11 This fixes a bug that Chris Mason found. As for a test case, I can't Eric Hopper <hopper@omnifarious.org> parents: 1621 diff changeset	1882 prune_filenodes(fname, filerevlog)
7134 cb6395fc16a9 fix issue with strip() for revlog with non-monotonic linkrevs (issue1342) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7121 diff changeset	1883 add_extra_nodes(fname, msng_filenode_set[fname])
1630 5ecf05541e11 This fixes a bug that Chris Mason found. As for a test case, I can't Eric Hopper <hopper@omnifarious.org> parents: 1621 diff changeset	1884 msng_filenode_lst = msng_filenode_set[fname].keys()
5ecf05541e11 This fixes a bug that Chris Mason found. As for a test case, I can't Eric Hopper <hopper@omnifarious.org> parents: 1621 diff changeset	1885 else:
5ecf05541e11 This fixes a bug that Chris Mason found. As for a test case, I can't Eric Hopper <hopper@omnifarious.org> parents: 1621 diff changeset	1886 msng_filenode_lst = []
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1887 # 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	1888 # otherwise don't bother.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1889 if len(msng_filenode_lst) > 0:
5368 61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5323 diff changeset	1890 yield changegroup.chunkheader(len(fname))
61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5323 diff changeset	1891 yield fname
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1892 # Sort the filenodes by their revision #
9038 93fe89afc611 localrepo: removed unnecessary revkey sort helper Martin Geisler <mg@lazybytes.net> parents: 9032 diff changeset	1893 msng_filenode_lst.sort(key=filerevlog.rev)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1894 # 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	1895 # 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	1896 # from filenodes.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1897 group = filerevlog.group(msng_filenode_lst,
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1898 lookup_filenode_link_func(fname))
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1899 for chnk in group:
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1900 self.ui.progress(
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1901 _('bundling files'), cnt, item=fname, unit=_('chunks'))
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1902 cnt += 1
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1903 yield chnk
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5913 diff changeset	1904 if fname in msng_filenode_set:
1630 5ecf05541e11 This fixes a bug that Chris Mason found. As for a test case, I can't Eric Hopper <hopper@omnifarious.org> parents: 1621 diff changeset	1905 # Don't need this anymore, toss it to free memory.
5ecf05541e11 This fixes a bug that Chris Mason found. As for a test case, I can't Eric Hopper <hopper@omnifarious.org> parents: 1621 diff changeset	1906 del msng_filenode_set[fname]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1907 # 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	1908 yield changegroup.closechunk()
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1909 self.ui.progress(_('bundling files'), None, unit=_('chunks'))
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1910
2150 f15c6394d90d fix a NameError in changegroupsubset Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2149 diff changeset	1911 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	1912 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	1913
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1914 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	1915
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1916 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	1917 # 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	1918 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	1919
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1920 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	1921 """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	1922 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	1923 successive changegroup chunks.
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1924
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1925 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	1926 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	1927
9820 0b999aec64e8 bundle: don't send too many changesets (Issue1704) Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 9691 diff changeset	1928 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	1929
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1930 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1931
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1932 cl = self.changelog
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1933 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	1934 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	1935
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1936 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1937 return x
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1938
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1939 def gennodelst(log):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1940 for r in log:
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7237 diff changeset	1941 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	1942 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	1943
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1944 def lookuprevlink_func(revlog):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1945 def lookuprevlink(n):
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7237 diff changeset	1946 return cl.node(revlog.linkrev(revlog.rev(n)))
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1947 return lookuprevlink
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1948
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1949 def gengroup():
9437 1c4e4004f3a6 Improve some docstrings relating to changegroups and prepush(). Greg Ward <greg-hg@gerg.ca> parents: 9425 diff changeset	1950 '''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	1951 # construct a list of all changed files
10356 bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1952 changedfiles = {}
bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1953 mmfs = {}
bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1954 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	1955
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1956 cnt = 0
10356 bc2414948012 localrepo: unify changegroup and changegroupsubset code paths a bit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10354 diff changeset	1957 for chnk in cl.group(nodes, identity, collect):
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1958 self.ui.progress(_('bundling changes'), cnt, unit=_('chunks'))
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1959 cnt += 1
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1960 yield chnk
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1961 self.ui.progress(_('bundling changes'), None, unit=_('chunks'))
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1962
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1963 mnfst = self.manifest
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1964 nodeiter = gennodelst(mnfst)
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1965 cnt = 0
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1966 for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)):
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1967 self.ui.progress(_('bundling manifests'), cnt, unit=_('chunks'))
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1968 cnt += 1
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1969 yield chnk
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1970 self.ui.progress(_('bundling manifests'), None, unit=_('chunks'))
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1971
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1972 cnt = 0
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	1973 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	1974 filerevlog = self.file(fname)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1975 if not len(filerevlog):
5666 9d6ad26fab10 fix spelling error Matt Mackall <mpm@selenic.com> parents: 5657 diff changeset	1976 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	1977 nodeiter = gennodelst(filerevlog)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1978 nodeiter = list(nodeiter)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1979 if nodeiter:
5368 61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5323 diff changeset	1980 yield changegroup.chunkheader(len(fname))
61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5323 diff changeset	1981 yield fname
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1982 lookup = lookuprevlink_func(filerevlog)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1983 for chnk in filerevlog.group(nodeiter, lookup):
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1984 self.ui.progress(
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1985 _('bundling files'), cnt, item=fname, unit=_('chunks'))
10432 8a8030fc57d6 localrepo: provide indeterminate progress information while bundling Augie Fackler <durin42@gmail.com> parents: 10430 diff changeset	1986 cnt += 1
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1987 yield chnk
10698 e930017f9e2a progress: use a verb (+noun) in present participle Martin Geisler <mg@lazybytes.net> parents: 10547 diff changeset	1988 self.ui.progress(_('bundling files'), None, unit=_('chunks'))
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1989
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1967 diff changeset	1990 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	1991
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1992 if nodes:
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1993 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	1994
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1995 return util.chunkbuffer(gengroup())
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1996
5907 afb7bdf11a61 addchangegroup: add option to skip check for empty changelog group Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5865 diff changeset	1997 def addchangegroup(self, source, srctype, url, emptyok=False):
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1998 """add changegroup to repo.
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1999
3803 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2000 return values:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2001 - nothing changed or no source: 0
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2002 - more heads than before: 1+added heads (2..n)
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2003 - less heads than before: -1-removed heads (-2..-n)
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2004 - number of heads stays the same: 1
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2005 """
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2006 def csmap(x):
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	2007 self.ui.debug("add changeset %s\n" % short(x))
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	2008 return len(cl)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2009
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2010 def revmap(x):
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	2011 return cl.rev(x)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2012
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	2013 if not source:
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	2014 return 0
1730 0f1d2c75db5e add prechangegroup and pretxnchangegroup hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1721 diff changeset	2015
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	2016 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	2017
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2018 changesets = files = revisions = 0
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	2019
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	2020 # 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	2021 # inconsistent view
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	2022 cl = self.changelog
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	2023 cl.delayupdate()
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	2024 oldheads = len(cl.heads())
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	2025
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2026 tr = self.transaction()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2027 try:
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	2028 trp = weakref.proxy(tr)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2029 # pull off the changeset group
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2030 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	2031 clstart = len(cl)
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2032 class prog(object):
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	2033 step = _('changesets')
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2034 count = 1
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2035 ui = self.ui
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2036 def __call__(self):
10519 f75db9927429 progress: mark units for translation Martin Geisler <mg@lazybytes.net> parents: 10510 diff changeset	2037 self.ui.progress(self.step, self.count, unit=_('chunks'))
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2038 self.count += 1
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2039 pr = prog()
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2040 chunkiter = changegroup.chunkiter(source, progress=pr)
6647 602f7c1ab954 drop superfluous param from revlog.addgroup() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6639 diff changeset	2041 if cl.addgroup(chunkiter, csmap, trp) is None and not emptyok:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2042 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	2043 clend = len(cl)
59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	2044 changesets = clend - clstart
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	2045 self.ui.progress(_('changesets'), None)
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	2046
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2047 # pull off the manifest group
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2048 self.ui.status(_("adding manifests\n"))
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	2049 pr.step = _('manifests')
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2050 pr.count = 1
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2051 chunkiter = changegroup.chunkiter(source, progress=pr)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2052 # no need to check for empty manifest group here:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2053 # if the result of the merge of 1 and 2 is the same in 3 and 4,
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2054 # no new manifest will be created and the manifest group will
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2055 # be empty during the pull
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	2056 self.manifest.addgroup(chunkiter, revmap, trp)
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	2057 self.ui.progress(_('manifests'), None)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2058
10418 5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2059 needfiles = {}
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2060 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	2061 # 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	2062 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	2063 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	2064 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	2065 # 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	2066 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	2067 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	2068
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2069 # process the files
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2070 self.ui.status(_("adding file changes\n"))
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2071 pr.step = 'files'
5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2072 pr.count = 1
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2073 while 1:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2074 f = changegroup.getchunk(source)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2075 if not f:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2076 break
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	2077 self.ui.debug("adding %s revisions\n" % f)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2078 fl = self.file(f)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	2079 o = len(fl)
10430 5cef810e588f localrepo: show indeterminate progress for incoming data Augie Fackler <durin42@gmail.com> parents: 10429 diff changeset	2080 chunkiter = changegroup.chunkiter(source, progress=pr)
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4917 diff changeset	2081 if fl.addgroup(chunkiter, revmap, trp) is None:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2082 raise util.Abort(_("received file revlog group is empty"))
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	2083 revisions += len(fl) - o
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2084 files += 1
10418 5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2085 if f in needfiles:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2086 needs = needfiles[f]
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2087 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	2088 n = fl.node(new)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2089 if n in needs:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2090 needs.remove(n)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2091 if not needs:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2092 del needfiles[f]
10496 45734b51c99b progress: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 10492 diff changeset	2093 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	2094
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2095 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	2096 fl = self.file(f)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2097 for n in needs:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2098 try:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2099 fl.rev(n)
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2100 except error.LookupError:
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2101 raise util.Abort(
5fc090ba08a6 localrepo: add optional validation (defaults to off) for incoming changes Augie Fackler <durin42@gmail.com> parents: 10405 diff changeset	2102 _('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	2103 (f, hex(n)))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2104
8392 7e5cbb09515b localrepo: use cl throughout in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8390 diff changeset	2105 newheads = len(cl.heads())
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2106 heads = ""
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2107 if oldheads and newheads != oldheads:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2108 heads = _(" (%+d heads)") % (newheads - oldheads)
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	2109
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2110 self.ui.status(_("added %d changesets"
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2111 " with %d changes to %d files%s\n")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2112 % (changesets, revisions, files, heads))
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	2113
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2114 if changesets > 0:
8392 7e5cbb09515b localrepo: use cl throughout in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8390 diff changeset	2115 p = lambda: cl.writepending() and self.root or ""
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2116 self.hook('pretxnchangegroup', throw=True,
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	2117 node=hex(cl.node(clstart)), source=srctype,
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	2118 url=url, pending=p)
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	2119
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	2120 # make changelog see real files again
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7728 diff changeset	2121 cl.finalize(trp)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	2122
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2123 tr.close()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2124 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2125 del tr
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	2126
1375 f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	2127 if changesets > 0:
5988 ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5985 diff changeset	2128 # forcefully update the on-disk branch cache
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	2129 self.ui.debug("updating the branch cache\n")
5988 ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5985 diff changeset	2130 self.branchtags()
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	2131 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	2132 source=srctype, url=url)
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	2133
8393 59160ca338f7 localrepo: use more direct vars in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8392 diff changeset	2134 for i in xrange(clstart, clend):
8392 7e5cbb09515b localrepo: use cl throughout in addchangegroup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8390 diff changeset	2135 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	2136 source=srctype, url=url)
1316 b650bfdfc7ee Hook fixups mpm@selenic.com parents: 1280 diff changeset	2137
3803 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2138 # never return 0 here:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2139 if newheads < oldheads:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2140 return newheads - oldheads - 1
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2141 else:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3801 diff changeset	2142 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	2143
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	2144
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2145 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	2146 fp = remote.stream_out()
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2147 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2148 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2149 resp = int(l)
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2150 except ValueError:
7641 d2f753830f80 error: move UnexpectedOutput (now ResponseError) Matt Mackall <mpm@selenic.com> parents: 7640 diff changeset	2151 raise error.ResponseError(
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2152 _('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	2153 if resp == 1:
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	2154 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	2155 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	2156 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	2157 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	2158 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	2159 self.ui.status(_('streaming all changes\n'))
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2160 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2161 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2162 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	2163 except (ValueError, TypeError):
7641 d2f753830f80 error: move UnexpectedOutput (now ResponseError) Matt Mackall <mpm@selenic.com> parents: 7640 diff changeset	2164 raise error.ResponseError(
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2165 _('Unexpected response from remote server:'), l)
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2166 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	2167 (total_files, util.bytecount(total_bytes)))
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2168 start = time.time()
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2169 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	2170 # XXX doesn't support '\n' or '\r' in filenames
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2171 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2172 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2173 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: 3513 diff changeset	2174 size = int(size)
7063 be2daa324ddf Add missing catch of a TypeError Bernhard Leiner <bleiner@gmail.com> parents: 6877 diff changeset	2175 except (ValueError, TypeError):
7641 d2f753830f80 error: move UnexpectedOutput (now ResponseError) Matt Mackall <mpm@selenic.com> parents: 7640 diff changeset	2176 raise error.ResponseError(
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	2177 _('Unexpected response from remote server:'), l)
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9437 diff changeset	2178 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	2179 # 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	2180 ofp = self.sopener(store.decodedir(name), 'w')
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2181 for chunk in util.filechunkiter(fp, limit=size):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2182 ofp.write(chunk)
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2183 ofp.close()
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2184 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	2185 if elapsed <= 0:
43d8f7466920 localrepo: stream_in may raise ZeroDivisionError with nul float elapsed argument. Patrick Mezard <pmezard@gmail.com> parents: 4058 diff changeset	2186 elapsed = 0.001
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2187 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	2188 (util.bytecount(total_bytes), elapsed,
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2189 util.bytecount(total_bytes / elapsed)))
4613 3a645af7fb76 localrepo and dirstate: rename reload to invalidate Matt Mackall <mpm@selenic.com> parents: 4582 diff changeset	2190 self.invalidate()
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2191 return len(self.heads()) + 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	2192
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	2193 def clone(self, remote, heads=[], stream=False):
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2194 '''clone remote repository.
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2195
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2196 keyword arguments:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2197 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	2198 stream: use streaming clone if possible'''
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2199
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	2200 # 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	2201 # 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	2202 # them.
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2203
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2204 # 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	2205 # 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	2206 # uncompressed only if compatible.
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2207
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	2208 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	2209 return self.stream_in(remote)
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	2210 return self.pull(remote, heads)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2211
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2212 # used to avoid circular references so destructors work
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3773 diff changeset	2213 def aftertrans(files):
f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3773 diff changeset	2214 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	2215 def a():
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3773 diff changeset	2216 for src, dest in renamefiles:
f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3773 diff changeset	2217 util.rename(src, dest)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2218 return a
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2219
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	2220 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	2221 return localrepository(ui, util.drop_scheme('file', path), create)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3164 diff changeset	2222
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	2223 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	2224 return True

Mercurial > public > mercurial-scm > hg

annotate mercurial/localrepo.py @ 11154:17031fea4e95 stable