mercurial-crew-with-dirclash: mercurial/localrepo.py annotate

annotate mercurial/localrepo.py @ 5141:d316124ebbea

Make audit_path more stringent. The following properties of a path are now checked for: - under top-level .hg - starts at the root of a windows drive - contains ".." - traverses a symlink (e.g. a/symlink_here/b) - inside a nested repository If any of these is true, the path is rejected. The check for traversing a symlink is arguably stricter than necessary; perhaps we should be checking for symlinks that point outside the repository.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Fri, 10 Aug 2007 10:46:03 -0700
parents	2ffe3e2a1ac2
children	012dbf88b9b2

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 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	5 # This software may be used and distributed according to the terms
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7
1100 d6b6a15cc7c6 localrepo: more import/namespace tidying mpm@selenic.com parents: 1097 diff changeset	8 from node import *
3893 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3886 diff changeset	9 from i18n import _
4270 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4267 diff changeset	10 import repo, changegroup
4960 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	11 import changelog, dirstate, filelog, manifest, context, weakref
3886 abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3885 diff changeset	12 import re, lock, transaction, tempfile, stat, mdiff, errno, ui
4623 fff50306e6dd hooks: separate hook code into a separate module Matt Mackall <mpm@selenic.com> parents: 4620 diff changeset	13 import os, revlog, time, util, extensions, hook
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	14
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	15 class localrepository(repo.repository):
3448 6ca49c5fe268 Stop erroring out pull -r and clone -r if repository isn't local. Eric Hopper <hopper@omnifarious.org> parents: 3443 diff changeset	16 capabilities = ('lookup', 'changegroupsubset')
3853 c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	17 supported = ('revlogv1', 'store')
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	18
1839 876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1838 diff changeset	19 def __init__(self, parentui, path=None, create=0):
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	20 repo.repository.__init__(self)
4555 1843d31bfdbf localrepo: don't search from path Matt Mackall <mpm@selenic.com> parents: 4541 diff changeset	21 self.path = path
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3797 diff changeset	22 self.root = os.path.realpath(path)
4171 7b5723c95a82 Save an absolute path in repo.path Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4168 diff changeset	23 self.path = os.path.join(self.root, ".hg")
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3797 diff changeset	24 self.origroot = path
a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3797 diff changeset	25 self.opener = util.opener(self.path)
a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3797 diff changeset	26 self.wopener = util.opener(self.root)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	27
3032 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	28 if not os.path.isdir(self.path):
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	29 if create:
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	30 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: 3016 diff changeset	31 os.mkdir(path)
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	32 os.mkdir(self.path)
4166 c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	33 requirements = ["revlogv1"]
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	34 if parentui.configbool('format', 'usestore', True):
4164 fe41d9a186ab Allow disabling store format to work with absurdly long filenames Matt Mackall <mpm@selenic.com> parents: 4161 diff changeset	35 os.mkdir(os.path.join(self.path, "store"))
4166 c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	36 requirements.append("store")
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	37 # create an invalid changelog
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	38 self.opener("00changelog.i", "a").write(
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	39 '\0\0\0\2' # represents revlogv2
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	40 ' dummy changelog to prevent using the old repo layout'
c0271aba6abe small fixes for the parent patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4164 diff changeset	41 )
3851 8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	42 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	43 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	44 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	45 reqfile.close()
3032 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	46 else:
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	47 raise repo.RepoError(_("repository %s not found") % path)
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	48 elif create:
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	49 raise repo.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	50 else:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	51 # find requirements
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	52 try:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	53 requirements = self.opener("requires").read().splitlines()
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	54 except IOError, inst:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	55 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	56 raise
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	57 requirements = []
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	58 # check them
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	59 for r in requirements:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	60 if r not in self.supported:
8f18e31c4441 add "requires" file to the repo, specifying the requirements Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3850 diff changeset	61 raise repo.RepoError(_("requirement '%s' not supported") % r)
405 99470ae6b424 Check if repository exists mpm@selenic.com parents: 402 diff changeset	62
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3797 diff changeset	63 # setup store
3853 c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	64 if "store" in requirements:
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	65 self.encodefn = util.encodefilename
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	66 self.decodefn = util.decodefilename
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	67 self.spath = os.path.join(self.path, "store")
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	68 else:
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	69 self.encodefn = lambda x: x
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	70 self.decodefn = lambda x: x
c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	71 self.spath = self.path
5141 d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5116 diff changeset	72 self.sopener = util.encodedopener(util.opener(self.spath),
d316124ebbea Make audit_path more stringent. Bryan O'Sullivan <bos@serpentine.com> parents: 5116 diff changeset	73 self.encodefn)
3850 a4457828ca1a move code around Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3797 diff changeset	74
1839 876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1838 diff changeset	75 self.ui = ui.ui(parentui=parentui)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	76 try:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	77 self.ui.readconfig(self.join("hgrc"), self.root)
4619 7c8f8b736365 extensions: kill ui readhooks Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	78 extensions.loadall(self.ui)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	79 except IOError:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	80 pass
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	81
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	82 self.tagscache = None
3432 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3375 diff changeset	83 self.branchcache = None
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	84 self.nodetagscache = None
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	85 self.filterpats = {}
4960 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	86 self._transref = self._lockref = self._wlockref = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	87
4580 eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	88 def __getattr__(self, name):
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	89 if name == 'changelog':
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	90 self.changelog = changelog.changelog(self.sopener)
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	91 self.sopener.defversion = self.changelog.version
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	92 return self.changelog
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	93 if name == 'manifest':
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	94 self.changelog
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	95 self.manifest = manifest.manifest(self.sopener)
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	96 return self.manifest
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	97 if name == 'dirstate':
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	98 self.dirstate = dirstate.dirstate(self.opener, self.ui, self.root)
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	99 return self.dirstate
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	100 else:
eda59019dc69 localrepo: demand-load changeset, manifest, and dirstate Matt Mackall <mpm@selenic.com> parents: 4556 diff changeset	101 raise AttributeError, name
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	102
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	103 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	104 return 'file:' + self.root
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	105
1718 c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	106 def hook(self, name, throw=False, **args):
4623 fff50306e6dd hooks: separate hook code into a separate module Matt Mackall <mpm@selenic.com> parents: 4620 diff changeset	107 return hook.hook(self.ui, self, name, throw, **args)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	108
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	109 tag_disallowed = ':\r\n'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	110
4854 fc389dcc33f5 Export extra in _tag so convert can set the branch of a tag Brendan Cully <brendan@kublai.com> parents: 4648 diff changeset	111 def _tag(self, name, node, message, local, user, date, parent=None,
fc389dcc33f5 Export extra in _tag so convert can set the branch of a tag Brendan Cully <brendan@kublai.com> parents: 4648 diff changeset	112 extra={}):
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	113 use_dirstate = parent is None
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	114
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	115 for c in self.tag_disallowed:
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	116 if c in name:
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	117 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	118
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	119 self.hook('pretag', throw=True, node=hex(node), tag=name, local=local)
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	120
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	121 def writetag(fp, name, munge, prevtags):
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	122 if prevtags and prevtags[-1] != '\n':
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	123 fp.write('\n')
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	124 fp.write('%s %s\n' % (hex(node), munge and munge(name) or name))
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	125 fp.close()
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	126 self.hook('tag', node=hex(node), tag=name, local=local)
5115 ea7b982b6c08 Remove trailing spaces Thomas Arendsen Hein <thomas@intevation.de> parents: 4913 diff changeset	127
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	128 prevtags = ''
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	129 if local:
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	130 try:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	131 fp = self.opener('localtags', 'r+')
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	132 except IOError, err:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	133 fp = self.opener('localtags', 'a')
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	134 else:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	135 prevtags = fp.read()
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	136
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	137 # local tags are stored in the current charset
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	138 writetag(fp, name, None, prevtags)
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	139 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	140
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	141 if use_dirstate:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	142 try:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	143 fp = self.wfile('.hgtags', 'rb+')
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	144 except IOError, err:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	145 fp = self.wfile('.hgtags', 'ab')
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	146 else:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	147 prevtags = fp.read()
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	148 else:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	149 try:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	150 prevtags = self.filectx('.hgtags', parent).data()
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	151 except revlog.LookupError:
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	152 pass
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	153 fp = self.wfile('.hgtags', 'wb')
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	154
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	155 # committed tags are stored in UTF-8
4913 f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	156 writetag(fp, name, util.fromlocal, prevtags)
f0c25ed40ec6 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) Bryan O'Sullivan <bos@serpentine.com> parents: 4910 diff changeset	157
4950 30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	158 if use_dirstate and '.hgtags' not in self.dirstate:
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	159 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	160
4854 fc389dcc33f5 Export extra in _tag so convert can set the branch of a tag Brendan Cully <brendan@kublai.com> parents: 4648 diff changeset	161 tagnode = self.commit(['.hgtags'], message, user, date, p1=parent,
fc389dcc33f5 Export extra in _tag so convert can set the branch of a tag Brendan Cully <brendan@kublai.com> parents: 4648 diff changeset	162 extra=extra)
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	163
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 self.hook('tag', node=hex(node), tag=name, local=local)
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
35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	166 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	167
2974 eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2972 diff changeset	168 def tag(self, name, 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	169 '''tag a revision with a symbolic name.
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	170
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	171 if local is True, the tag is stored in a per-repository file.
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	172 otherwise, it is stored in the .hgtags file, and a new
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	173 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	174
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	175 keyword arguments:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	176
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	177 local: whether to store tag in non-version-controlled file
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	178 (default False)
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	179
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	180 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	181
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	182 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	183
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	184 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	185
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2858 diff changeset	186 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	187 if '.hgtags' in x:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	188 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	189 '(please commit .hgtags manually)'))
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	190
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	191
4116 35b39097c3e6 Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo Brendan Cully <brendan@kublai.com> parents: 4070 diff changeset	192 self._tag(name, 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	193
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	194 def tags(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	195 '''return a mapping of tag to node'''
4214 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	196 if self.tagscache:
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	197 return self.tagscache
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	198
4215 e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	199 globaltags = {}
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	200
4214 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	201 def readtags(lines, fn):
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	202 filetags = {}
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	203 count = 0
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	204
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	205 def warn(msg):
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	206 self.ui.warn(_("%s, line %s: %s\n") % (fn, count, msg))
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	207
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	208 for l in lines:
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	209 count += 1
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	210 if not l:
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	211 continue
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	212 s = l.split(" ", 1)
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	213 if len(s) != 2:
4214 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	214 warn(_("cannot parse entry"))
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	215 continue
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	216 node, key = s
3773 73860ffbe798 Handle transcoding of tags Matt Mackall <mpm@selenic.com> parents: 3761 diff changeset	217 key = util.tolocal(key.strip()) # stored in UTF-8
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	218 try:
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	219 bin_n = bin(node)
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	220 except TypeError:
4214 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	221 warn(_("node '%s' is not well formed") % node)
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	222 continue
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	223 if bin_n not in self.changelog.nodemap:
4214 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	224 warn(_("tag '%s' refers to unknown node") % key)
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	225 continue
4215 e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	226
4272 fe7f38dda34b tags: fix abababa case, with test case Matt Mackall <mpm@selenic.com> parents: 4229 diff changeset	227 h = []
4215 e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	228 if key in filetags:
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	229 n, h = filetags[key]
4272 fe7f38dda34b tags: fix abababa case, with test case Matt Mackall <mpm@selenic.com> parents: 4229 diff changeset	230 h.append(n)
4215 e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	231 filetags[key] = (bin_n, h)
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	232
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4623 diff changeset	233 for k, nh in filetags.items():
4215 e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	234 if k not in globaltags:
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	235 globaltags[k] = nh
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	236 continue
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	237 # we prefer the global tag if:
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	238 # it supercedes us OR
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	239 # mutual supercedes and it has a higher rank
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	240 # otherwise we win because we're tip-most
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	241 an, ah = nh
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	242 bn, bh = globaltags[k]
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4623 diff changeset	243 if (bn != an and an in bh and
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4623 diff changeset	244 (bn not in ah or len(bh) > len(ah))):
4215 e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	245 an = bn
4494 99f411ba0380 use .extend instead of .append in readtags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4415 diff changeset	246 ah.extend([n for n in bh if n not in ah])
4215 e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	247 globaltags[k] = an, ah
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	248
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	249 # read the tags file from each head, ending with the tip
4214 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	250 f = None
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	251 for rev, node, fnode in self._hgtagsnodes():
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	252 f = (f and f.filectx(fnode) or
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	253 self.filectx('.hgtags', fileid=fnode))
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	254 readtags(f.data().splitlines(), f)
3497 3464f5e77f34 Minor tags optimization Matt Mackall <mpm@selenic.com> parents: 3496 diff changeset	255
4214 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	256 try:
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	257 data = util.fromlocal(self.opener("localtags").read())
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	258 # localtags are stored in the local character set
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	259 # while the internal tag table is stored in UTF-8
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	260 readtags(data.splitlines(), "localtags")
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	261 except IOError:
caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	262 pass
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	263
4215 e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	264 self.tagscache = {}
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	265 for k,nh in globaltags.items():
e29f2db5ab18 Make the tags algorithm smarter Matt Mackall <mpm@selenic.com> parents: 4214 diff changeset	266 n = nh[0]
4217 3be4785f8994 tags: add --remove Matt Mackall <mpm@selenic.com> parents: 4216 diff changeset	267 if n != nullid:
3be4785f8994 tags: add --remove Matt Mackall <mpm@selenic.com> parents: 4216 diff changeset	268 self.tagscache[k] = n
4214 caff92047e87 Refactor tags code to prepare for improving the algorithm Matt Mackall <mpm@selenic.com> parents: 4206 diff changeset	269 self.tagscache['tip'] = self.changelog.tip()
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	270
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	271 return self.tagscache
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	272
3577 7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	273 def _hgtagsnodes(self):
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	274 heads = self.heads()
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	275 heads.reverse()
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	276 last = {}
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	277 ret = []
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	278 for node in heads:
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	279 c = self.changectx(node)
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	280 rev = c.rev()
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	281 try:
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	282 fnode = c.filenode('.hgtags')
3930 01d98d68d697 Add revlog.LookupError exception, and use it instead of RevlogError. Brendan Cully <brendan@kublai.com> parents: 3928 diff changeset	283 except revlog.LookupError:
3577 7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	284 continue
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	285 ret.append((rev, node, fnode))
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	286 if fnode in last:
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	287 ret[last[fnode]] = None
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	288 last[fnode] = len(ret) - 1
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	289 return [item for item in ret if item]
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	290
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	291 def tagslist(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	292 '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	293 l = []
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	294 for t, n in self.tags().items():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	295 try:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	296 r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	297 except:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	298 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	299 l.append((r, t, n))
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	300 l.sort()
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	301 return [(t, n) for r, t, n in l]
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	302
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	303 def nodetags(self, node):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	304 '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	305 if not self.nodetagscache:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	306 self.nodetagscache = {}
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	307 for t, n in self.tags().items():
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	308 self.nodetagscache.setdefault(n, []).append(t)
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	309 return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	310
3823 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	311 def _branchtags(self):
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	312 partial, last, lrev = self._readbranchcache()
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	313
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	314 tiprev = self.changelog.count() - 1
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	315 if lrev != tiprev:
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	316 self._updatebranchcache(partial, lrev+1, tiprev+1)
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	317 self._writebranchcache(partial, self.changelog.tip(), tiprev)
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	318
3823 b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	319 return partial
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	320
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	321 def branchtags(self):
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	322 if self.branchcache is not None:
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	323 return self.branchcache
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	324
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	325 self.branchcache = {} # avoid recursion in changectx
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	326 partial = self._branchtags()
b3b868113d24 fix encoding conversion of branch names when mq is loaded Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3797 diff changeset	327
3774 b1eeaeb936ae Handle transcoding of branch names Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	328 # the branch cache is stored on disk as UTF-8, but in the local
b1eeaeb936ae Handle transcoding of branch names Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	329 # charset internally
b1eeaeb936ae Handle transcoding of branch names Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	330 for k, v in partial.items():
b1eeaeb936ae Handle transcoding of branch names Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	331 self.branchcache[util.tolocal(k)] = v
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	332 return self.branchcache
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	333
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	334 def _readbranchcache(self):
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	335 partial = {}
3432 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3375 diff changeset	336 try:
4205 a7af0eeae8a3 Move branches.cache to branch.cache Matt Mackall <mpm@selenic.com> parents: 4204 diff changeset	337 f = self.opener("branch.cache")
3650 6f6696962986 don't use readline() to read branches.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3627 diff changeset	338 lines = f.read().split('\n')
6f6696962986 don't use readline() to read branches.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3627 diff changeset	339 f.close()
4415 1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	340 except (IOError, OSError):
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	341 return {}, nullid, nullrev
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	342
1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	343 try:
4167 4574a8cb080f Store empty (default) branch in branch cache, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 4128 diff changeset	344 last, lrev = lines.pop(0).split(" ", 1)
3432 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3375 diff changeset	345 last, lrev = bin(last), int(lrev)
3761 9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	346 if not (lrev < self.changelog.count() and
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	347 self.changelog.node(lrev) == last): # sanity check
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	348 # invalidate the cache
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	349 raise ValueError('Invalid branch cache: unknown tip')
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	350 for l in lines:
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	351 if not l: continue
4167 4574a8cb080f Store empty (default) branch in branch cache, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 4128 diff changeset	352 node, label = l.split(" ", 1)
4574a8cb080f Store empty (default) branch in branch cache, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 4128 diff changeset	353 partial[label.strip()] = bin(node)
3761 9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	354 except (KeyboardInterrupt, util.SignalInterrupt):
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	355 raise
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	356 except Exception, inst:
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3733 diff changeset	357 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	358 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	359 partial, last, lrev = {}, nullid, nullrev
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	360 return partial, last, lrev
3432 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3375 diff changeset	361
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	362 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	363 try:
4329 cea5ba038a1d use atomictemp files to write branch.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4272 diff changeset	364 f = self.opener("branch.cache", "w", atomictemp=True)
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	365 f.write("%s %s\n" % (hex(tip), tiprev))
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	366 for label, node in branches.iteritems():
3452 fcf14d87e0a4 If we can't write the branch cache, fail quietly. Matt Mackall <mpm@selenic.com> parents: 3450 diff changeset	367 f.write("%s %s\n" % (hex(node), label))
4329 cea5ba038a1d use atomictemp files to write branch.cache Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4272 diff changeset	368 f.rename()
4415 1a63b44f90c9 branch.cache: silently ignore I/O and OS errors Matt Mackall <mpm@selenic.com> parents: 4329 diff changeset	369 except (IOError, OSError):
3452 fcf14d87e0a4 If we can't write the branch cache, fail quietly. Matt Mackall <mpm@selenic.com> parents: 3450 diff changeset	370 pass
3432 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3375 diff changeset	371
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	372 def _updatebranchcache(self, partial, start, end):
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	373 for r in xrange(start, end):
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	374 c = self.changectx(r)
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	375 b = c.branch()
4167 4574a8cb080f Store empty (default) branch in branch cache, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 4128 diff changeset	376 partial[b] = c.node()
3485 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3468 diff changeset	377
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	378 def lookup(self, key):
3433 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3432 diff changeset	379 if key == '.':
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4497 diff changeset	380 key, second = self.dirstate.parents()
3433 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3432 diff changeset	381 if key == nullid:
5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3432 diff changeset	382 raise repo.RepoError(_("no revision checked out"))
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4497 diff changeset	383 if second != nullid:
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4497 diff changeset	384 self.ui.warn(_("warning: working directory has two parents, "
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4497 diff changeset	385 "tag '.' uses the first\n"))
3795 bd7011246fab Add "null" pseudo-tag pointing to nullid Brendan Cully <brendan@kublai.com> parents: 3791 diff changeset	386 elif key == 'null':
bd7011246fab Add "null" pseudo-tag pointing to nullid Brendan Cully <brendan@kublai.com> parents: 3791 diff changeset	387 return nullid
3494 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	388 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	389 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	390 return n
3433 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3432 diff changeset	391 if key in self.tags():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	392 return self.tags()[key]
3433 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3432 diff changeset	393 if key in self.branchtags():
5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3432 diff changeset	394 return self.branchtags()[key]
3494 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	395 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	396 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	397 return n
4960 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	398 try:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	399 if len(key) == 20:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	400 key = hex(key)
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	401 except:
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	402 pass
3494 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	403 raise repo.RepoError(_("unknown revision '%s'") % key)
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	404
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	405 def dev(self):
2448 b77a2ef61b81 replace os.stat with os.lstat in some where. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	406 return os.lstat(self.path).st_dev
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	407
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	408 def local(self):
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1100 diff changeset	409 return True
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	410
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	411 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	412 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	413
3498 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3497 diff changeset	414 def sjoin(self, f):
3853 c0b449154a90 switch to the .hg/store layout, fix the tests Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3851 diff changeset	415 f = self.encodefn(f)
3791 8643b9f90b51 introduce localrepo.spath for the store path, sopener fixes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3790 diff changeset	416 return os.path.join(self.spath, f)
3498 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3497 diff changeset	417
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	418 def wjoin(self, f):
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	419 return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	420
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	421 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	422 if f[0] == '/':
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	423 f = f[1:]
4267 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4232 diff changeset	424 return filelog.filelog(self.sopener, f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	425
3127 81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3076 diff changeset	426 def changectx(self, changeid=None):
2564 55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	427 return context.changectx(self, changeid)
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	428
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3197 diff changeset	429 def workingctx(self):
8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3197 diff changeset	430 return context.workingctx(self)
8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3197 diff changeset	431
3196 1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	432 def parents(self, changeid=None):
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	433 '''
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	434 get list of changectxs for parents of changeid or working directory
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	435 '''
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	436 if changeid is None:
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	437 pl = self.dirstate.parents()
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	438 else:
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	439 n = self.changelog.lookup(changeid)
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	440 pl = self.changelog.parents(n)
3197 ff15ba23c1cf localrepo.parents: return null context for no parents Matt Mackall <mpm@selenic.com> parents: 3196 diff changeset	441 if pl[1] == nullid:
ff15ba23c1cf localrepo.parents: return null context for no parents Matt Mackall <mpm@selenic.com> parents: 3196 diff changeset	442 return [self.changectx(pl[0])]
ff15ba23c1cf localrepo.parents: return null context for no parents Matt Mackall <mpm@selenic.com> parents: 3196 diff changeset	443 return [self.changectx(pl[0]), self.changectx(pl[1])]
3196 1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3127 diff changeset	444
2564 55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	445 def filectx(self, path, changeid=None, fileid=None):
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	446 """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	447 fileid can be a file revision or node."""
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	448 return context.filectx(self, path, changeid, fileid)
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	449
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	450 def getcwd(self):
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	451 return self.dirstate.getcwd()
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	452
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4516 diff changeset	453 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	454 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	455
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	456 def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	457 return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	458
4265 81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4263 diff changeset	459 def _link(self, f):
81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4263 diff changeset	460 return os.path.islink(self.wjoin(f))
81402b2b294d use os.path.islink instead of util.is_link; remove util.is_link Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4263 diff changeset	461
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	462 def _filter(self, filter, filename, data):
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	463 if filter not in self.filterpats:
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	464 l = []
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	465 for pat, cmd in self.ui.configitems(filter):
1947 65aff2ed61ae fix the call to util.matcher (the args should be (reporoot, cwd, ...)) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1938 diff changeset	466 mf = util.matcher(self.root, "", [pat], [], [])[1]
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	467 l.append((mf, cmd))
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	468 self.filterpats[filter] = l
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	469
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	470 for mf, cmd in self.filterpats[filter]:
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	471 if mf(filename):
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	472 self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	473 data = util.filter(data, cmd)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	474 break
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	475
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	476 return data
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	477
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	478 def wread(self, filename):
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	479 if self._link(filename):
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	480 data = os.readlink(self.wjoin(filename))
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	481 else:
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	482 data = self.wopener(filename, 'r').read()
c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	483 return self._filter("encode", filename, data)
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	484
4006 67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	485 def wwrite(self, filename, data, flags):
4004 c83c35f2f4e2 unify encode/decode filter routines Matt Mackall <mpm@selenic.com> parents: 4003 diff changeset	486 data = self._filter("decode", filename, data)
4006 67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	487 if "l" in flags:
4860 0403b80352c9 localrepo.wwrite: use opener.symlink Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4648 diff changeset	488 self.wopener.symlink(data, filename)
4006 67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	489 else:
67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	490 try:
67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	491 if self._link(filename):
67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	492 os.unlink(self.wjoin(filename))
67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	493 except OSError:
67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	494 pass
67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	495 self.wopener(filename, 'w').write(data)
67982d3ee76c symlinks: add flags param to wwrite Matt Mackall <mpm@selenic.com> parents: 4005 diff changeset	496 util.set_exec(self.wjoin(filename), "x" in flags)
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	497
4005 656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 4004 diff changeset	498 def wwritedata(self, filename, data):
656e06eebda7 replace filehandle version of wwrite with wwritedata Matt Mackall <mpm@selenic.com> parents: 4004 diff changeset	499 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	500
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	501 def transaction(self):
4960 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	502 if self._transref and self._transref():
5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	503 return self._transref().nest()
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	504
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2354 diff changeset	505 # save dirstate for rollback
263 e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	506 try:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	507 ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	508 except IOError:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	509 ds = ""
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	510 self.opener("journal.dirstate", "w").write(ds)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	511
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	512 renames = [(self.sjoin("journal"), self.sjoin("undo")),
f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	513 (self.join("journal.dirstate"), self.join("undo.dirstate"))]
3498 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3497 diff changeset	514 tr = transaction.transaction(self.ui.warn, self.sopener,
ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3497 diff changeset	515 self.sjoin("journal"),
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	516 aftertrans(renames))
4960 5c5d23d93447 Use a weakref for recursive transactions Matt Mackall <mpm@selenic.com> parents: 4959 diff changeset	517 self._transref = weakref.ref(tr)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	518 return tr
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	519
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	520 def recover(self):
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	521 l = self.lock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	522 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	523 if os.path.exists(self.sjoin("journal")):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	524 self.ui.status(_("rolling back interrupted transaction\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	525 transaction.rollback(self.sopener, self.sjoin("journal"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	526 self.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	527 return True
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	528 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	529 self.ui.warn(_("no interrupted transaction available\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	530 return False
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	531 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	532 del l
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	533
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	534 def rollback(self):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	535 wlock = lock = None
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	536 try:
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	537 wlock = self.wlock()
4438 3900f684a150 Fix hg import --exact bug that hangs hg on failure. Eric Hopper <hopper@omnifarious.org> parents: 4417 diff changeset	538 lock = self.lock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	539 if os.path.exists(self.sjoin("undo")):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	540 self.ui.status(_("rolling back last transaction\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	541 transaction.rollback(self.sopener, self.sjoin("undo"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	542 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	543 self.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	544 self.dirstate.invalidate()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	545 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	546 self.ui.warn(_("no rollback information available\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	547 finally:
5053 47a8ea1eb2c3 del transaction before lock before wlock Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5041 diff changeset	548 del lock, wlock
162 5dcbe4d9a30c Implement recover and undo commands mpm@selenic.com parents: 161 diff changeset	549
4614 3a645af7fb76 localrepo and dirstate: rename reload to invalidate Matt Mackall <mpm@selenic.com> parents: 4582 diff changeset	550 def invalidate(self):
3a645af7fb76 localrepo and dirstate: rename reload to invalidate Matt Mackall <mpm@selenic.com> parents: 4582 diff changeset	551 for a in "changelog manifest".split():
3a645af7fb76 localrepo and dirstate: rename reload to invalidate Matt Mackall <mpm@selenic.com> parents: 4582 diff changeset	552 if hasattr(self, a):
3a645af7fb76 localrepo and dirstate: rename reload to invalidate Matt Mackall <mpm@selenic.com> parents: 4582 diff changeset	553 self.__delattr__(a)
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	554 self.tagscache = None
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	555 self.nodetagscache = None
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	556
4957 46e39935ce33 rename and simplify do_lock Matt Mackall <mpm@selenic.com> parents: 4956 diff changeset	557 def _lock(self, lockname, wait, releasefn, acquirefn, desc):
161 0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	558 try:
3498 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3497 diff changeset	559 l = lock.lock(lockname, 0, releasefn, desc=desc)
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	560 except lock.LockHeld, inst:
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	561 if not wait:
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	562 raise
3688 d92dad355000 Corrected "waiting for lock on repository FOO held by BAR" message. Thomas Arendsen Hein <thomas@intevation.de> parents: 3687 diff changeset	563 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	564 (desc, inst.locker))
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	565 # default to 600 seconds timeout
3498 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3497 diff changeset	566 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	567 releasefn, desc=desc)
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	568 if acquirefn:
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	569 acquirefn()
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	570 return l
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	571
4958 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4957 diff changeset	572 def lock(self, wait=True):
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	573 if self._lockref and self._lockref():
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	574 return self._lockref()
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	575
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	576 l = self._lock(self.sjoin("lock"), wait, None, self.invalidate,
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	577 _('repository %s') % self.origroot)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	578 self._lockref = weakref.ref(l)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	579 return l
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	580
4958 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4957 diff changeset	581 def wlock(self, wait=True):
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	582 if self._wlockref and self._wlockref():
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	583 return self._wlockref()
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	584
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	585 l = self._lock(self.join("wlock"), wait, self.dirstate.write,
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	586 self.dirstate.invalidate, _('working directory of %s') %
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	587 self.origroot)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	588 self._wlockref = weakref.ref(l)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	589 return l
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	590
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	591 def filecommit(self, fn, manifest1, manifest2, linkrev, tr, changelist):
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	592 """
3300 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	593 commit an individual file as part of a larger transaction
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	594 """
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	595
3300 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	596 t = self.wread(fn)
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	597 fl = self.file(fn)
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	598 fp1 = manifest1.get(fn, nullid)
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	599 fp2 = manifest2.get(fn, nullid)
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	600
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	601 meta = {}
3300 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	602 cp = self.dirstate.copied(fn)
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	603 if cp:
4058 e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	604 # 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	605 # 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	606 # of this new revision. If this is a merge, the first
4058 e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	607 # parent will be the nullid (meaning "look up the copy data")
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	608 # and the second one will be the other parent. For example:
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	609 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	610 # 0 --- 1 --- 3 rev1 changes file foo
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	611 # \ / rev2 renames foo to bar and changes it
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	612 # \- 2 -/ rev3 should have bar with all changes and
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	613 # should record that bar descends from
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	614 # bar in rev2 and foo in rev1
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	615 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	616 # this allows this merge to succeed:
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	617 #
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	618 # 0 --- 1 --- 3 rev4 reverts the content change from rev2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	619 # \ / merging rev3 and rev4 should use bar@rev2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	620 # \- 2 --- 4 as the merge base
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	621 #
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	622 meta["copy"] = cp
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	623 if not manifest2: # not a branch merge
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	624 meta["copyrev"] = hex(manifest1.get(cp, nullid))
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	625 fp2 = nullid
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	626 elif fp2 != nullid: # copied on remote side
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	627 meta["copyrev"] = hex(manifest1.get(cp, nullid))
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	628 elif fp1 != nullid: # copied on local side, reversed
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	629 meta["copyrev"] = hex(manifest2.get(cp))
4058 e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3925 diff changeset	630 fp2 = fp1
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	631 else: # directory rename
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3721 diff changeset	632 meta["copyrev"] = hex(manifest1.get(cp, nullid))
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	633 self.ui.debug(_(" %s: copy %s:%s\n") %
3300 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	634 (fn, cp, meta["copyrev"]))
3295 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	635 fp1 = nullid
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	636 elif fp2 != nullid:
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	637 # is one parent an ancestor of the other?
3300 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	638 fpa = fl.ancestor(fp1, fp2)
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	639 if fpa == fp1:
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	640 fp1, fp2 = fp2, nullid
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	641 elif fpa == fp2:
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	642 fp2 = nullid
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	643
4531 b51a8138292a Avoid extra filelogs entries. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4530 diff changeset	644 # is the file unmodified from the parent? report existing entry
b51a8138292a Avoid extra filelogs entries. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4530 diff changeset	645 if fp2 == nullid and not fl.cmp(fp1, t):
b51a8138292a Avoid extra filelogs entries. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4530 diff changeset	646 return fp1
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	647
3300 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3296 diff changeset	648 changelist.append(fn)
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	649 return fl.add(t, meta, tr, linkrev, fp1, fp2)
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	650
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	651 def rawcommit(self, files, text, user, date, p1=None, p2=None, extra={}):
3619 7d3d603e7df9 localrepo: factor commit and rawcommit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3618 diff changeset	652 if p1 is None:
7d3d603e7df9 localrepo: factor commit and rawcommit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3618 diff changeset	653 p1, p2 = self.dirstate.parents()
7d3d603e7df9 localrepo: factor commit and rawcommit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3618 diff changeset	654 return self.commit(files=files, text=text, user=user, date=date,
5041 49059086c634 localrepository: allow rawcommit to commit with an empty message Bryan O'Sullivan <bos@serpentine.com> parents: 5023 diff changeset	655 p1=p1, p2=p2, extra=extra, empty_ok=True)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	656
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	657 def commit(self, files=None, text="", user=None, date=None,
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	658 match=util.always, force=False, force_editor=False,
5041 49059086c634 localrepository: allow rawcommit to commit with an empty message Bryan O'Sullivan <bos@serpentine.com> parents: 5023 diff changeset	659 p1=None, p2=None, extra={}, empty_ok=False):
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	660 wlock = lock = tr = None
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	661 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	662 commit = []
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	663 remove = []
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	664 changed = []
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	665 use_dirstate = (p1 is None) # not rawcommit
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	666 extra = extra.copy()
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	667
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	668 if use_dirstate:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	669 if files:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	670 for f in files:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	671 s = self.dirstate[f]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	672 if s in 'nma':
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	673 commit.append(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	674 elif s == 'r':
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	675 remove.append(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	676 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	677 self.ui.warn(_("%s not tracked!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	678 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	679 changes = self.status(match=match)[:5]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	680 modified, added, removed, deleted, unknown = changes
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	681 commit = modified + added
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	682 remove = removed
3619 7d3d603e7df9 localrepo: factor commit and rawcommit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3618 diff changeset	683 else:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	684 commit = files
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	685
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	686 if use_dirstate:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	687 p1, p2 = self.dirstate.parents()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	688 update_dirstate = True
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	689 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	690 p1, p2 = p1, p2 or nullid
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	691 update_dirstate = (self.dirstate.parents()[0] == p1)
3619 7d3d603e7df9 localrepo: factor commit and rawcommit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3618 diff changeset	692
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	693 c1 = self.changelog.read(p1)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	694 c2 = self.changelog.read(p2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	695 m1 = self.manifest.read(c1[0]).copy()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	696 m2 = self.manifest.read(c2[0])
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	697
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	698 if use_dirstate:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	699 branchname = self.workingctx().branch()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	700 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	701 branchname = branchname.decode('UTF-8').encode('UTF-8')
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	702 except UnicodeDecodeError:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	703 raise util.Abort(_('branch name not in UTF-8!'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	704 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	705 branchname = ""
3434 d0459ec1455d Add branch support to commit Matt Mackall <mpm@selenic.com> parents: 3433 diff changeset	706
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	707 if use_dirstate:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	708 oldname = c1[5].get("branch") # stored in UTF-8
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	709 if (not commit and not remove and not force and p2 == nullid
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	710 and branchname == oldname):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	711 self.ui.status(_("nothing changed\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	712 return None
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	713
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	714 xp1 = hex(p1)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	715 if p2 == nullid: xp2 = ''
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	716 else: xp2 = hex(p2)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	717
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	718 self.hook("precommit", throw=True, parent1=xp1, parent2=xp2)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	719
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	720 wlock = self.wlock()
1807 f1f43ea22cbf Allow repo lock to be passed in to localrepo.commit for performance mason@suse.com parents: 1806 diff changeset	721 lock = self.lock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	722 tr = self.transaction()
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	723 trp = weakref.proxy(tr)
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	724
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	725 # check in files
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	726 new = {}
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	727 linkrev = self.changelog.count()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	728 commit.sort()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	729 is_exec = util.execfunc(self.root, m1.execf)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	730 is_link = util.linkfunc(self.root, m1.linkf)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	731 for f in commit:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	732 self.ui.note(f + "\n")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	733 try:
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	734 new[f] = self.filecommit(f, m1, m2, linkrev, trp, changed)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	735 new_exec = is_exec(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	736 new_link = is_link(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	737 if not changed or changed[-1] != f:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	738 # mention the file in the changelog if some
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	739 # flag changed, even if there was no content
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	740 # change.
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	741 old_exec = m1.execf(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	742 old_link = m1.linkf(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	743 if old_exec != new_exec or old_link != new_link:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	744 changed.append(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	745 m1.set(f, new_exec, new_link)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	746 except (OSError, IOError):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	747 if use_dirstate:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	748 self.ui.warn(_("trouble committing %s!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	749 raise
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	750 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	751 remove.append(f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	752
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	753 # update manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	754 m1.update(new)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	755 remove.sort()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	756 removed = []
3618 5be434785317 localrepo.commit: little cleanups Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3578 diff changeset	757
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	758 for f in remove:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	759 if f in m1:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	760 del m1[f]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	761 removed.append(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	762 elif f in m2:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	763 removed.append(f)
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	764 mn = self.manifest.add(m1, trp, linkrev, c1[0], c2[0],
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	765 (new, removed))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	766
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	767 # add changeset
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	768 new = new.keys()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	769 new.sort()
3675 6990e499d71a Revert almost all of 5be434785317; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3650 diff changeset	770
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	771 user = user or self.ui.username()
5041 49059086c634 localrepository: allow rawcommit to commit with an empty message Bryan O'Sullivan <bos@serpentine.com> parents: 5023 diff changeset	772 if (not empty_ok and not text) or force_editor:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	773 edittext = []
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	774 if text:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	775 edittext.append(text)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	776 edittext.append("")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	777 edittext.append("HG: user: %s" % user)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	778 if p2 != nullid:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	779 edittext.append("HG: branch merge")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	780 if branchname:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	781 edittext.append("HG: branch %s" % util.tolocal(branchname))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	782 edittext.extend(["HG: changed %s" % f for f in changed])
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	783 edittext.extend(["HG: removed %s" % f for f in removed])
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	784 if not changed and not remove:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	785 edittext.append("HG: no files changed")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	786 edittext.append("")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	787 # run editor in the repository root
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	788 olddir = os.getcwd()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	789 os.chdir(self.root)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	790 text = self.ui.edit("\n".join(edittext), user)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	791 os.chdir(olddir)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	792
4020 dbf250b80cc2 Add branch name to editor text. Simon 'corecode' Schubert <corecode@fs.ei.tum.de> parents: 4019 diff changeset	793 if branchname:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	794 extra["branch"] = branchname
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	795
5023 7f5c3fb0a37d localrepo.commit: only munge comment text if committing via dirstate Bryan O'Sullivan <bos@serpentine.com> parents: 4970 diff changeset	796 if use_dirstate:
7f5c3fb0a37d localrepo.commit: only munge comment text if committing via dirstate Bryan O'Sullivan <bos@serpentine.com> parents: 4970 diff changeset	797 lines = [line.rstrip() for line in text.rstrip().splitlines()]
7f5c3fb0a37d localrepo.commit: only munge comment text if committing via dirstate Bryan O'Sullivan <bos@serpentine.com> parents: 4970 diff changeset	798 while lines and not lines[0]:
7f5c3fb0a37d localrepo.commit: only munge comment text if committing via dirstate Bryan O'Sullivan <bos@serpentine.com> parents: 4970 diff changeset	799 del lines[0]
7f5c3fb0a37d localrepo.commit: only munge comment text if committing via dirstate Bryan O'Sullivan <bos@serpentine.com> parents: 4970 diff changeset	800 if not lines:
7f5c3fb0a37d localrepo.commit: only munge comment text if committing via dirstate Bryan O'Sullivan <bos@serpentine.com> parents: 4970 diff changeset	801 return None
7f5c3fb0a37d localrepo.commit: only munge comment text if committing via dirstate Bryan O'Sullivan <bos@serpentine.com> parents: 4970 diff changeset	802 text = '\n'.join(lines)
7f5c3fb0a37d localrepo.commit: only munge comment text if committing via dirstate Bryan O'Sullivan <bos@serpentine.com> parents: 4970 diff changeset	803
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	804 n = self.changelog.add(mn, changed + removed, text, trp, p1, p2,
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	805 user, date, extra)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	806 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	807 parent2=xp2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	808 tr.close()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	809
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	810 if self.branchcache and "branch" in extra:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	811 self.branchcache[util.tolocal(extra["branch"])] = n
4019 c3864dfb7812 When committing, record the changeset in the branchcache. Simon 'corecode' Schubert <corecode@fs.ei.tum.de> parents: 4007 diff changeset	812
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	813 if use_dirstate or update_dirstate:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	814 self.dirstate.setparents(n)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	815 if use_dirstate:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	816 for f in new:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	817 self.dirstate.normal(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	818 for f in removed:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	819 self.dirstate.forget(f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	820
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	821 self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	822 return n
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	823 finally:
5053 47a8ea1eb2c3 del transaction before lock before wlock Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5041 diff changeset	824 del tr, lock, wlock
660 2c83350784c3 Move commit hook after commit completes Matt Mackall <mpm@selenic.com> parents: 659 diff changeset	825
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	826 def walk(self, node=None, files=[], match=util.always, badmatch=None):
3563 26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	827 '''
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	828 walk recursively through the directory tree or a given
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	829 changeset, finding all files matched by the match
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	830 function
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	831
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	832 results are yielded in a tuple (src, filename), where src
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	833 is one of:
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	834 'f' the file was found in the directory tree
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	835 'm' the file was only in the dirstate and not in the tree
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	836 'b' file was not found and matched badmatch
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	837 '''
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3510 diff changeset	838
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	839 if node:
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	840 fdict = dict.fromkeys(files)
4190 e8ee8fdeddb1 change locate to use relglobs by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4189 diff changeset	841 # for dirstate.walk, files=['.'] means "walk the whole tree".
e8ee8fdeddb1 change locate to use relglobs by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4189 diff changeset	842 # follow that here, too
e8ee8fdeddb1 change locate to use relglobs by default Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4189 diff changeset	843 fdict.pop('.', None)
4189 8e947b0e53cc localrepo.walk: if we're walking a specific revision, sort the files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4171 diff changeset	844 mdict = self.manifest.read(self.changelog.read(node)[0])
8e947b0e53cc localrepo.walk: if we're walking a specific revision, sort the files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4171 diff changeset	845 mfiles = mdict.keys()
8e947b0e53cc localrepo.walk: if we're walking a specific revision, sort the files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4171 diff changeset	846 mfiles.sort()
8e947b0e53cc localrepo.walk: if we're walking a specific revision, sort the files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4171 diff changeset	847 for fn in mfiles:
3016 aebc3f64b20f fix incorrect warning when walking on a particular rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2974 diff changeset	848 for ffn in fdict:
aebc3f64b20f fix incorrect warning when walking on a particular rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2974 diff changeset	849 # match if the file is the exact name or a directory
aebc3f64b20f fix incorrect warning when walking on a particular rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2974 diff changeset	850 if ffn == fn or fn.startswith("%s/" % ffn):
aebc3f64b20f fix incorrect warning when walking on a particular rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2974 diff changeset	851 del fdict[ffn]
aebc3f64b20f fix incorrect warning when walking on a particular rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2974 diff changeset	852 break
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	853 if match(fn):
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	854 yield 'm', fn
4189 8e947b0e53cc localrepo.walk: if we're walking a specific revision, sort the files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4171 diff changeset	855 ffiles = fdict.keys()
8e947b0e53cc localrepo.walk: if we're walking a specific revision, sort the files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4171 diff changeset	856 ffiles.sort()
8e947b0e53cc localrepo.walk: if we're walking a specific revision, sort the files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4171 diff changeset	857 for fn in ffiles:
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	858 if badmatch and badmatch(fn):
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	859 if match(fn):
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	860 yield 'b', fn
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	861 else:
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4516 diff changeset	862 self.ui.warn(_('%s: No such file in rev %s\n')
78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4516 diff changeset	863 % (self.pathto(fn), short(node)))
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	864 else:
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2038 diff changeset	865 for src, fn in self.dirstate.walk(files, match, badmatch=badmatch):
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	866 yield src, fn
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	867
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	868 def status(self, node1=None, node2=None, files=[], match=util.always,
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	869 list_ignored=False, list_clean=False):
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	870 """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	871
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	872 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	873 If node2 is None, compare node1 with working directory.
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	874 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	875
4160 b4bd2f3ea347 localrepo.status: fcmp gets a getnode function instead of the manifest Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4137 diff changeset	876 def fcmp(fn, getnode):
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	877 t1 = self.wread(fn)
4160 b4bd2f3ea347 localrepo.status: fcmp gets a getnode function instead of the manifest Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4137 diff changeset	878 return self.file(fn).cmp(getnode(fn), t1)
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	879
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	880 def mfmatches(node):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	881 change = self.changelog.read(node)
3299 a1aad25ccc3e fix localrepo.status when dealing with x-bit changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3296 diff changeset	882 mf = self.manifest.read(change[0]).copy()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	883 for fn in mf.keys():
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	884 if not match(fn):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	885 del mf[fn]
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	886 return mf
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	887
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	888 modified, added, removed, deleted, unknown = [], [], [], [], []
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	889 ignored, clean = [], []
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	890
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	891 compareworking = False
2491 ffde9eb23f59 Fix localrepo.changes() Correctly decide if we are diffing the working dir Chris Mason <mason@suse.com> parents: 2478 diff changeset	892 if not node1 or (not node2 and node1 == self.dirstate.parents()[0]):
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	893 compareworking = True
1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	894
1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	895 if not compareworking:
1802 8a7a24b96697 speed up hg log --debug Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1789 diff changeset	896 # read the manifest from node1 before the manifest from node2,
8a7a24b96697 speed up hg log --debug Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1789 diff changeset	897 # so that we'll hit the manifest cache if we're going through
8a7a24b96697 speed up hg log --debug Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1789 diff changeset	898 # all the revisions in parent->child order.
8a7a24b96697 speed up hg log --debug Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1789 diff changeset	899 mf1 = mfmatches(node1)
8a7a24b96697 speed up hg log --debug Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1789 diff changeset	900
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	901 # are we comparing the working directory?
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	902 if not node2:
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	903 (lookup, modified, added, removed, deleted, unknown,
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	904 ignored, clean) = self.dirstate.status(files, match,
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	905 list_ignored, list_clean)
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	906
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	907 # are we comparing working dir against its parent?
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	908 if compareworking:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	909 if lookup:
4956 312c845edef5 simplify dirstate fixups in repo.status() Matt Mackall <mpm@selenic.com> parents: 4954 diff changeset	910 fixup = []
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	911 # do a full compare of any files that might have changed
4954 fd96bc61a18b use context for part of localrepo status Matt Mackall <mpm@selenic.com> parents: 4950 diff changeset	912 ctx = self.changectx()
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	913 for f in lookup:
4954 fd96bc61a18b use context for part of localrepo status Matt Mackall <mpm@selenic.com> parents: 4950 diff changeset	914 if f not in ctx or ctx[f].cmp(self.wread(f)):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	915 modified.append(f)
2961 5bb65c3945a3 localrepo.status: detect clean files even when the mtime has changed Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2900 diff changeset	916 else:
4956 312c845edef5 simplify dirstate fixups in repo.status() Matt Mackall <mpm@selenic.com> parents: 4954 diff changeset	917 fixup.append(f)
4577 e7d4ed543de5 localrepo.status: only append stuff to the clean list if list_clean is true Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4573 diff changeset	918 if list_clean:
e7d4ed543de5 localrepo.status: only append stuff to the clean list if list_clean is true Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4573 diff changeset	919 clean.append(f)
4956 312c845edef5 simplify dirstate fixups in repo.status() Matt Mackall <mpm@selenic.com> parents: 4954 diff changeset	920
312c845edef5 simplify dirstate fixups in repo.status() Matt Mackall <mpm@selenic.com> parents: 4954 diff changeset	921 # update dirstate for files that are actually clean
312c845edef5 simplify dirstate fixups in repo.status() Matt Mackall <mpm@selenic.com> parents: 4954 diff changeset	922 if fixup:
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	923 wlock = None
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	924 try:
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	925 try:
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	926 wlock = self.wlock(False)
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	927 except lock.LockException:
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	928 pass
4370 4ddc6d374265 localrepository.status: only acquire wlock if actually needed. Bryan O'Sullivan <bos@serpentine.com> parents: 4334 diff changeset	929 if wlock:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	930 for f in fixup:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	931 self.dirstate.normal(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	932 finally:
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	933 del wlock
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	934 else:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	935 # we are comparing working dir against non-parent
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	936 # generate a pseudo-manifest for the working dir
3299 a1aad25ccc3e fix localrepo.status when dealing with x-bit changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3296 diff changeset	937 # XXX: create it in dirstate.py ?
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	938 mf2 = mfmatches(self.dirstate.parents()[0])
3996 c190df14338c exec: add execfunc to simplify exec flag support on non-exec filesystems Matt Mackall <mpm@selenic.com> parents: 3956 diff changeset	939 is_exec = util.execfunc(self.root, mf2.execf)
4002 d7b9ec589546 symlinks: use is_link wherever is_exec is used Matt Mackall <mpm@selenic.com> parents: 3996 diff changeset	940 is_link = util.linkfunc(self.root, mf2.linkf)
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	941 for f in lookup + modified + added:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	942 mf2[f] = ""
4002 d7b9ec589546 symlinks: use is_link wherever is_exec is used Matt Mackall <mpm@selenic.com> parents: 3996 diff changeset	943 mf2.set(f, is_exec(f), is_link(f))
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	944 for f in removed:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	945 if f in mf2:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	946 del mf2[f]
4370 4ddc6d374265 localrepository.status: only acquire wlock if actually needed. Bryan O'Sullivan <bos@serpentine.com> parents: 4334 diff changeset	947
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	948 else:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	949 # we are comparing two revisions
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	950 mf2 = mfmatches(node2)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	951
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	952 if not compareworking:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	953 # flush lists from dirstate before comparing manifests
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	954 modified, added, clean = [], [], []
566 b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	955
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	956 # make sure to sort the files so we talk to the disk in a
1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	957 # reasonable order
1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	958 mf2keys = mf2.keys()
1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	959 mf2keys.sort()
4160 b4bd2f3ea347 localrepo.status: fcmp gets a getnode function instead of the manifest Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4137 diff changeset	960 getnode = lambda fn: mf1.get(fn, nullid)
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	961 for fn in mf2keys:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	962 if mf1.has_key(fn):
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4623 diff changeset	963 if (mf1.flags(fn) != mf2.flags(fn) or
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4623 diff changeset	964 (mf1[fn] != mf2[fn] and
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4623 diff changeset	965 (mf2[fn] != "" or fcmp(fn, getnode)))):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	966 modified.append(fn)
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	967 elif list_clean:
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	968 clean.append(fn)
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	969 del mf1[fn]
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	970 else:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	971 added.append(fn)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	972
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	973 removed = mf1.keys()
ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	974
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	975 # sort and return results:
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	976 for l in modified, added, removed, deleted, unknown, ignored, clean:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	977 l.sort()
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	978 return (modified, added, removed, deleted, unknown, ignored, clean)
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	979
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	980 def add(self, list):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	981 wlock = self.wlock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	982 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	983 for f in list:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	984 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	985 try:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	986 st = os.lstat(p)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	987 except:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	988 self.ui.warn(_("%s does not exist!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	989 continue
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	990 if st.st_size > 10000000:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	991 self.ui.warn(_("%s: files over 10MB may cause memory and"
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	992 " performance problems\n"
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	993 "(use 'hg revert %s' to unadd the file)\n")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	994 % (f, f))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	995 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: 4958 diff changeset	996 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: 4958 diff changeset	997 "supported currently\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	998 elif self.dirstate[f] in 'an':
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	999 self.ui.warn(_("%s already tracked!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1000 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1001 self.dirstate.add(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1002 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1003 del wlock
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1004
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1005 def forget(self, list):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1006 wlock = self.wlock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1007 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1008 for f in list:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1009 if self.dirstate[f] != 'a':
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1010 self.ui.warn(_("%s not added!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1011 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1012 self.dirstate.forget(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1013 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1014 del wlock
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1015
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1016 def remove(self, list, unlink=False):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1017 wlock = None
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1018 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1019 if unlink:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1020 for f in list:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1021 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1022 util.unlink(self.wjoin(f))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1023 except OSError, inst:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1024 if inst.errno != errno.ENOENT:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1025 raise
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	1026 wlock = self.wlock()
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	1027 for f in list:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1028 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: 4958 diff changeset	1029 self.ui.warn(_("%s still exists!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1030 elif self.dirstate[f] == 'a':
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1031 self.dirstate.forget(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1032 elif f not in self.dirstate:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1033 self.ui.warn(_("%s not tracked!\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1034 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1035 self.dirstate.remove(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1036 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1037 del wlock
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	1038
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1039 def undelete(self, list):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1040 wlock = None
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1041 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1042 p = self.dirstate.parents()[0]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1043 mn = self.changelog.read(p)[0]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1044 m = self.manifest.read(mn)
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1045 wlock = self.wlock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1046 for f in list:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1047 if self.dirstate[f] != 'r':
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1048 self.ui.warn("%s not removed!\n" % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1049 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1050 t = self.file(f).read(m[f])
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1051 self.wwrite(f, t, m.flags(f))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1052 self.dirstate.normal(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1053 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1054 del wlock
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	1055
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1056 def copy(self, source, dest):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1057 wlock = None
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1058 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1059 p = self.wjoin(dest)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1060 if not (os.path.exists(p) or os.path.islink(p)):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1061 self.ui.warn(_("%s does not exist!\n") % dest)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1062 elif not (os.path.isfile(p) or os.path.islink(p)):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1063 self.ui.warn(_("copy failed: %s is not a file or a "
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1064 "symbolic link\n") % dest)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1065 else:
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	1066 wlock = self.wlock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1067 if dest not in self.dirstate:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1068 self.dirstate.add(dest)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1069 self.dirstate.copy(source, dest)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1070 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1071 del wlock
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	1072
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	1073 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	1074 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	1075 # sort the output in rev descending order
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	1076 heads = [(-self.changelog.rev(h), h) for h in heads]
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	1077 heads.sort()
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	1078 return [n for (r, n) in heads]
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1079
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1080 def branchheads(self, branch, start=None):
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1081 branches = self.branchtags()
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1082 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	1083 return []
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1084 # The basic algorithm is this:
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1085 #
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1086 # Start from the branch tip since there are no later revisions that can
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1087 # possibly be in this branch, and the tip is a guaranteed head.
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1088 #
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1089 # Remember the tip's parents as the first ancestors, since these by
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1090 # definition are not heads.
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1091 #
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1092 # Step backwards from the brach tip through all the revisions. We are
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1093 # guaranteed by the rules of Mercurial that we will now be visiting the
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1094 # nodes in reverse topological order (children before parents).
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1095 #
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1096 # If a revision is one of the ancestors of a head then we can toss it
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1097 # out of the ancestors set (we've already found it and won't be
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1098 # visiting it again) and put its parents in the ancestors set.
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1099 #
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1100 # Otherwise, if a revision is in the branch it's another head, since it
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1101 # wasn't in the ancestor list of an existing head. So add it to the
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1102 # head list, and add its parents to the ancestor list.
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1103 #
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1104 # If it is not in the branch ignore it.
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1105 #
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1106 # Once we have a list of heads, use nodesbetween to filter out all the
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1107 # heads that cannot be reached from startrev. There may be a more
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1108 # efficient way to do this as part of the previous algorithm.
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1109
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1110 set = util.set
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1111 heads = [self.changelog.rev(branches[branch])]
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1112 # Don't care if ancestors contains nullrev or not.
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1113 ancestors = set(self.changelog.parentrevs(heads[0]))
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1114 for rev in xrange(heads[0] - 1, nullrev, -1):
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1115 if rev in ancestors:
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1116 ancestors.update(self.changelog.parentrevs(rev))
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1117 ancestors.remove(rev)
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1118 elif self.changectx(rev).branch() == branch:
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1119 heads.append(rev)
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1120 ancestors.update(self.changelog.parentrevs(rev))
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1121 heads = [self.changelog.node(rev) for rev in heads]
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1122 if start is not None:
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1123 heads = self.changelog.nodesbetween([start], heads)[2]
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1124 return heads
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4635 diff changeset	1125
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1126 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	1127 if not nodes:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1128 nodes = [self.changelog.tip()]
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1129 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1130 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1131 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	1132 while 1:
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1133 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1134 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	1135 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	1136 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1137 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1138 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1139
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1140 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1141 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1142
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1143 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1144 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1145 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1146
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1147 while n != bottom:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1148 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1149 if i == f:
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	1150 l.append(n)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1151 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1152 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1153 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1154
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1155 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1156
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1157 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1158
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1159 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	1160 """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	1161
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1162 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	1163 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	1164 in both remote and self.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1165 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	1166 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	1167 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	1168 or ancestors of these heads.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1169
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1170 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	1171 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	1172 (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	1173 outgoing)
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1174 """
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1175 m = self.changelog.nodemap
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1176 search = []
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1177 fetch = {}
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1178 seen = {}
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1179 seenbranch = {}
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1180 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1181 base = {}
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	1182
2108 30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1183 if not heads:
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1184 heads = remote.heads()
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1185
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1186 if self.changelog.tip() == nullid:
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1187 base[nullid] = 1
2108 30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1188 if heads != [nullid]:
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1189 return [nullid]
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1190 return []
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1191
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1192 # 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	1193 # 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	1194 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	1195
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1196 unknown = []
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1197 for h in heads:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1198 if h not in m:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1199 unknown.append(h)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1200 else:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1201 base[h] = 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1202
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1203 if not unknown:
1895 d7c038e805e9 findincoming should return an iterable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1893 diff changeset	1204 return []
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1205
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1206 req = dict.fromkeys(unknown)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1207 reqcnt = 0
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1208
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1209 # search through remote branches
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1210 # 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	1211 # head, root, first parent, second parent
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1212 # (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	1213 unknown = remote.branches(unknown)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1214 while unknown:
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1215 r = []
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1216 while unknown:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1217 n = unknown.pop(0)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1218 if n[0] in seen:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1219 continue
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1220
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1221 self.ui.debug(_("examining %s:%s\n")
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1222 % (short(n[0]), short(n[1])))
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1223 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	1224 pass
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1225 elif n in seenbranch:
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	1226 self.ui.debug(_("branch already found\n"))
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1227 continue
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1228 elif n[1] and n[1] in m: # do we know the base?
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	1229 self.ui.debug(_("found incomplete branch %s:%s\n")
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1230 % (short(n[0]), short(n[1])))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1231 search.append(n) # schedule branch range for scanning
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1232 seenbranch[n] = 1
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1233 else:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1234 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	1235 if n[2] in m and n[3] in m:
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	1236 self.ui.debug(_("found new changeset %s\n") %
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1237 short(n[1]))
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1238 fetch[n[1]] = 1 # earliest unknown
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1239 for p in n[2:4]:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1240 if p in m:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1241 base[p] = 1 # latest known
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1242
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1243 for p in n[2:4]:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1244 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	1245 r.append(p)
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1246 req[p] = 1
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1247 seen[n[0]] = 1
dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1248
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1249 if r:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1250 reqcnt += 1
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	1251 self.ui.debug(_("request %d: %s\n") %
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1252 (reqcnt, " ".join(map(short, r))))
3468 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3452 diff changeset	1253 for p in xrange(0, len(r), 10):
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1254 for b in remote.branches(r[p:p+10]):
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	1255 self.ui.debug(_("received %s:%s\n") %
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1256 (short(b[0]), short(b[1])))
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1257 unknown.append(b)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1258
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1259 # 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	1260 while search:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1261 n = search.pop(0)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1262 reqcnt += 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1263 l = remote.between([(n[0], n[1])])[0]
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1264 l.append(n[1])
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1265 p = n[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1266 f = 1
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1267 for i in l:
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	1268 self.ui.debug(_("narrowing %d:%d %s\n") % (f, len(l), short(i)))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1269 if i in m:
85 58a1a0425c9b Fix merge bug, I hope mpm@selenic.com parents: 83 diff changeset	1270 if f <= 2:
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	1271 self.ui.debug(_("found new branch changeset %s\n") %
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1272 short(p))
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1273 fetch[p] = 1
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1274 base[i] = 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1275 else:
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	1276 self.ui.debug(_("narrowed branch search to %s:%s\n")
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1277 % (short(p), short(i)))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1278 search.append((p, i))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1279 break
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1280 p, f = i, f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1281
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1282 # sanity check our fetch list
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1283 for f in fetch.keys():
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1284 if f in m:
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	1285 raise repo.RepoError(_("already have changeset ") + short(f[:4]))
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1286
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1287 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	1288 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	1289 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	1290 else:
d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1291 raise util.Abort(_("repository is unrelated"))
511 9f67222186bd Disallow merging of unrelated projects mpm@selenic.com parents: 504 diff changeset	1292
2972 96d034d02d61 Demote a pull note to a debug message Matt Mackall <mpm@selenic.com> parents: 2961 diff changeset	1293 self.ui.debug(_("found new changesets starting at ") +
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1294 " ".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	1295
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	1296 self.ui.debug(_("%d total queries\n") % reqcnt)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1297
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1298 return fetch.keys()
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	1299
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1300 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	1301 """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	1302
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1303 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	1304 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	1305 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	1306 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	1307 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	1308 """
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1309 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1310 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	1311 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	1312
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	1313 self.ui.debug(_("common changesets up to ")
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1314 + " ".join(map(short, base.keys())) + "\n")
05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1315
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1316 remain = dict.fromkeys(self.changelog.nodemap)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1317
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1318 # prune everything remote has from the tree
637 31e090c34d3b Fix up the broken bits in findoutgoing Matt Mackall <mpm@selenic.com> parents: 636 diff changeset	1319 del remain[nullid]
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1320 remove = base.keys()
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1321 while remove:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1322 n = remove.pop(0)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1323 if n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1324 del remain[n]
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1325 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	1326 remove.append(p)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1327
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1328 # 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	1329 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	1330 # find every remote head that will 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	1331 updated_heads = {}
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1332 for n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1333 p1, p2 = self.changelog.parents(n)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1334 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	1335 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	1336 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	1337 if p1 in 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	1338 updated_heads[p1] = True
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1339 if p2 in 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	1340 updated_heads[p2] = True
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1341
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1342 # 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	1343 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	1344 return subset, updated_heads.keys()
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1345 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	1346 return subset
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1347
4961 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1348 def pull(self, remote, heads=None, force=False):
126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4960 diff changeset	1349 lock = self.lock()
2816 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1350 try:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1351 fetch = self.findincoming(remote, force=force)
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1352 if fetch == [nullid]:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1353 self.ui.status(_("requesting all changes\n"))
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1354
2816 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1355 if not fetch:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1356 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	1357 return 0
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1358
2816 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1359 if heads is None:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1360 cg = remote.changegroup(fetch, 'pull')
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1361 else:
3448 6ca49c5fe268 Stop erroring out pull -r and clone -r if repository isn't local. Eric Hopper <hopper@omnifarious.org> parents: 3443 diff changeset	1362 if 'changegroupsubset' not in remote.capabilities:
6ca49c5fe268 Stop erroring out pull -r and clone -r if repository isn't local. Eric Hopper <hopper@omnifarious.org> parents: 3443 diff changeset	1363 raise util.Abort(_("Partial pull cannot be done because other repository doesn't support changegroupsubset."))
2816 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1364 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	1365 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	1366 finally:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1367 del lock
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1368
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	1369 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	1370 # 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	1371 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1372 # 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	1373 # 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	1374 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1375 # 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	1376 # servers, http servers).
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1377
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1378 if remote.capable('unbundle'):
2463 6ab016edd5c4 localrepository.push: propagate return value Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1379 return self.push_unbundle(remote, force, revs)
6ab016edd5c4 localrepository.push: propagate return value Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1380 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	1381
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1382 def prepush(self, remote, force, revs):
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1383 base = {}
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	1384 remote_heads = remote.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	1385 inc = self.findincoming(remote, base, remote_heads, force=force)
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1386
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	1387 update, updated_heads = self.findoutgoing(remote, base, remote_heads)
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	1388 if revs is not None:
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1389 msng_cl, bases, heads = self.changelog.nodesbetween(update, revs)
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1390 else:
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1391 bases, heads = update, self.changelog.heads()
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1392
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1393 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	1394 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	1395 return None, 1
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1396 elif not force:
3684 975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1397 # check if we're creating new remote heads
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1398 # to be a remote head after push, node must be either
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1399 # - unknown locally
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1400 # - a local outgoing head descended from update
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1401 # - a remote head that's known locally and not
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1402 # ancestral to an outgoing head
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1403
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1404 warn = 0
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1405
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1406 if remote_heads == [nullid]:
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1407 warn = 0
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1408 elif not revs and len(heads) > len(remote_heads):
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1409 warn = 1
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1410 else:
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1411 newheads = list(heads)
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1412 for r in remote_heads:
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1413 if r in self.changelog.nodemap:
3925 27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3862 diff changeset	1414 desc = self.changelog.heads(r, heads)
3684 975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1415 l = [h for h in heads if h in desc]
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1416 if not l:
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1417 newheads.append(r)
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1418 else:
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1419 newheads.append(r)
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1420 if len(newheads) > len(remote_heads):
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1421 warn = 1
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1422
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1423 if warn:
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	1424 self.ui.warn(_("abort: push creates new remote branches!\n"))
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	1425 self.ui.status(_("(did you forget to merge?"
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	1426 " use push -f to force)\n"))
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1427 return None, 1
3684 975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1428 elif inc:
975c2469c316 correct remote heads test in prepush Matt Mackall <mpm@selenic.com> parents: 3682 diff changeset	1429 self.ui.warn(_("note: unsynced remote changes!\n"))
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1430
3682 20912eb2667d reorder tests in prepush Matt Mackall <mpm@selenic.com> parents: 3675 diff changeset	1431
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	1432 if revs is None:
1782 b9671b41e360 merge with crew Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1781 1754 diff changeset	1433 cg = self.changegroup(update, '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	1434 else:
1782 b9671b41e360 merge with crew Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1781 1754 diff changeset	1435 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	1436 return cg, remote_heads
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1437
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1438 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	1439 lock = remote.lock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1440 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1441 ret = self.prepush(remote, force, revs)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1442 if ret[0] is not None:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1443 cg, remote_heads = ret
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1444 return remote.addchangegroup(cg, 'push', self.url())
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1445 return ret[1]
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1446 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1447 del lock
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1448
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1449 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	1450 # 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	1451 # 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	1452 # 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	1453 # aborts.
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1454
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1455 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	1456 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	1457 cg, remote_heads = ret
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1458 if force: remote_heads = ['force']
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1459 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	1460 return ret[1]
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1461
3510 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1462 def changegroupinfo(self, 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	1463 self.ui.note(_("%d changesets found\n") % len(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	1464 if self.ui.debugflag:
9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1465 self.ui.debug(_("List of changesets:\n"))
9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1466 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	1467 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	1468
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1469 def changegroupsubset(self, bases, heads, source):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1470 """This function generates a changegroup consisting of all the nodes
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1471 that are descendents of any of the bases, and ancestors of any of
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1472 the heads.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1473
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1474 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	1475 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	1476 is non-trivial.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1477
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1478 Another wrinkle is doing the reverse, figuring out which changeset in
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1479 the changegroup a particular filenode or manifestnode belongs to."""
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1480
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1481 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1482
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1483 # Set up some initial variables
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1484 # Make it easy to refer to self.changelog
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1485 cl = self.changelog
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1486 # msng is short for missing - compute the list of changesets in this
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1487 # changegroup.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1488 msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads)
3510 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1489 self.changegroupinfo(msng_cl_lst)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1490 # 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	1491 # 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	1492 # necessary to re-create the changegroup.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1493
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1494 # 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	1495 # of this changegroup will know about.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1496 knownheads = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1497 # 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	1498 for n in bases:
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1499 for p in cl.parents(n):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1500 if p != nullid:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1501 knownheads[p] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1502 knownheads = knownheads.keys()
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1503 if knownheads:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1504 # 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	1505 # 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	1506 # 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	1507 # changeset.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1508 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	1509 junk = None
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1510 # Transform the list into an ersatz set.
1464 00117edce2dd Fixed silly bug involving a non-existent variable. Eric Hopper <hopper@omnifarious.org> parents: 1462 diff changeset	1511 has_cl_set = dict.fromkeys(has_cl_set)
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1512 else:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1513 # 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	1514 # know about any changesets.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1515 has_cl_set = {}
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1516
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1517 # 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	1518 mnfst = self.manifest
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1519 # 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	1520 msng_mnfst_set = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1521 # 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	1522 msng_filenode_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1523
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1524 junk = mnfst.index[mnfst.count() - 1] # Get around a bug in lazyindex
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1525 junk = None
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1526
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1527 # 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	1528 # 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	1529 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1530 return x
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1531
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1532 # A function generating function. Sets up an environment for the
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1533 # inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1534 def cmp_by_rev_func(revlog):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1535 # Compare two nodes by their revision number in the environment's
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1536 # revision history. Since the revision number both represents the
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1537 # most efficient order to read the nodes in, and represents a
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1538 # topological sorting of the nodes, this function is often useful.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1539 def cmp_by_rev(a, b):
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1540 return cmp(revlog.rev(a), revlog.rev(b))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1541 return cmp_by_rev
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1542
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1543 # 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	1544 # 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	1545 # 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	1546 # 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	1547 def prune_parents(revlog, hasset, msngset):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1548 haslst = hasset.keys()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1549 haslst.sort(cmp_by_rev_func(revlog))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1550 for node in haslst:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1551 parentlst = [p for p in revlog.parents(node) if p != nullid]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1552 while parentlst:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1553 n = parentlst.pop()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1554 if n not in hasset:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1555 hasset[n] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1556 p = [p for p in revlog.parents(n) if p != nullid]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1557 parentlst.extend(p)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1558 for n in hasset:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1559 msngset.pop(n, None)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1560
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1561 # This is a function generating function used to set up an environment
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1562 # for the inner function to execute in.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1563 def manifest_and_file_collector(changedfileset):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1564 # This is an information gathering function that gathers
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1565 # information from each changeset node that goes out as part of
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1566 # the changegroup. The information gathered is a list of which
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1567 # manifest nodes are potentially required (the recipient may
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1568 # already have them) and total list of all files which were
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1569 # changed in any changeset in the changegroup.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1570 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1571 # We also remember the first changenode we saw any manifest
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1572 # referenced by so we can later determine which changenode 'owns'
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1573 # the manifest.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1574 def collect_manifests_and_files(clnode):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1575 c = cl.read(clnode)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1576 for f in c[3]:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1577 # This is to make sure we only have one instance of each
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1578 # filename string for each filename.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1579 changedfileset.setdefault(f, f)
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1580 msng_mnfst_set.setdefault(c[0], clnode)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1581 return collect_manifests_and_files
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1582
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1583 # Figure out which manifest nodes (of the ones we think might be part
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1584 # of the changegroup) the recipient must know about and remove them
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1585 # from the changegroup.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1586 def prune_manifests():
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1587 has_mnfst_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1588 for n in msng_mnfst_set:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1589 # If a 'missing' manifest thinks it belongs to a changenode
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1590 # the recipient is assumed to have, obviously the recipient
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1591 # must have that manifest.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1592 linknode = cl.node(mnfst.linkrev(n))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1593 if linknode in has_cl_set:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1594 has_mnfst_set[n] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1595 prune_parents(mnfst, has_mnfst_set, msng_mnfst_set)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1596
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1597 # 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	1598 # 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	1599 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	1600 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	1601
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1602 # 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	1603 # 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	1604 def filenode_collector(changedfiles):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1605 next_rev = [0]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1606 # 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	1607 # 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	1608 # 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	1609 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1610 # 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	1611 # 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	1612 # 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	1613 def collect_msng_filenodes(mnfstnode):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1614 r = mnfst.rev(mnfstnode)
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1615 if r == next_rev[0]:
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1616 # If the last rev we looked at was the one just previous,
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1617 # we only need to see a diff.
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1618 delta = mdiff.patchtext(mnfst.delta(mnfstnode))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1619 # For each line in the delta
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1620 for dline in delta.splitlines():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1621 # get the filename and filenode for that line
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1622 f, fnode = dline.split('\0')
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1623 fnode = bin(fnode[:40])
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1624 f = changedfiles.get(f, None)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1625 # 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	1626 # about.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1627 if f is not None:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1628 # Get the changenode this manifest belongs to
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1629 clnode = msng_mnfst_set[mnfstnode]
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1630 # 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	1631 # there isn't one already.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1632 ndset = msng_filenode_set.setdefault(f, {})
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1633 # 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	1634 # 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	1635 ndset.setdefault(fnode, clnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1636 else:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1637 # Otherwise we need a full manifest.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1638 m = mnfst.read(mnfstnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1639 # For every file in we care about.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1640 for f in changedfiles:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1641 fnode = m.get(f, None)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1642 # If it's in the manifest
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1643 if fnode is not None:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1644 # See comments above.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1645 clnode = msng_mnfst_set[mnfstnode]
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1646 ndset = msng_filenode_set.setdefault(f, {})
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1647 ndset.setdefault(fnode, clnode)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1648 # Remember the revision we hope to see next.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1649 next_rev[0] = r + 1
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1650 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	1651
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1652 # We have a list of filenodes we think we need for a file, lets remove
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1653 # all those we now 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	1654 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	1655 msngset = msng_filenode_set[f]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1656 hasset = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1657 # 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	1658 # 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	1659 # that filenode.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1660 for n in msngset:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1661 clnode = cl.node(filerevlog.linkrev(n))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1662 if clnode in has_cl_set:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1663 hasset[n] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1664 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	1665
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1666 # 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	1667 # inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1668 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	1669 msngset = msng_filenode_set[fname]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1670 # 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	1671 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	1672 return msngset[fnode]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1673 return lookup_filenode_link
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1674
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1675 # 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	1676 # 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	1677 def gengroup():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1678 # 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	1679 changedfiles = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1680 # 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	1681 # back to lookup the owning changenode and collect information.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1682 group = cl.group(msng_cl_lst, identity,
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1683 manifest_and_file_collector(changedfiles))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1684 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	1685 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1686
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1687 # The list of manifests has been collected by the generator
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1688 # calling our functions back.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1689 prune_manifests()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1690 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	1691 # Sort the manifestnodes by revision number.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1692 msng_mnfst_lst.sort(cmp_by_rev_func(mnfst))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1693 # 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	1694 # 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	1695 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	1696 filenode_collector(changedfiles))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1697 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	1698 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1699
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1700 # 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	1701 # them.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1702 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	1703 msng_mnfst_set.clear()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1704
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1705 changedfiles = changedfiles.keys()
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1706 changedfiles.sort()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1707 # Go through all our files in order sorted by name.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1708 for fname in changedfiles:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1709 filerevlog = self.file(fname)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1710 # 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	1711 # missing.
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	1712 if msng_filenode_set.has_key(fname):
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	1713 prune_filenodes(fname, filerevlog)
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	1714 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	1715 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	1716 msng_filenode_lst = []
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1717 # 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	1718 # 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	1719 if len(msng_filenode_lst) > 0:
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1967 diff changeset	1720 yield changegroup.genchunk(fname)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1721 # Sort the filenodes by their revision #
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1722 msng_filenode_lst.sort(cmp_by_rev_func(filerevlog))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1723 # 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	1724 # 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	1725 # from filenodes.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1726 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	1727 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	1728 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	1729 yield chnk
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	1730 if msng_filenode_set.has_key(fname):
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	1731 # 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	1732 del msng_filenode_set[fname]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1733 # 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	1734 yield changegroup.closechunk()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1735
2150 f15c6394d90d fix a NameError in changegroupsubset Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2149 diff changeset	1736 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	1737 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	1738
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1739 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	1740
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1741 def changegroup(self, basenodes, source):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1742 """Generate a changegroup of all nodes that we have that a recipient
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1743 doesn't.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1744
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1745 This is much easier than the previous function as we can assume that
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1746 the recipient has any changenode we aren't sending them."""
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1747
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1748 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1749
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1750 cl = self.changelog
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1751 nodes = cl.nodesbetween(basenodes, None)[0]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1752 revset = dict.fromkeys([cl.rev(n) for n in nodes])
3510 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1753 self.changegroupinfo(nodes)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1754
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1755 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1756 return x
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1757
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1758 def gennodelst(revlog):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1759 for r in xrange(0, revlog.count()):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1760 n = revlog.node(r)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1761 if revlog.linkrev(n) in revset:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1762 yield n
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1763
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1764 def changed_file_collector(changedfileset):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1765 def collect_changed_files(clnode):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1766 c = cl.read(clnode)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1767 for fname in c[3]:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1768 changedfileset[fname] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1769 return collect_changed_files
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1770
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1771 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	1772 def lookuprevlink(n):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1773 return cl.node(revlog.linkrev(n))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1774 return lookuprevlink
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1775
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1776 def gengroup():
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1777 # construct a list of all changed files
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1778 changedfiles = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1779
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1780 for chnk in cl.group(nodes, identity,
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1781 changed_file_collector(changedfiles)):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1782 yield chnk
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1783 changedfiles = changedfiles.keys()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1784 changedfiles.sort()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1785
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1786 mnfst = self.manifest
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1787 nodeiter = gennodelst(mnfst)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1788 for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1789 yield chnk
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1790
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1791 for fname in changedfiles:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1792 filerevlog = self.file(fname)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1793 nodeiter = gennodelst(filerevlog)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1794 nodeiter = list(nodeiter)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1795 if nodeiter:
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1967 diff changeset	1796 yield changegroup.genchunk(fname)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1797 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	1798 for chnk in filerevlog.group(nodeiter, lookup):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1799 yield chnk
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1800
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1967 diff changeset	1801 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	1802
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1803 if nodes:
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1804 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	1805
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1806 return util.chunkbuffer(gengroup())
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1807
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1808 def addchangegroup(self, source, srctype, url):
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1809 """add changegroup to repo.
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1810
3797 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1811 return values:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1812 - nothing changed or no source: 0
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1813 - 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: 3795 diff changeset	1814 - 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: 3795 diff changeset	1815 - number of heads stays the same: 1
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1816 """
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1817 def csmap(x):
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	1818 self.ui.debug(_("add changeset %s\n") % short(x))
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1819 return cl.count()
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1820
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1821 def revmap(x):
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1822 return cl.rev(x)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1823
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1824 if not source:
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1825 return 0
1730 0f1d2c75db5e add prechangegroup and pretxnchangegroup hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1721 diff changeset	1826
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1827 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	1828
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1829 changesets = files = revisions = 0
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	1830
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1831 # 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	1832 # inconsistent view
4270 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4267 diff changeset	1833 cl = self.changelog
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4267 diff changeset	1834 cl.delayupdate()
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4267 diff changeset	1835 oldheads = len(cl.heads())
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1836
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1837 tr = self.transaction()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1838 try:
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	1839 trp = weakref.proxy(tr)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1840 # pull off the changeset group
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1841 self.ui.status(_("adding changesets\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1842 cor = cl.count() - 1
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1843 chunkiter = changegroup.chunkiter(source)
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	1844 if cl.addgroup(chunkiter, csmap, trp, 1) is None:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1845 raise util.Abort(_("received changelog group is empty"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1846 cnr = cl.count() - 1
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1847 changesets = cnr - cor
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1848
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1849 # pull off the manifest group
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1850 self.ui.status(_("adding manifests\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1851 chunkiter = changegroup.chunkiter(source)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1852 # no need to check for empty manifest group here:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1853 # if the result of the merge of 1 and 2 is the same in 3 and 4,
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1854 # no new manifest will be created and the manifest group will
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1855 # be empty during the pull
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	1856 self.manifest.addgroup(chunkiter, revmap, trp)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1857
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1858 # process the files
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1859 self.ui.status(_("adding file changes\n"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1860 while 1:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1861 f = changegroup.getchunk(source)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1862 if not f:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1863 break
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1864 self.ui.debug(_("adding %s revisions\n") % f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1865 fl = self.file(f)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1866 o = fl.count()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1867 chunkiter = changegroup.chunkiter(source)
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	1868 if fl.addgroup(chunkiter, revmap, trp) is None:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1869 raise util.Abort(_("received file revlog group is empty"))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1870 revisions += fl.count() - o
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1871 files += 1
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1872
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1873 # make changelog see real files again
4970 30d4d8985dd8 transactions: avoid late tear-down (issue641) Matt Mackall <mpm@selenic.com> parents: 4961 diff changeset	1874 cl.finalize(trp)
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1875
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1876 newheads = len(self.changelog.heads())
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1877 heads = ""
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1878 if oldheads and newheads != oldheads:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1879 heads = _(" (%+d heads)") % (newheads - oldheads)
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1880
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1881 self.ui.status(_("added %d changesets"
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1882 " with %d changes to %d files%s\n")
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1883 % (changesets, revisions, files, heads))
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1884
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1885 if changesets > 0:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1886 self.hook('pretxnchangegroup', throw=True,
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1887 node=hex(self.changelog.node(cor+1)), source=srctype,
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1888 url=url)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1889
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1890 tr.close()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1891 finally:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1892 del tr
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1893
1375 f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	1894 if changesets > 0:
2229 0ff326c2b286 changegroup hooks: add source to hook parameters Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	1895 self.hook("changegroup", node=hex(self.changelog.node(cor+1)),
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1896 source=srctype, url=url)
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1897
3468 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3452 diff changeset	1898 for i in xrange(cor + 1, cnr + 1):
2229 0ff326c2b286 changegroup hooks: add source to hook parameters Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	1899 self.hook("incoming", node=hex(self.changelog.node(i)),
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1900 source=srctype, url=url)
1316 b650bfdfc7ee Hook fixups mpm@selenic.com parents: 1280 diff changeset	1901
3797 2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1902 # never return 0 here:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1903 if newheads < oldheads:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1904 return newheads - oldheads - 1
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1905 else:
2aef481ac73c Don't report an error when closing heads during local push (issue387) Thomas Arendsen Hein <thomas@intevation.de> parents: 3795 diff changeset	1906 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	1907
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1908
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1909 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	1910 fp = remote.stream_out()
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1911 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1912 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1913 resp = int(l)
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1914 except ValueError:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1915 raise util.UnexpectedOutput(
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1916 _('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	1917 if resp == 1:
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1918 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	1919 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	1920 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	1921 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	1922 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	1923 self.ui.status(_('streaming all changes\n'))
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1924 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1925 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1926 total_files, total_bytes = map(int, l.split(' ', 1))
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1927 except ValueError, TypeError:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1928 raise util.UnexpectedOutput(
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1929 _('Unexpected response from remote server:'), l)
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1930 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	1931 (total_files, util.bytecount(total_bytes)))
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1932 start = time.time()
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1933 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	1934 # XXX doesn't support '\n' or '\r' in filenames
3550 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1935 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1936 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1937 name, size = l.split('\0', 1)
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1938 size = int(size)
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1939 except ValueError, TypeError:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1940 raise util.UnexpectedOutput(
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	1941 _('Unexpected response from remote server:'), l)
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1942 self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size)))
3498 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3497 diff changeset	1943 ofp = self.sopener(name, 'w')
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1944 for chunk in util.filechunkiter(fp, limit=size):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1945 ofp.write(chunk)
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1946 ofp.close()
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1947 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	1948 if elapsed <= 0:
43d8f7466920 localrepo: stream_in may raise ZeroDivisionError with nul float elapsed argument. Patrick Mezard <pmezard@gmail.com> parents: 4058 diff changeset	1949 elapsed = 0.001
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1950 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	1951 (util.bytecount(total_bytes), elapsed,
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1952 util.bytecount(total_bytes / elapsed)))
4614 3a645af7fb76 localrepo and dirstate: rename reload to invalidate Matt Mackall <mpm@selenic.com> parents: 4582 diff changeset	1953 self.invalidate()
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1954 return len(self.heads()) + 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1955
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	1956 def clone(self, remote, heads=[], stream=False):
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1957 '''clone remote repository.
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1958
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1959 keyword arguments:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1960 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	1961 stream: use streaming clone if possible'''
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1962
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1963 # 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	1964 # 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	1965 # them.
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1966
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1967 # 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	1968 # 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	1969 # uncompressed only if compatible.
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1970
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	1971 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	1972 return self.stream_in(remote)
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1973 return self.pull(remote, heads)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1974
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1975 # used to avoid circular references so destructors work
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	1976 def aftertrans(files):
f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	1977 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	1978 def a():
3790 f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	1979 for src, dest in renamefiles:
f183c18568df localrepo: change aftertrans to be independant of the store path Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3774 diff changeset	1980 util.rename(src, dest)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1981 return a
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1982
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	1983 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	1984 return localrepository(ui, util.drop_scheme('file', path), create)
3215 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3197 diff changeset	1985
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	1986 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	1987 return True

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/localrepo.py @ 5141:d316124ebbea