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

annotate mercurial/localrepo.py @ 3577:7f7425306925

Correct optimization from 3464f5e77f34; add a test. If there are two (or more) heads that point to the same .hgtags node, we can safely skip parsing the file in all but the last head. (In 3464f5e77f34, we were parsing the file in the first head and skipping all the others.)

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Sat, 28 Oct 2006 23:37:59 -0300
parents	23f7d9621783
children	3b4e00cba57a

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 #
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2857 diff changeset	3 # Copyright 2005, 2006 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
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	8 from node import *
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1398 diff changeset	9 from i18n import gettext as _
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	10 from demandload import *
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	11 import repo
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	12 demandload(globals(), "appendfile changegroup")
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	13 demandload(globals(), "changelog dirstate filelog manifest context")
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	14 demandload(globals(), "re lock transaction tempfile stat mdiff errno ui")
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	15 demandload(globals(), "os revlog time util")
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	16
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	17 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	18 capabilities = ('lookup', 'changegroupsubset')
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	19
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	20 def __del__(self):
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	21 self.transhandle = None
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	22 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	23 repo.repository.__init__(self)
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	24 if not path:
2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	25 p = os.getcwd()
2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	26 while not os.path.isdir(os.path.join(p, ".hg")):
2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	27 oldp = p
2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	28 p = os.path.dirname(p)
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	29 if p == oldp:
3079 4c9fcb5e3b82 If local repository is missing, make error message clearer. Thomas Arendsen Hein <thomas@intevation.de> parents: 3072 diff changeset	30 raise repo.RepoError(_("There is no Mercurial repository"
4c9fcb5e3b82 If local repository is missing, make error message clearer. Thomas Arendsen Hein <thomas@intevation.de> parents: 3072 diff changeset	31 " here (.hg not found)"))
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	32 path = p
2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	33 self.path = os.path.join(path, ".hg")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	34
3035 4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	35 if not os.path.isdir(self.path):
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	36 if create:
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	37 if not os.path.exists(path):
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	38 os.mkdir(path)
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	39 os.mkdir(self.path)
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	40 os.mkdir(self.join("data"))
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	41 else:
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	42 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: 3019 diff changeset	43 elif create:
4d0e0f149581 localrepo: move the repo creation code, fail if the repo exists Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3019 diff changeset	44 raise repo.RepoError(_("repository %s already exists") % path)
405 99470ae6b424 Check if repository exists mpm@selenic.com parents: 402 diff changeset	45
933 9c43d68ad59f Fixed --repository option when handling relative path tksoh@users.sf.net parents: 926 diff changeset	46 self.root = os.path.abspath(path)
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	47 self.origroot = path
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	48 self.ui = ui.ui(parentui=parentui)
1102 c81d264cd17d localrepo: minor opener usage restructuring mpm@selenic.com parents: 1101 1101 diff changeset	49 self.opener = util.opener(self.path)
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	50 self.sopener = util.opener(self.path)
1102 c81d264cd17d localrepo: minor opener usage restructuring mpm@selenic.com parents: 1101 1101 diff changeset	51 self.wopener = util.opener(self.root)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	52
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	53 try:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	54 self.ui.readconfig(self.join("hgrc"), self.root)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	55 except IOError:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	56 pass
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	57
3340 929d04962115 ui.py: remove revlogopts and (unused) diffcache variables Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3323 diff changeset	58 v = self.ui.configrevlog()
2222 c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	59 self.revlogversion = int(v.get('format', revlog.REVLOG_DEFAULT_FORMAT))
2152 57729c56a23c Show repo's revlog format on verify only if it doesn't match the default format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2150 diff changeset	60 self.revlogv1 = self.revlogversion != revlog.REVLOGV0
2222 c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	61 fl = v.get('flags', None)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	62 flags = 0
2222 c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	63 if fl != None:
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	64 for x in fl.split():
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	65 flags \|= revlog.flagstr(x)
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	66 elif self.revlogv1:
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	67 flags = revlog.REVLOG_DEFAULT_FLAGS
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	68
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	69 v = self.revlogversion \| flags
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	70 self.manifest = manifest.manifest(self.sopener, v)
ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	71 self.changelog = changelog.changelog(self.sopener, v)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	72
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	73 # the changelog might not have the inline index flag
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	74 # on. If the format of the changelog is the same as found in
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	75 # .hgrc, apply any flags found in the .hgrc as well.
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	76 # Otherwise, just version from the changelog
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	77 v = self.changelog.version
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	78 if v == self.revlogversion:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	79 v \|= flags
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	80 self.revlogversion = v
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	81
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	82 self.tagscache = None
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	83 self.branchcache = None
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	84 self.nodetagscache = None
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	85 self.encodepats = None
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	86 self.decodepats = None
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	87 self.transhandle = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	88
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	89 self.dirstate = dirstate.dirstate(self.opener, self.ui, self.root)
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	90
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	91 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	92 return 'file:' + self.root
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	93
1718 c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	94 def hook(self, name, throw=False, **args):
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	95 def callhook(hname, funcname):
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	96 '''call python hook. hook is callable object, looked up as
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	97 name in python module. if callable returns "true", hook
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	98 fails, else passes. if hook raises exception, treated as
05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	99 hook failure. exception propagates if throw is "true".
05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	100
05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	101 reason for "true" meaning "hook failed" is so that
05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	102 unmodified commands (e.g. mercurial.commands.update) can
05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	103 be run as hooks without wrappers to convert return values.'''
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	104
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	105 self.ui.note(_("calling hook %s: %s\n") % (hname, funcname))
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	106 d = funcname.rfind('.')
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	107 if d == -1:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	108 raise util.Abort(_('%s hook is invalid ("%s" not in a module)')
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	109 % (hname, funcname))
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	110 modname = funcname[:d]
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	111 try:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	112 obj = __import__(modname)
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	113 except ImportError:
2581 54b152379589 allow use of extensions in python hooks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2578 diff changeset	114 try:
54b152379589 allow use of extensions in python hooks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2578 diff changeset	115 # extensions are loaded with hgext_ prefix
54b152379589 allow use of extensions in python hooks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2578 diff changeset	116 obj = __import__("hgext_%s" % modname)
54b152379589 allow use of extensions in python hooks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2578 diff changeset	117 except ImportError:
54b152379589 allow use of extensions in python hooks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2578 diff changeset	118 raise util.Abort(_('%s hook is invalid '
54b152379589 allow use of extensions in python hooks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2578 diff changeset	119 '(import of "%s" failed)') %
54b152379589 allow use of extensions in python hooks Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2578 diff changeset	120 (hname, modname))
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	121 try:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	122 for p in funcname.split('.')[1:]:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	123 obj = getattr(obj, p)
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	124 except AttributeError, err:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	125 raise util.Abort(_('%s hook is invalid '
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	126 '("%s" is not defined)') %
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	127 (hname, funcname))
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	128 if not callable(obj):
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	129 raise util.Abort(_('%s hook is invalid '
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	130 '("%s" is not callable)') %
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	131 (hname, funcname))
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	132 try:
2190 b67fcd91dd1b fix minor bugs in localrepo.hook. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2175 diff changeset	133 r = obj(ui=self.ui, repo=self, hooktype=name, **args)
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	134 except (KeyboardInterrupt, util.SignalInterrupt):
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	135 raise
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	136 except Exception, exc:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	137 if isinstance(exc, util.Abort):
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	138 self.ui.warn(_('error: %s hook failed: %s\n') %
3072 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 3035 diff changeset	139 (hname, exc.args[0]))
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	140 else:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	141 self.ui.warn(_('error: %s hook raised an exception: '
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	142 '%s\n') % (hname, exc))
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	143 if throw:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	144 raise
2335 f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2320 diff changeset	145 self.ui.print_exc()
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	146 return True
05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	147 if r:
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	148 if throw:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	149 raise util.Abort(_('%s hook failed') % hname)
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	150 self.ui.warn(_('warning: %s hook failed\n') % hname)
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	151 return r
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	152
1480 ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	153 def runhook(name, cmd):
ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	154 self.ui.note(_("running hook %s: %s\n") % (name, cmd))
2288 dfa17bd1d45e remove non-prefixed environment variables from hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2269 diff changeset	155 env = dict([('HG_' + k.upper(), v) for k, v in args.iteritems()])
1882 c0320567931f merge util.esystem and util.system. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1880 diff changeset	156 r = util.system(cmd, environ=env, cwd=self.root)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	157 if r:
1718 c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	158 desc, r = util.explain_exit(r)
c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	159 if throw:
c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	160 raise util.Abort(_('%s hook %s') % (name, desc))
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	161 self.ui.warn(_('warning: %s hook %s\n') % (name, desc))
05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	162 return r
1480 ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	163
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	164 r = False
1838 429bf036f2cb Call hooks in alphabetical (=defined) order, of course still grouped by type. Thomas Arendsen Hein <thomas@intevation.de> parents: 1835 diff changeset	165 hooks = [(hname, cmd) for hname, cmd in self.ui.configitems("hooks")
429bf036f2cb Call hooks in alphabetical (=defined) order, of course still grouped by type. Thomas Arendsen Hein <thomas@intevation.de> parents: 1835 diff changeset	166 if hname.split(".", 1)[0] == name and cmd]
429bf036f2cb Call hooks in alphabetical (=defined) order, of course still grouped by type. Thomas Arendsen Hein <thomas@intevation.de> parents: 1835 diff changeset	167 hooks.sort()
429bf036f2cb Call hooks in alphabetical (=defined) order, of course still grouped by type. Thomas Arendsen Hein <thomas@intevation.de> parents: 1835 diff changeset	168 for hname, cmd in hooks:
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	169 if cmd.startswith('python:'):
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	170 r = callhook(hname, cmd[7:].strip()) or r
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	171 else:
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	172 r = runhook(hname, cmd) or r
1480 ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	173 return r
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	174
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	175 tag_disallowed = ':\r\n'
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	176
2967 eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2965 diff changeset	177 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	178 '''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	179
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	180 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	181 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	182 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	183
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	184 keyword arguments:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	185
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	186 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	187 (default False)
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	188
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	189 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	190
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	191 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	192
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	193 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	194
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	195 for c in self.tag_disallowed:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	196 if c in name:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	197 raise util.Abort(_('%r cannot be used in a tag name') % c)
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	198
2967 eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2965 diff changeset	199 self.hook('pretag', throw=True, node=hex(node), tag=name, local=local)
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	200
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	201 if local:
2967 eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2965 diff changeset	202 self.opener('localtags', 'a').write('%s %s\n' % (hex(node), name))
eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2965 diff changeset	203 self.hook('tag', node=hex(node), tag=name, local=local)
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	204 return
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	205
2875 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	206 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	207 if '.hgtags' in x:
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	208 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	209 '(please commit .hgtags manually)'))
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	210
2967 eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2965 diff changeset	211 self.wfile('.hgtags', 'ab').write('%s %s\n' % (hex(node), name))
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	212 if self.dirstate.state('.hgtags') == '?':
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	213 self.add(['.hgtags'])
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	214
00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	215 self.commit(['.hgtags'], message, user, date)
2967 eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2965 diff changeset	216 self.hook('tag', node=hex(node), tag=name, local=local)
2601 00fc88b0b256 move most of tag code to localrepository class. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2581 diff changeset	217
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	218 def tags(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	219 '''return a mapping of tag to node'''
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	220 if not self.tagscache:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	221 self.tagscache = {}
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	222
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	223 def parsetag(line, context):
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	224 if not line:
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	225 return
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	226 s = l.split(" ", 1)
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	227 if len(s) != 2:
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	228 self.ui.warn(_("%s: cannot parse entry\n") % context)
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	229 return
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	230 node, key = s
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	231 key = key.strip()
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	232 try:
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	233 bin_n = bin(node)
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	234 except TypeError:
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	235 self.ui.warn(_("%s: node '%s' is not well formed\n") %
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	236 (context, node))
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	237 return
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	238 if bin_n not in self.changelog.nodemap:
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	239 self.ui.warn(_("%s: tag '%s' refers to unknown node\n") %
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	240 (context, key))
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	241 return
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	242 self.tagscache[key] = bin_n
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	243
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	244 # read the tags file from each head, ending with the tip,
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	245 # and add each tag found to the map, with "newer" ones
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	246 # taking precedence
3577 7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	247 f = None
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	248 for rev, node, fnode in self._hgtagsnodes():
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	249 f = (f and f.filectx(fnode) or
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	250 self.filectx('.hgtags', fileid=fnode))
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	251 count = 0
3455 baa271270829 Use file contexts in tags code Matt Mackall <mpm@selenic.com> parents: 3453 diff changeset	252 for l in f.data().splitlines():
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	253 count += 1
3455 baa271270829 Use file contexts in tags code Matt Mackall <mpm@selenic.com> parents: 3453 diff changeset	254 parsetag(l, _("%s, line %d") % (str(f), count))
3456 3464f5e77f34 Minor tags optimization Matt Mackall <mpm@selenic.com> parents: 3455 diff changeset	255
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	256 try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	257 f = self.opener("localtags")
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	258 count = 0
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	259 for l in f:
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	260 count += 1
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	261 parsetag(l, _("localtags, line %d") % count)
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	262 except IOError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	263 pass
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	264
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	265 self.tagscache['tip'] = self.changelog.tip()
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	266
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	267 return self.tagscache
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	268
3577 7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	269 def _hgtagsnodes(self):
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	270 heads = self.heads()
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	271 heads.reverse()
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	272 last = {}
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	273 ret = []
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	274 for node in heads:
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	275 c = self.changectx(node)
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	276 rev = c.rev()
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	277 try:
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	278 fnode = c.filenode('.hgtags')
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	279 except repo.LookupError:
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	280 continue
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	281 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	282 if fnode in last:
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	283 ret[last[fnode]] = None
7f7425306925 Correct optimization from 3464f5e77f34; add a test. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3568 diff changeset	284 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	285 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	286
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	287 def tagslist(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	288 '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	289 l = []
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	290 for t, n in self.tags().items():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	291 try:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	292 r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	293 except:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	294 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	295 l.append((r, t, n))
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	296 l.sort()
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	297 return [(t, n) for r, t, n in l]
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	298
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	299 def nodetags(self, node):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	300 '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	301 if not self.nodetagscache:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	302 self.nodetagscache = {}
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	303 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	304 self.nodetagscache.setdefault(n, []).append(t)
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	305 return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	306
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	307 def branchtags(self):
028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	308 if self.branchcache != None:
028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	309 return self.branchcache
028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	310
3439 a7ef6b6cc311 branchtags: use changectx Matt Mackall <mpm@selenic.com> parents: 3419 diff changeset	311 self.branchcache = {} # avoid recursion in changectx
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	312
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	313 partial, last, lrev = self._readbranchcache()
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	314
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	315 tiprev = self.changelog.count() - 1
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	316 if lrev != tiprev:
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	317 self._updatebranchcache(partial, lrev+1, tiprev+1)
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	318 self._writebranchcache(partial, self.changelog.tip(), tiprev)
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	319
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	320 self.branchcache = partial
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	321 return self.branchcache
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	322
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	323 def _readbranchcache(self):
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	324 partial = {}
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	325 try:
028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	326 f = self.opener("branches.cache")
028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	327 last, lrev = f.readline().rstrip().split(" ", 1)
028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	328 last, lrev = bin(last), int(lrev)
3443 e6045fc3cd50 Improve branch cache sanity check for mq Matt Mackall <mpm@selenic.com> parents: 3440 diff changeset	329 if (lrev < self.changelog.count() and
e6045fc3cd50 Improve branch cache sanity check for mq Matt Mackall <mpm@selenic.com> parents: 3440 diff changeset	330 self.changelog.node(lrev) == last): # sanity check
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	331 for l in f:
028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	332 node, label = l.rstrip().split(" ", 1)
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	333 partial[label] = bin(node)
3450 27ebe4efe98e invalidate the branch cache when sanity check fails Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3448 diff changeset	334 else: # invalidate the cache
27ebe4efe98e invalidate the branch cache when sanity check fails Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3448 diff changeset	335 last, lrev = nullid, -1
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	336 f.close()
028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	337 except IOError:
028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	338 last, lrev = nullid, -1
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	339 return partial, last, lrev
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	340
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	341 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	342 try:
fcf14d87e0a4 If we can't write the branch cache, fail quietly. Matt Mackall <mpm@selenic.com> parents: 3450 diff changeset	343 f = self.opener("branches.cache", "w")
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	344 f.write("%s %s\n" % (hex(tip), tiprev))
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	345 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	346 f.write("%s %s\n" % (hex(node), label))
fcf14d87e0a4 If we can't write the branch cache, fail quietly. Matt Mackall <mpm@selenic.com> parents: 3450 diff changeset	347 except IOError:
fcf14d87e0a4 If we can't write the branch cache, fail quietly. Matt Mackall <mpm@selenic.com> parents: 3450 diff changeset	348 pass
3417 028fff46a4ac Add branchtags function with cache Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	349
3491 23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	350 def _updatebranchcache(self, partial, start, end):
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	351 for r in xrange(start, end):
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	352 c = self.changectx(r)
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	353 b = c.branch()
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	354 if b:
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	355 partial[b] = c.node()
23cffef5d424 Split branchtags into two additional functions. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3473 diff changeset	356
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	357 def lookup(self, key):
3418 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	358 if key == '.':
5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	359 key = self.dirstate.parents()[0]
5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	360 if key == nullid:
5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	361 raise repo.RepoError(_("no revision checked out"))
3453 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	362 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	363 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	364 return n
3418 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	365 if key in self.tags():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	366 return self.tags()[key]
3418 5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	367 if key in self.branchtags():
5436c8fe0ff5 Make lookup aware of branch labels Matt Mackall <mpm@selenic.com> parents: 3417 diff changeset	368 return self.branchtags()[key]
3453 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	369 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	370 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	371 return n
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3452 diff changeset	372 raise repo.RepoError(_("unknown revision '%s'") % key)
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	373
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	374 def dev(self):
2448 b77a2ef61b81 replace os.stat with os.lstat in some where. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	375 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	376
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	377 def local(self):
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	378 return True
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	379
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	380 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	381 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	382
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	383 def sjoin(self, f):
ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	384 return os.path.join(self.path, f)
ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	385
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	386 def wjoin(self, f):
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	387 return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	388
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	389 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	390 if f[0] == '/':
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	391 f = f[1:]
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	392 return filelog.filelog(self.sopener, f, self.revlogversion)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	393
3132 81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3079 diff changeset	394 def changectx(self, changeid=None):
2564 55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	395 return context.changectx(self, changeid)
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	396
3218 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3164 diff changeset	397 def workingctx(self):
8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3164 diff changeset	398 return context.workingctx(self)
8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3164 diff changeset	399
3163 1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	400 def parents(self, changeid=None):
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	401 '''
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	402 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: 3132 diff changeset	403 '''
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	404 if changeid is None:
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	405 pl = self.dirstate.parents()
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	406 else:
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	407 n = self.changelog.lookup(changeid)
1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	408 pl = self.changelog.parents(n)
3164 ff15ba23c1cf localrepo.parents: return null context for no parents Matt Mackall <mpm@selenic.com> parents: 3163 diff changeset	409 if pl[1] == nullid:
ff15ba23c1cf localrepo.parents: return null context for no parents Matt Mackall <mpm@selenic.com> parents: 3163 diff changeset	410 return [self.changectx(pl[0])]
ff15ba23c1cf localrepo.parents: return null context for no parents Matt Mackall <mpm@selenic.com> parents: 3163 diff changeset	411 return [self.changectx(pl[0]), self.changectx(pl[1])]
3163 1605e336d229 Add localrepo.parents to get parent changectxs. Matt Mackall <mpm@selenic.com> parents: 3132 diff changeset	412
2564 55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	413 def filectx(self, path, changeid=None, fileid=None):
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	414 """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	415 fileid can be a file revision or node."""
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	416 return context.filectx(self, path, changeid, fileid)
55e592041076 Add context helper functions to localrepo Matt Mackall <mpm@selenic.com> parents: 2491 diff changeset	417
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	418 def getcwd(self):
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	419 return self.dirstate.getcwd()
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	420
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	421 def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	422 return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	423
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	424 def wread(self, filename):
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	425 if self.encodepats == None:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	426 l = []
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	427 for pat, cmd in self.ui.configitems("encode"):
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	428 mf = util.matcher(self.root, "", [pat], [], [])[1]
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	429 l.append((mf, cmd))
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	430 self.encodepats = l
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	431
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	432 data = self.wopener(filename, 'r').read()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	433
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	434 for mf, cmd in self.encodepats:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	435 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	436 self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	437 data = util.filter(data, cmd)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	438 break
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	439
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	440 return data
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	441
a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	442 def wwrite(self, filename, data, fd=None):
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	443 if self.decodepats == None:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	444 l = []
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	445 for pat, cmd in self.ui.configitems("decode"):
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	446 mf = util.matcher(self.root, "", [pat], [], [])[1]
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	447 l.append((mf, cmd))
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	448 self.decodepats = l
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	449
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	450 for mf, cmd in self.decodepats:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	451 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	452 self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	453 data = util.filter(data, cmd)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	454 break
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	455
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	456 if fd:
a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	457 return fd.write(data)
a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	458 return self.wopener(filename, 'w').write(data)
a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	459
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	460 def transaction(self):
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	461 tr = self.transhandle
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	462 if tr != None and tr.running():
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	463 return tr.nest()
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	464
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2354 diff changeset	465 # save dirstate for rollback
263 e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	466 try:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	467 ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	468 except IOError:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	469 ds = ""
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	470 self.opener("journal.dirstate", "w").write(ds)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	471
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	472 tr = transaction.transaction(self.ui.warn, self.sopener,
ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	473 self.sjoin("journal"),
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	474 aftertrans(self.path))
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	475 self.transhandle = tr
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	476 return tr
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	477
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	478 def recover(self):
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	479 l = self.lock()
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	480 if os.path.exists(self.sjoin("journal")):
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	481 self.ui.status(_("rolling back interrupted transaction\n"))
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	482 transaction.rollback(self.sopener, self.sjoin("journal"))
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	483 self.reload()
1516 0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1510 diff changeset	484 return True
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	485 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	486 self.ui.warn(_("no interrupted transaction available\n"))
1516 0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1510 diff changeset	487 return False
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	488
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2354 diff changeset	489 def rollback(self, wlock=None):
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	490 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	491 wlock = self.wlock()
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	492 l = self.lock()
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	493 if os.path.exists(self.sjoin("undo")):
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	494 self.ui.status(_("rolling back last transaction\n"))
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	495 transaction.rollback(self.sopener, self.sjoin("undo"))
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 420 diff changeset	496 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	497 self.reload()
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	498 self.wreload()
163 f38c90953c2c Make undo and recover friendlier mpm@selenic.com parents: 162 diff changeset	499 else:
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2354 diff changeset	500 self.ui.warn(_("no rollback information available\n"))
162 5dcbe4d9a30c Implement recover and undo commands mpm@selenic.com parents: 161 diff changeset	501
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	502 def wreload(self):
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	503 self.dirstate.read()
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	504
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	505 def reload(self):
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	506 self.changelog.load()
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	507 self.manifest.load()
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	508 self.tagscache = None
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	509 self.nodetagscache = None
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	510
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	511 def do_lock(self, lockname, wait, releasefn=None, acquirefn=None,
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	512 desc=None):
161 0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	513 try:
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	514 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	515 except lock.LockHeld, inst:
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	516 if not wait:
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	517 raise
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	518 self.ui.warn(_("waiting for lock on %s held by %s\n") %
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	519 (desc, inst.args[0]))
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	520 # default to 600 seconds timeout
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	521 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	522 releasefn, desc=desc)
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	523 if acquirefn:
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	524 acquirefn()
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	525 return l
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	526
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	527 def lock(self, wait=1):
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	528 return self.do_lock(self.sjoin("lock"), wait, acquirefn=self.reload,
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	529 desc=_('repository %s') % self.origroot)
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	530
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	531 def wlock(self, wait=1):
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	532 return self.do_lock(self.join("wlock"), wait, self.dirstate.write,
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	533 self.wreload,
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	534 desc=_('working directory of %s') % self.origroot)
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	535
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	536 def filecommit(self, fn, manifest1, manifest2, linkrev, transaction, changelist):
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	537 """
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	538 commit an individual file as part of a larger transaction
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	539 """
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	540
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	541 t = self.wread(fn)
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	542 fl = self.file(fn)
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	543 fp1 = manifest1.get(fn, nullid)
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	544 fp2 = manifest2.get(fn, nullid)
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	545
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	546 meta = {}
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	547 cp = self.dirstate.copied(fn)
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	548 if cp:
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	549 meta["copy"] = cp
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	550 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	551 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	552 fp2 = nullid
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	553 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	554 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	555 else: # copied on local side, reversed
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	556 meta["copyrev"] = hex(manifest2.get(cp))
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	557 fp2 = nullid
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	558 self.ui.debug(_(" %s: copy %s:%s\n") %
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	559 (fn, cp, meta["copyrev"]))
3292 764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	560 fp1 = nullid
764688cf51e5 merge: remember rename copies and parents properly on commit Matt Mackall <mpm@selenic.com> parents: 3241 diff changeset	561 elif fp2 != nullid:
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	562 # is one parent an ancestor of the other?
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	563 fpa = fl.ancestor(fp1, fp2)
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	564 if fpa == fp1:
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	565 fp1, fp2 = fp2, nullid
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	566 elif fpa == fp2:
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	567 fp2 = nullid
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	568
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	569 # is the file unmodified from the parent? report existing entry
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	570 if fp2 == nullid and not fl.cmp(fp1, t):
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	571 return fp1
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	572
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	573 changelist.append(fn)
a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	574 return fl.add(t, meta, transaction, linkrev, fp1, fp2)
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	575
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	576 def rawcommit(self, files, text, user, date, p1=None, p2=None, wlock=None):
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	577 orig_parent = self.dirstate.parents()[0] or nullid
452 a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 442 diff changeset	578 p1 = p1 or self.dirstate.parents()[0] or nullid
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 442 diff changeset	579 p2 = p2 or self.dirstate.parents()[1] or nullid
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	580 c1 = self.changelog.read(p1)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	581 c2 = self.changelog.read(p2)
2840 046a8b03ea59 Change remaining users of manifest flags Matt Mackall <mpm@selenic.com> parents: 2836 diff changeset	582 m1 = self.manifest.read(c1[0]).copy()
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	583 m2 = self.manifest.read(c2[0])
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	584 changed = []
3377 9fe62e2db71d rawcommit: add removed files to the changelog file list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3340 diff changeset	585 removed = []
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	586
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	587 if orig_parent == p1:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	588 update_dirstate = 1
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	589 else:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	590 update_dirstate = 0
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	591
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	592 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	593 wlock = self.wlock()
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	594 l = self.lock()
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	595 tr = self.transaction()
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	596 linkrev = self.changelog.count()
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	597 for f in files:
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	598 try:
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	599 m1[f] = self.filecommit(f, m1, m2, linkrev, tr, changed)
2840 046a8b03ea59 Change remaining users of manifest flags Matt Mackall <mpm@selenic.com> parents: 2836 diff changeset	600 m1.set(f, util.is_exec(self.wjoin(f), m1.execf(f)))
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	601 except IOError:
314 3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	602 try:
2840 046a8b03ea59 Change remaining users of manifest flags Matt Mackall <mpm@selenic.com> parents: 2836 diff changeset	603 del m1[f]
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	604 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	605 self.dirstate.forget([f])
3377 9fe62e2db71d rawcommit: add removed files to the changelog file list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3340 diff changeset	606 removed.append(f)
314 3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	607 except:
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	608 # deleted from p2?
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	609 pass
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	610
2841 e3fb4223e750 Remove manifest.readflags Matt Mackall <mpm@selenic.com> parents: 2840 diff changeset	611 mnode = self.manifest.add(m1, tr, linkrev, c1[0], c2[0])
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 588 diff changeset	612 user = user or self.ui.username()
3377 9fe62e2db71d rawcommit: add removed files to the changelog file list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3340 diff changeset	613 n = self.changelog.add(mnode, changed + removed, text,
9fe62e2db71d rawcommit: add removed files to the changelog file list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3340 diff changeset	614 tr, p1, p2, user, date)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	615 tr.close()
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	616 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	617 self.dirstate.setparents(n, nullid)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	618
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	619 def commit(self, files=None, text="", user=None, date=None,
2267 d812d91c5a84 Force editor to appear for an 'hg backout' if a message or logfile aren't john.levon@sun.com parents: 2259 diff changeset	620 match=util.always, force=False, lock=None, wlock=None,
d812d91c5a84 Force editor to appear for an 'hg backout' if a message or logfile aren't john.levon@sun.com parents: 2259 diff changeset	621 force_editor=False):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	622 commit = []
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	623 remove = []
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	624 changed = []
f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	625
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	626 if files:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	627 for f in files:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	628 s = self.dirstate.state(f)
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	629 if s in 'nmai':
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	630 commit.append(f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	631 elif s == 'r':
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	632 remove.append(f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	633 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	634 self.ui.warn(_("%s not tracked!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	635 else:
2875 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	636 modified, added, removed, deleted, unknown = self.status(match=match)[:5]
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1617 diff changeset	637 commit = modified + added
ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1617 diff changeset	638 remove = removed
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	639
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	640 p1, p2 = self.dirstate.parents()
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	641 c1 = self.changelog.read(p1)
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	642 c2 = self.changelog.read(p2)
2840 046a8b03ea59 Change remaining users of manifest flags Matt Mackall <mpm@selenic.com> parents: 2836 diff changeset	643 m1 = self.manifest.read(c1[0]).copy()
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	644 m2 = self.manifest.read(c2[0])
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	645
3440 0f1fd9854cdc commit: read branch with workingctx Matt Mackall <mpm@selenic.com> parents: 3439 diff changeset	646 branchname = self.workingctx().branch()
3419 d0459ec1455d Add branch support to commit Matt Mackall <mpm@selenic.com> parents: 3418 diff changeset	647 oldname = c1[5].get("branch", "")
d0459ec1455d Add branch support to commit Matt Mackall <mpm@selenic.com> parents: 3418 diff changeset	648
d0459ec1455d Add branch support to commit Matt Mackall <mpm@selenic.com> parents: 3418 diff changeset	649 if not commit and not remove and not force and p2 == nullid and \
d0459ec1455d Add branch support to commit Matt Mackall <mpm@selenic.com> parents: 3418 diff changeset	650 branchname == oldname:
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	651 self.ui.status(_("nothing changed\n"))
901 120cba94d5aa Change repo.comit to return None on error or the new revision number on mason@suse.com parents: 900 diff changeset	652 return None
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	653
1721 801756d0ca84 add pretxncommit hook. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1719 diff changeset	654 xp1 = hex(p1)
801756d0ca84 add pretxncommit hook. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1719 diff changeset	655 if p2 == nullid: xp2 = ''
801756d0ca84 add pretxncommit hook. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1719 diff changeset	656 else: xp2 = hex(p2)
801756d0ca84 add pretxncommit hook. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1719 diff changeset	657
1727 019e6a47a53e fix names of parent changeset ids in hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1726 diff changeset	658 self.hook("precommit", throw=True, parent1=xp1, parent2=xp2)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	659
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	660 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	661 wlock = self.wlock()
1807 f1f43ea22cbf Allow repo lock to be passed in to localrepo.commit for performance mason@suse.com parents: 1806 diff changeset	662 if not lock:
f1f43ea22cbf Allow repo lock to be passed in to localrepo.commit for performance mason@suse.com parents: 1806 diff changeset	663 lock = self.lock()
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	664 tr = self.transaction()
1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	665
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	666 # check in files
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	667 new = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	668 linkrev = self.changelog.count()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	669 commit.sort()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	670 for f in commit:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	671 self.ui.note(f + "\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	672 try:
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	673 new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed)
2840 046a8b03ea59 Change remaining users of manifest flags Matt Mackall <mpm@selenic.com> parents: 2836 diff changeset	674 m1.set(f, util.is_exec(self.wjoin(f), m1.execf(f)))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	675 except IOError:
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	676 self.ui.warn(_("trouble committing %s!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	677 raise
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	678
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	679 # update manifest
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	680 m1.update(new)
416 5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	681 for f in remove:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	682 if f in m1:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	683 del m1[f]
3294 a2d93b186a0e commit: unify file-level commit code Matt Mackall <mpm@selenic.com> parents: 3293 diff changeset	684 mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, remove))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	685
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	686 # add changeset
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	687 new = new.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	688 new.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	689
1983 ae12a81549a7 Pass correct username as $HGUSER to hgeditor if "commit -u" is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 1981 diff changeset	690 user = user or self.ui.username()
2267 d812d91c5a84 Force editor to appear for an 'hg backout' if a message or logfile aren't john.levon@sun.com parents: 2259 diff changeset	691 if not text or force_editor:
d812d91c5a84 Force editor to appear for an 'hg backout' if a message or logfile aren't john.levon@sun.com parents: 2259 diff changeset	692 edittext = []
d812d91c5a84 Force editor to appear for an 'hg backout' if a message or logfile aren't john.levon@sun.com parents: 2259 diff changeset	693 if text:
d812d91c5a84 Force editor to appear for an 'hg backout' if a message or logfile aren't john.levon@sun.com parents: 2259 diff changeset	694 edittext.append(text)
d812d91c5a84 Force editor to appear for an 'hg backout' if a message or logfile aren't john.levon@sun.com parents: 2259 diff changeset	695 edittext.append("")
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	696 if p2 != nullid:
1709 069129d24b26 Create default commit message in a more pythonic way. Thomas Arendsen Hein <thomas@intevation.de> parents: 1708 diff changeset	697 edittext.append("HG: branch merge")
069129d24b26 Create default commit message in a more pythonic way. Thomas Arendsen Hein <thomas@intevation.de> parents: 1708 diff changeset	698 edittext.extend(["HG: changed %s" % f for f in changed])
069129d24b26 Create default commit message in a more pythonic way. Thomas Arendsen Hein <thomas@intevation.de> parents: 1708 diff changeset	699 edittext.extend(["HG: removed %s" % f for f in remove])
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	700 if not changed and not remove:
1709 069129d24b26 Create default commit message in a more pythonic way. Thomas Arendsen Hein <thomas@intevation.de> parents: 1708 diff changeset	701 edittext.append("HG: no files changed")
069129d24b26 Create default commit message in a more pythonic way. Thomas Arendsen Hein <thomas@intevation.de> parents: 1708 diff changeset	702 edittext.append("")
1706 20b621154e17 Run commit message editor in the repo root (like hooks). Thomas Arendsen Hein <thomas@intevation.de> parents: 1680 diff changeset	703 # run editor in the repository root
20b621154e17 Run commit message editor in the repo root (like hooks). Thomas Arendsen Hein <thomas@intevation.de> parents: 1680 diff changeset	704 olddir = os.getcwd()
20b621154e17 Run commit message editor in the repo root (like hooks). Thomas Arendsen Hein <thomas@intevation.de> parents: 1680 diff changeset	705 os.chdir(self.root)
2301 7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	706 text = self.ui.edit("\n".join(edittext), user)
1706 20b621154e17 Run commit message editor in the repo root (like hooks). Thomas Arendsen Hein <thomas@intevation.de> parents: 1680 diff changeset	707 os.chdir(olddir)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	708
2301 7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	709 lines = [line.rstrip() for line in text.rstrip().splitlines()]
7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	710 while lines and not lines[0]:
7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	711 del lines[0]
7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	712 if not lines:
7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	713 return None
7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	714 text = '\n'.join(lines)
3419 d0459ec1455d Add branch support to commit Matt Mackall <mpm@selenic.com> parents: 3418 diff changeset	715 extra = {}
d0459ec1455d Add branch support to commit Matt Mackall <mpm@selenic.com> parents: 3418 diff changeset	716 if branchname:
d0459ec1455d Add branch support to commit Matt Mackall <mpm@selenic.com> parents: 3418 diff changeset	717 extra["branch"] = branchname
d0459ec1455d Add branch support to commit Matt Mackall <mpm@selenic.com> parents: 3418 diff changeset	718 n = self.changelog.add(mn, changed + remove, text, tr, p1, p2,
d0459ec1455d Add branch support to commit Matt Mackall <mpm@selenic.com> parents: 3418 diff changeset	719 user, date, extra)
1727 019e6a47a53e fix names of parent changeset ids in hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1726 diff changeset	720 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
019e6a47a53e fix names of parent changeset ids in hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1726 diff changeset	721 parent2=xp2)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	722 tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	723
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	724 self.dirstate.setparents(n)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	725 self.dirstate.update(new, "n")
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	726 self.dirstate.forget(remove)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	727
1727 019e6a47a53e fix names of parent changeset ids in hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1726 diff changeset	728 self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2)
901 120cba94d5aa Change repo.comit to return None on error or the new revision number on mason@suse.com parents: 900 diff changeset	729 return n
660 2c83350784c3 Move commit hook after commit completes Matt Mackall <mpm@selenic.com> parents: 659 diff changeset	730
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	731 def walk(self, node=None, files=[], match=util.always, badmatch=None):
3532 26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	732 '''
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	733 walk recursively through the directory tree or a given
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	734 changeset, finding all files matched by the match
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	735 function
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	736
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	737 results are yielded in a tuple (src, filename), where src
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	738 is one of:
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	739 'f' the file was found in the directory tree
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	740 'm' the file was only in the dirstate and not in the tree
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	741 'b' file was not found and matched badmatch
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	742 '''
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3513 diff changeset	743
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	744 if node:
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	745 fdict = dict.fromkeys(files)
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	746 for fn in self.manifest.read(self.changelog.read(node)[0]):
3019 aebc3f64b20f fix incorrect warning when walking on a particular rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2967 diff changeset	747 for ffn in fdict:
aebc3f64b20f fix incorrect warning when walking on a particular rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2967 diff changeset	748 # 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: 2967 diff changeset	749 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: 2967 diff changeset	750 del fdict[ffn]
aebc3f64b20f fix incorrect warning when walking on a particular rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2967 diff changeset	751 break
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	752 if match(fn):
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	753 yield 'm', fn
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	754 for fn in fdict:
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	755 if badmatch and badmatch(fn):
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	756 if match(fn):
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	757 yield 'b', fn
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	758 else:
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	759 self.ui.warn(_('%s: No such file in rev %s\n') % (
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	760 util.pathto(self.getcwd(), 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	761 else:
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2038 diff changeset	762 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	763 yield src, fn
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	764
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	765 def status(self, node1=None, node2=None, files=[], match=util.always,
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	766 wlock=None, list_ignored=False, list_clean=False):
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	767 """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	768
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	769 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	770 If node2 is None, compare node1 with working directory.
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	771 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	772
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	773 def fcmp(fn, mf):
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	774 t1 = self.wread(fn)
2887 05257fd28591 filelog: add hash-based comparisons Matt Mackall <mpm@selenic.com> parents: 2875 diff changeset	775 return self.file(fn).cmp(mf.get(fn, nullid), t1)
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	776
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	777 def mfmatches(node):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	778 change = self.changelog.read(node)
3322 a1aad25ccc3e fix localrepo.status when dealing with x-bit changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3293 diff changeset	779 mf = self.manifest.read(change[0]).copy()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	780 for fn in mf.keys():
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	781 if not match(fn):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	782 del mf[fn]
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	783 return mf
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	784
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	785 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	786 ignored, clean = [], []
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	787
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	788 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	789 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	790 compareworking = True
1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	791
1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	792 if not compareworking:
1802 8a7a24b96697 speed up hg log --debug Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1789 diff changeset	793 # 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	794 # 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	795 # 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	796 mf1 = mfmatches(node1)
8a7a24b96697 speed up hg log --debug Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1789 diff changeset	797
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	798 # are we comparing the working directory?
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	799 if not node2:
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	800 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	801 try:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	802 wlock = self.wlock(wait=0)
1754 fdfe89a3962d use repo.lock when cloning via copy, use lock.LockException when necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1752 diff changeset	803 except lock.LockException:
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	804 wlock = None
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	805 (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	806 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	807 list_ignored, list_clean)
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	808
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	809 # are we comparing working dir against its parent?
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	810 if compareworking:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	811 if lookup:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	812 # do a full compare of any files that might have changed
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	813 mf2 = mfmatches(self.dirstate.parents()[0])
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	814 for f in lookup:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	815 if fcmp(f, mf2):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	816 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: 2887 diff changeset	817 else:
5bb65c3945a3 localrepo.status: detect clean files even when the mtime has changed Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2887 diff changeset	818 clean.append(f)
5bb65c3945a3 localrepo.status: detect clean files even when the mtime has changed Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2887 diff changeset	819 if wlock is not None:
5bb65c3945a3 localrepo.status: detect clean files even when the mtime has changed Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2887 diff changeset	820 self.dirstate.update([f], "n")
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	821 else:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	822 # we are comparing working dir against non-parent
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	823 # generate a pseudo-manifest for the working dir
3322 a1aad25ccc3e fix localrepo.status when dealing with x-bit changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3293 diff changeset	824 # XXX: create it in dirstate.py ?
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	825 mf2 = mfmatches(self.dirstate.parents()[0])
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	826 for f in lookup + modified + added:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	827 mf2[f] = ""
3322 a1aad25ccc3e fix localrepo.status when dealing with x-bit changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3293 diff changeset	828 mf2.set(f, execf=util.is_exec(self.wjoin(f), mf2.execf(f)))
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	829 for f in removed:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	830 if f in mf2:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	831 del mf2[f]
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	832 else:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	833 # we are comparing two revisions
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	834 mf2 = mfmatches(node2)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	835
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	836 if not compareworking:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	837 # 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	838 modified, added, clean = [], [], []
566 b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	839
2474 1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	840 # 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	841 # reasonable order
1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	842 mf2keys = mf2.keys()
1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	843 mf2keys.sort()
1e32e2fe8a67 Fix cold cache diff performance Chris Mason <mason@suse.com> parents: 2463 diff changeset	844 for fn in mf2keys:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	845 if mf1.has_key(fn):
3322 a1aad25ccc3e fix localrepo.status when dealing with x-bit changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3293 diff changeset	846 if mf1.flags(fn) != mf2.flags(fn) or \
a1aad25ccc3e fix localrepo.status when dealing with x-bit changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3293 diff changeset	847 (mf1[fn] != mf2[fn] and (mf2[fn] != "" or fcmp(fn, mf1))):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	848 modified.append(fn)
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	849 elif list_clean:
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	850 clean.append(fn)
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	851 del mf1[fn]
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	852 else:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	853 added.append(fn)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	854
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	855 removed = mf1.keys()
ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	856
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	857 # 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	858 for l in modified, added, removed, deleted, unknown, ignored, clean:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	859 l.sort()
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	860 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	861
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	862 def add(self, list, wlock=None):
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	863 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	864 wlock = self.wlock()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	865 for f in list:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	866 p = self.wjoin(f)
611 48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	867 if not os.path.exists(p):
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	868 self.ui.warn(_("%s does not exist!\n") % f)
611 48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	869 elif not os.path.isfile(p):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	870 self.ui.warn(_("%s not added: only files supported currently\n")
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	871 % f)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	872 elif self.dirstate.state(f) in 'an':
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	873 self.ui.warn(_("%s already tracked!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	874 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	875 self.dirstate.update([f], "a")
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	876
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	877 def forget(self, list, wlock=None):
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	878 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	879 wlock = self.wlock()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	880 for f in list:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	881 if self.dirstate.state(f) not in 'ai':
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	882 self.ui.warn(_("%s not added!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	883 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	884 self.dirstate.forget([f])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	885
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	886 def remove(self, list, unlink=False, wlock=None):
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	887 if unlink:
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	888 for f in list:
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	889 try:
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	890 util.unlink(self.wjoin(f))
c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	891 except OSError, inst:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	892 if inst.errno != errno.ENOENT:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	893 raise
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	894 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	895 wlock = self.wlock()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	896 for f in list:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	897 p = self.wjoin(f)
611 48c3eb2bf844 * clean up error handling when user requests to use a non file object shaleh@speakeasy.net parents: 609 diff changeset	898 if os.path.exists(p):
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	899 self.ui.warn(_("%s still exists!\n") % f)
402 2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: 385 diff changeset	900 elif self.dirstate.state(f) == 'a':
657 22bc6fb9aefc dirstate.forget() takes a list Matt Mackall <mpm@selenic.com> parents: 656 diff changeset	901 self.dirstate.forget([f])
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	902 elif f not in self.dirstate:
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	903 self.ui.warn(_("%s not tracked!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	904 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	905 self.dirstate.update([f], "r")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	906
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	907 def undelete(self, list, wlock=None):
1448 182879d71922 Allow reverting a deleted file with two parents Matt Mackall <mpm@selenic.com> parents: 1447 diff changeset	908 p = self.dirstate.parents()[0]
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	909 mn = self.changelog.read(p)[0]
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	910 m = self.manifest.read(mn)
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	911 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	912 wlock = self.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	913 for f in list:
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	914 if self.dirstate.state(f) not in "r":
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	915 self.ui.warn("%s not removed!\n" % f)
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	916 else:
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	917 t = self.file(f).read(m[f])
1477 d3566eda2bcb util.opener already create the base directory if it doesn't exist Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1473 diff changeset	918 self.wwrite(f, t)
2840 046a8b03ea59 Change remaining users of manifest flags Matt Mackall <mpm@selenic.com> parents: 2836 diff changeset	919 util.set_exec(self.wjoin(f), m.execf(f))
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	920 self.dirstate.update([f], "n")
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	921
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	922 def copy(self, source, dest, wlock=None):
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	923 p = self.wjoin(dest)
781 26f3d353851f Fix copy in subdirectories mpm@selenic.com parents: 780 diff changeset	924 if not os.path.exists(p):
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	925 self.ui.warn(_("%s does not exist!\n") % dest)
781 26f3d353851f Fix copy in subdirectories mpm@selenic.com parents: 780 diff changeset	926 elif not os.path.isfile(p):
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	927 self.ui.warn(_("copy failed: %s is not a file\n") % dest)
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	928 else:
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	929 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	930 wlock = self.wlock()
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	931 if self.dirstate.state(dest) == '?':
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	932 self.dirstate.update([dest], "a")
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	933 self.dirstate.copy(source, dest)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	934
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	935 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	936 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	937 # 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	938 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	939 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	940 return [n for (r, n) in heads]
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	941
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	942 # branchlookup returns a dict giving a list of branches for
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	943 # each head. A branch is defined as the tag of a node or
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	944 # the branch of the node's parents. If a node has multiple
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	945 # branch tags, tags are eliminated if they are visible from other
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	946 # branch tags.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	947 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	948 # So, for this graph: a->b->c->d->e
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	949 # \ /
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	950 # aa -----/
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	951 # a has tag 2.6.12
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	952 # d has tag 2.6.13
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	953 # e would have branch tags for 2.6.12 and 2.6.13. Because the node
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	954 # for 2.6.12 can be reached from the node 2.6.13, that is eliminated
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	955 # from the list.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	956 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	957 # It is possible that more than one head will have the same branch tag.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	958 # callers need to check the result for multiple heads under the same
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	959 # branch tag if that is a problem for them (ie checkout of a specific
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	960 # branch).
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	961 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	962 # passing in a specific branch will limit the depth of the search
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	963 # through the parents. It won't limit the branches returned in the
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	964 # result though.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	965 def branchlookup(self, heads=None, branch=None):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	966 if not heads:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	967 heads = self.heads()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	968 headt = [ h for h in heads ]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	969 chlog = self.changelog
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	970 branches = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	971 merges = []
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	972 seenmerge = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	973
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	974 # traverse the tree once for each head, recording in the branches
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	975 # dict which tags are visible from this head. The branches
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	976 # dict also records which tags are visible from each tag
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	977 # while we traverse.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	978 while headt or merges:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	979 if merges:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	980 n, found = merges.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	981 visit = [n]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	982 else:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	983 h = headt.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	984 visit = [h]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	985 found = [h]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	986 seen = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	987 while visit:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	988 n = visit.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	989 if n in seen:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	990 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	991 pp = chlog.parents(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	992 tags = self.nodetags(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	993 if tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	994 for x in tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	995 if x == 'tip':
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	996 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	997 for f in found:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	998 branches.setdefault(f, {})[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	999 branches.setdefault(n, {})[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1000 break
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1001 if n not in found:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1002 found.append(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1003 if branch in tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1004 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1005 seen[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1006 if pp[1] != nullid and n not in seenmerge:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1007 merges.append((pp[1], [x for x in found]))
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1008 seenmerge[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1009 if pp[0] != nullid:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1010 visit.append(pp[0])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1011 # traverse the branches dict, eliminating branch tags from each
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1012 # head that are visible from another branch tag for that head.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1013 out = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1014 viscache = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1015 for h in heads:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1016 def visible(node):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1017 if node in viscache:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1018 return viscache[node]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1019 ret = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1020 visit = [node]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1021 while visit:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1022 x = visit.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1023 if x in viscache:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1024 ret.update(viscache[x])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1025 elif x not in ret:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1026 ret[x] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1027 if x in branches:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1028 visit[len(visit):] = branches[x].keys()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1029 viscache[node] = ret
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1030 return ret
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1031 if h not in branches:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1032 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1033 # O(n^2), but somewhat limited. This only searches the
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1034 # tags visible from a specific head, not all the tags in the
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1035 # whole repo.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1036 for b in branches[h]:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1037 vis = False
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1038 for bb in branches[h].keys():
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1039 if b != bb:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1040 if b in visible(bb):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1041 vis = True
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1042 break
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1043 if not vis:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1044 l = out.setdefault(h, [])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1045 l[len(l):] = self.nodetags(b)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1046 return out
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1047
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1048 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	1049 if not nodes:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1050 nodes = [self.changelog.tip()]
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1051 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1052 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1053 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	1054 while 1:
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1055 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1056 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	1057 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	1058 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1059 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1060 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1061
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1062 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1063 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1064
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1065 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1066 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1067 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1068
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1069 while n != bottom:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1070 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1071 if i == f:
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	1072 l.append(n)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1073 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1074 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1075 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1076
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1077 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1078
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1079 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1080
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1081 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	1082 """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	1083
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1084 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	1085 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	1086 in both remote and self.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1087 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	1088 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	1089 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	1090 or ancestors of these heads.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1091
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1092 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	1093 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	1094 (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	1095 outgoing)
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1096 """
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1097 m = self.changelog.nodemap
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1098 search = []
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1099 fetch = {}
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1100 seen = {}
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1101 seenbranch = {}
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1102 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1103 base = {}
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	1104
2108 30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1105 if not heads:
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1106 heads = remote.heads()
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1107
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1108 if self.changelog.tip() == nullid:
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1109 base[nullid] = 1
2108 30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1110 if heads != [nullid]:
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1111 return [nullid]
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1112 return []
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1113
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1114 # 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	1115 # 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	1116 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	1117
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1118 unknown = []
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1119 for h in heads:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1120 if h not in m:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1121 unknown.append(h)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1122 else:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1123 base[h] = 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1124
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1125 if not unknown:
1895 d7c038e805e9 findincoming should return an iterable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1893 diff changeset	1126 return []
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1127
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1128 req = dict.fromkeys(unknown)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1129 reqcnt = 0
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1130
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1131 # search through remote branches
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1132 # 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	1133 # head, root, first parent, second parent
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1134 # (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	1135 unknown = remote.branches(unknown)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1136 while unknown:
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1137 r = []
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1138 while unknown:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1139 n = unknown.pop(0)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1140 if n[0] in seen:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1141 continue
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1142
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1143 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	1144 % (short(n[0]), short(n[1])))
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1145 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	1146 pass
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1147 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	1148 self.ui.debug(_("branch already found\n"))
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1149 continue
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1150 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	1151 self.ui.debug(_("found incomplete branch %s:%s\n")
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1152 % (short(n[0]), short(n[1])))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1153 search.append(n) # schedule branch range for scanning
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1154 seenbranch[n] = 1
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1155 else:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1156 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	1157 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	1158 self.ui.debug(_("found new changeset %s\n") %
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1159 short(n[1]))
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1160 fetch[n[1]] = 1 # earliest unknown
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1161 for p in n[2:4]:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1162 if p in m:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1163 base[p] = 1 # latest known
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1164
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1165 for p in n[2:4]:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1166 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	1167 r.append(p)
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1168 req[p] = 1
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1169 seen[n[0]] = 1
dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1170
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1171 if r:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1172 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	1173 self.ui.debug(_("request %d: %s\n") %
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1174 (reqcnt, " ".join(map(short, r))))
3473 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3452 diff changeset	1175 for p in xrange(0, len(r), 10):
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1176 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	1177 self.ui.debug(_("received %s:%s\n") %
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1178 (short(b[0]), short(b[1])))
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1179 unknown.append(b)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1180
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1181 # 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	1182 while search:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1183 n = search.pop(0)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1184 reqcnt += 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1185 l = remote.between([(n[0], n[1])])[0]
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1186 l.append(n[1])
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1187 p = n[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1188 f = 1
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1189 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	1190 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	1191 if i in m:
85 58a1a0425c9b Fix merge bug, I hope mpm@selenic.com parents: 83 diff changeset	1192 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	1193 self.ui.debug(_("found new branch changeset %s\n") %
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1194 short(p))
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1195 fetch[p] = 1
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1196 base[i] = 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1197 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	1198 self.ui.debug(_("narrowed branch search to %s:%s\n")
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1199 % (short(p), short(i)))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1200 search.append((p, i))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1201 break
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1202 p, f = i, f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1203
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1204 # sanity check our fetch list
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1205 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	1206 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	1207 raise repo.RepoError(_("already have changeset ") + short(f[:4]))
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1208
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1209 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	1210 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	1211 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	1212 else:
d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1213 raise util.Abort(_("repository is unrelated"))
511 9f67222186bd Disallow merging of unrelated projects mpm@selenic.com parents: 504 diff changeset	1214
2965 96d034d02d61 Demote a pull note to a debug message Matt Mackall <mpm@selenic.com> parents: 2961 diff changeset	1215 self.ui.debug(_("found new changesets starting at ") +
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1216 " ".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	1217
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	1218 self.ui.debug(_("%d total queries\n") % reqcnt)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1219
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1220 return fetch.keys()
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	1221
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1222 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	1223 """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	1224
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1225 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	1226 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	1227 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	1228 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	1229 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	1230 """
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1231 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1232 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	1233 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	1234
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	1235 self.ui.debug(_("common changesets up to ")
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1236 + " ".join(map(short, base.keys())) + "\n")
05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1237
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1238 remain = dict.fromkeys(self.changelog.nodemap)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1239
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1240 # 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	1241 del remain[nullid]
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1242 remove = base.keys()
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1243 while remove:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1244 n = remove.pop(0)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1245 if n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1246 del remain[n]
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1247 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	1248 remove.append(p)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1249
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1250 # 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	1251 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	1252 # 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	1253 updated_heads = {}
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1254 for n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1255 p1, p2 = self.changelog.parents(n)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1256 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	1257 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	1258 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	1259 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	1260 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	1261 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	1262 updated_heads[p2] = True
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1263
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1264 # 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	1265 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	1266 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	1267 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	1268 return subset
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1269
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1270 def pull(self, remote, heads=None, force=False, lock=None):
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1271 mylock = False
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1272 if not lock:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1273 lock = self.lock()
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1274 mylock = True
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1275
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1276 try:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1277 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	1278 if fetch == [nullid]:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1279 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	1280
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1281 if not fetch:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1282 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	1283 return 0
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1284
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1285 if heads is None:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1286 cg = remote.changegroup(fetch, 'pull')
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1287 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	1288 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	1289 raise util.Abort(_("Partial pull cannot be done because other repository doesn't support changegroupsubset."))
2827 2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1290 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	1291 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	1292 finally:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1293 if mylock:
2a0c599f7bb0 fetch: hold lock and wlock across all operations Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2803 diff changeset	1294 lock.release()
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1295
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	1296 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	1297 # 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	1298 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1299 # 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	1300 # 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	1301 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1302 # 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	1303 # servers, http servers).
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1304
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1305 if remote.capable('unbundle'):
2463 6ab016edd5c4 localrepository.push: propagate return value Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1306 return self.push_unbundle(remote, force, revs)
6ab016edd5c4 localrepository.push: propagate return value Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2448 diff changeset	1307 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	1308
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1309 def prepush(self, remote, force, revs):
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1310 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	1311 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	1312 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	1313 if not force and inc:
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	1314 self.ui.warn(_("abort: unsynced remote changes!\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	1315 self.ui.status(_("(did you forget to sync?"
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1316 " 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	1317 return None, 1
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1318
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	1319 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	1320 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	1321 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	1322 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	1323 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	1324
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1325 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	1326 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	1327 return None, 1
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1328 elif not force:
2109 1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2108 diff changeset	1329 # FIXME we don't properly detect creation of new heads
1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2108 diff changeset	1330 # in the push -r case, assume the user knows what he's doing
1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2108 diff changeset	1331 if not revs and len(remote_heads) < len(heads) \
1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2108 diff changeset	1332 and remote_heads != [nullid]:
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	1333 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	1334 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	1335 " 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	1336 return None, 1
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1337
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	1338 if revs is None:
1782 b9671b41e360 merge with crew Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1781 1754 diff changeset	1339 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	1340 else:
1782 b9671b41e360 merge with crew Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1781 1754 diff changeset	1341 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	1342 return cg, remote_heads
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1343
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1344 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	1345 lock = remote.lock()
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1346
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1347 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	1348 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	1349 cg, remote_heads = ret
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1350 return remote.addchangegroup(cg, 'push', self.url())
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1351 return ret[1]
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1352
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1353 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	1354 # 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	1355 # 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	1356 # 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	1357 # aborts.
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1358
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1359 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	1360 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	1361 cg, remote_heads = ret
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1362 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	1363 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	1364 return ret[1]
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1365
3513 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1366 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	1367 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	1368 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	1369 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	1370 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	1371 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	1372
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1373 def changegroupsubset(self, bases, heads, source):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1374 """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	1375 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	1376 the heads.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1377
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1378 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	1379 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	1380 is non-trivial.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1381
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1382 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	1383 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	1384
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1385 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1386
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1387 # Set up some initial variables
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1388 # 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	1389 cl = self.changelog
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1390 # 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	1391 # changegroup.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1392 msng_cl_lst, bases, heads = cl.nodesbetween(bases, heads)
3513 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1393 self.changegroupinfo(msng_cl_lst)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1394 # 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	1395 # 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	1396 # necessary to re-create the changegroup.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1397
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1398 # 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	1399 # 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	1400 knownheads = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1401 # 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	1402 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	1403 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	1404 if p != nullid:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1405 knownheads[p] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1406 knownheads = knownheads.keys()
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1407 if knownheads:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1408 # 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	1409 # 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	1410 # 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	1411 # changeset.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1412 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	1413 junk = None
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1414 # 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	1415 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	1416 else:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1417 # 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	1418 # know about any changesets.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1419 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	1420
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1421 # 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	1422 mnfst = self.manifest
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1423 # 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	1424 msng_mnfst_set = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1425 # 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	1426 msng_filenode_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1427
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1428 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	1429 junk = None
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1430
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1431 # 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	1432 # 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	1433 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1434 return x
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1435
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1436 # 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	1437 # inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1438 def cmp_by_rev_func(revlog):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1439 # 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	1440 # 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	1441 # 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	1442 # 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	1443 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	1444 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	1445 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	1446
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1447 # 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	1448 # 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	1449 # 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	1450 # 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	1451 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	1452 haslst = hasset.keys()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1453 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	1454 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	1455 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	1456 while parentlst:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1457 n = parentlst.pop()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1458 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	1459 hasset[n] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1460 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	1461 parentlst.extend(p)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1462 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	1463 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	1464
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1465 # 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	1466 # 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	1467 def manifest_and_file_collector(changedfileset):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1468 # 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	1469 # 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	1470 # 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	1471 # 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	1472 # 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	1473 # changed in any changeset in the changegroup.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1474 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1475 # 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	1476 # 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	1477 # the manifest.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1478 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	1479 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	1480 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	1481 # 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	1482 # 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	1483 changedfileset.setdefault(f, f)
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1484 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	1485 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	1486
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1487 # 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	1488 # 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	1489 # 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	1490 def prune_manifests():
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1491 has_mnfst_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1492 for n in msng_mnfst_set:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1493 # 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	1494 # 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	1495 # 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	1496 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	1497 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	1498 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	1499 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	1500
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1501 # 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	1502 # 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	1503 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	1504 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	1505
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1506 # 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	1507 # 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	1508 def filenode_collector(changedfiles):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1509 next_rev = [0]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1510 # 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	1511 # 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	1512 # 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	1513 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1514 # 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	1515 # 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	1516 # 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	1517 def collect_msng_filenodes(mnfstnode):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1518 r = mnfst.rev(mnfstnode)
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1519 if r == next_rev[0]:
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1520 # 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	1521 # 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	1522 delta = mdiff.patchtext(mnfst.delta(mnfstnode))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1523 # 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	1524 for dline in delta.splitlines():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1525 # 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	1526 f, fnode = dline.split('\0')
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1527 fnode = bin(fnode[:40])
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1528 f = changedfiles.get(f, None)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1529 # 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	1530 # about.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1531 if f is not None:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1532 # Get the changenode this manifest belongs to
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1533 clnode = msng_mnfst_set[mnfstnode]
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1534 # 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	1535 # there isn't one already.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1536 ndset = msng_filenode_set.setdefault(f, {})
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1537 # 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	1538 # 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	1539 ndset.setdefault(fnode, clnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1540 else:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1541 # Otherwise we need a full manifest.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1542 m = mnfst.read(mnfstnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1543 # For every file in we care about.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1544 for f in changedfiles:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1545 fnode = m.get(f, None)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1546 # If it's in the manifest
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1547 if fnode is not None:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1548 # See comments above.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1549 clnode = msng_mnfst_set[mnfstnode]
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1550 ndset = msng_filenode_set.setdefault(f, {})
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1551 ndset.setdefault(fnode, clnode)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1552 # 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	1553 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	1554 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	1555
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1556 # 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	1557 # 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	1558 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	1559 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	1560 hasset = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1561 # 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	1562 # 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	1563 # that filenode.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1564 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	1565 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	1566 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	1567 hasset[n] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1568 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	1569
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1570 # 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	1571 # inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1572 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	1573 msngset = msng_filenode_set[fname]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1574 # 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	1575 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	1576 return msngset[fnode]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1577 return lookup_filenode_link
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1578
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1579 # 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	1580 # 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	1581 def gengroup():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1582 # 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	1583 changedfiles = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1584 # 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	1585 # 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	1586 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	1587 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	1588 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	1589 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1590
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1591 # 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	1592 # 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	1593 prune_manifests()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1594 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	1595 # 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	1596 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	1597 # 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	1598 # 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	1599 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	1600 filenode_collector(changedfiles))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1601 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	1602 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1603
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1604 # 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	1605 # them.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1606 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	1607 msng_mnfst_set.clear()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1608
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1609 changedfiles = changedfiles.keys()
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1610 changedfiles.sort()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1611 # 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	1612 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	1613 filerevlog = self.file(fname)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1614 # 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	1615 # 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	1616 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	1617 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	1618 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	1619 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	1620 msng_filenode_lst = []
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1621 # 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	1622 # 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	1623 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	1624 yield changegroup.genchunk(fname)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1625 # 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	1626 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	1627 # 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	1628 # 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	1629 # from filenodes.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1630 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	1631 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	1632 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	1633 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	1634 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	1635 # 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	1636 del msng_filenode_set[fname]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1637 # 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	1638 yield changegroup.closechunk()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1639
2150 f15c6394d90d fix a NameError in changegroupsubset Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2149 diff changeset	1640 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	1641 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	1642
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1643 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	1644
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1645 def changegroup(self, basenodes, source):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1646 """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	1647 doesn't.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1648
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1649 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	1650 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	1651
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1652 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1653
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1654 cl = self.changelog
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1655 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	1656 revset = dict.fromkeys([cl.rev(n) for n in nodes])
3513 9383af6f236d Show number (-v) and list (--debug) of changesets with bundle/pull/push etc. Thomas Arendsen Hein <thomas@intevation.de> parents: 3500 diff changeset	1657 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	1658
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1659 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1660 return x
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1661
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1662 def gennodelst(revlog):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1663 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	1664 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	1665 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	1666 yield n
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1667
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1668 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	1669 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	1670 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	1671 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	1672 changedfileset[fname] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1673 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	1674
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1675 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	1676 def lookuprevlink(n):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1677 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	1678 return lookuprevlink
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1679
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1680 def gengroup():
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1681 # 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	1682 changedfiles = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1683
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 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	1685 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	1686 yield chnk
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1687 changedfiles = changedfiles.keys()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1688 changedfiles.sort()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1689
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1690 mnfst = self.manifest
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1691 nodeiter = gennodelst(mnfst)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1692 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	1693 yield chnk
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1694
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1695 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	1696 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	1697 nodeiter = gennodelst(filerevlog)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1698 nodeiter = list(nodeiter)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1699 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	1700 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	1701 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	1702 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	1703 yield chnk
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1704
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1967 diff changeset	1705 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	1706
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1707 if nodes:
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1708 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	1709
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1710 return util.chunkbuffer(gengroup())
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1711
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1712 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	1713 """add changegroup to repo.
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1714 returns number of heads modified or added + 1."""
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1715
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1716 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	1717 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	1718 return cl.count()
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1719
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1720 def revmap(x):
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1721 return cl.rev(x)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1722
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1723 if not source:
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1724 return 0
1730 0f1d2c75db5e add prechangegroup and pretxnchangegroup hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1721 diff changeset	1725
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1726 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	1727
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1728 changesets = files = revisions = 0
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	1729
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1730 tr = self.transaction()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1731
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1732 # 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	1733 # inconsistent view
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1734 cl = None
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1735 try:
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	1736 cl = appendfile.appendchangelog(self.sopener,
ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	1737 self.changelog.version)
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1738
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1739 oldheads = len(cl.heads())
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1740
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1741 # pull off the changeset group
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1742 self.ui.status(_("adding changesets\n"))
2347 5b178298b7f4 use a more reliable way to find what are the new changesets on pull/unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2346 diff changeset	1743 cor = cl.count() - 1
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1744 chunkiter = changegroup.chunkiter(source)
2354 16276b1c0658 Manifest groups may be empty, so don't abort in this case (fixes issue210). Thomas Arendsen Hein <thomas@intevation.de> parents: 2347 diff changeset	1745 if cl.addgroup(chunkiter, csmap, tr, 1) is None:
16276b1c0658 Manifest groups may be empty, so don't abort in this case (fixes issue210). Thomas Arendsen Hein <thomas@intevation.de> parents: 2347 diff changeset	1746 raise util.Abort(_("received changelog group is empty"))
2347 5b178298b7f4 use a more reliable way to find what are the new changesets on pull/unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2346 diff changeset	1747 cnr = cl.count() - 1
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1748 changesets = cnr - cor
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1749
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1750 # pull off the manifest group
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1751 self.ui.status(_("adding manifests\n"))
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1752 chunkiter = changegroup.chunkiter(source)
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1753 # no need to check for empty manifest group here:
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1754 # if the result of the merge of 1 and 2 is the same in 3 and 4,
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1755 # no new manifest will be created and the manifest group will
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1756 # be empty during the pull
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1757 self.manifest.addgroup(chunkiter, revmap, tr)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1758
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1759 # process the files
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1760 self.ui.status(_("adding file changes\n"))
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1761 while 1:
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1762 f = changegroup.getchunk(source)
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1763 if not f:
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1764 break
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1765 self.ui.debug(_("adding %s revisions\n") % f)
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1766 fl = self.file(f)
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1767 o = fl.count()
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1768 chunkiter = changegroup.chunkiter(source)
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1769 if fl.addgroup(chunkiter, revmap, tr) is None:
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1770 raise util.Abort(_("received file revlog group is empty"))
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1771 revisions += fl.count() - o
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1772 files += 1
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1773
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1774 cl.writedata()
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1775 finally:
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1776 if cl:
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1777 cl.cleanup()
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1778
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1779 # make changelog see real files again
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	1780 self.changelog = changelog.changelog(self.sopener,
ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	1781 self.changelog.version)
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	1782 self.changelog.checkinlinesize(tr)
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1783
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1784 newheads = len(self.changelog.heads())
35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1785 heads = ""
2424 092039246d73 Report on push/pull if heads are merged, too, like for new heads. Thomas Arendsen Hein <thomas@intevation.de> parents: 2395 diff changeset	1786 if oldheads and newheads != oldheads:
092039246d73 Report on push/pull if heads are merged, too, like for new heads. Thomas Arendsen Hein <thomas@intevation.de> parents: 2395 diff changeset	1787 heads = _(" (%+d heads)") % (newheads - oldheads)
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1788
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	1789 self.ui.status(_("added %d changesets"
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	1790 " with %d changes to %d files%s\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	1791 % (changesets, revisions, files, heads))
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1792
2259 181b0643ffb1 fix a traceback when unbundling does not add any changesets Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2232 diff changeset	1793 if changesets > 0:
181b0643ffb1 fix a traceback when unbundling does not add any changesets Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2232 diff changeset	1794 self.hook('pretxnchangegroup', throw=True,
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1795 node=hex(self.changelog.node(cor+1)), source=srctype,
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2661 diff changeset	1796 url=url)
1730 0f1d2c75db5e add prechangegroup and pretxnchangegroup hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1721 diff changeset	1797
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1798 tr.close()
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1799
1375 f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	1800 if changesets > 0:
2229 0ff326c2b286 changegroup hooks: add source to hook parameters Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	1801 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	1802 source=srctype, url=url)
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1803
3473 0e68608bd11d use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3452 diff changeset	1804 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	1805 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	1806 source=srctype, url=url)
1316 b650bfdfc7ee Hook fixups mpm@selenic.com parents: 1280 diff changeset	1807
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1808 return newheads - oldheads + 1
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1809
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1810
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1811 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	1812 fp = remote.stream_out()
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1813 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1814 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1815 resp = int(l)
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1816 except ValueError:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1817 raise util.UnexpectedOutput(
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1818 _('Unexpected response from remote server:'), l)
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1819 if resp != 0:
5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1820 raise util.Abort(_('operation forbidden by server'))
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1821 self.ui.status(_('streaming all changes\n'))
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1822 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1823 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1824 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: 3513 diff changeset	1825 except ValueError, TypeError:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1826 raise util.UnexpectedOutput(
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1827 _('Unexpected response from remote server:'), l)
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1828 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	1829 (total_files, util.bytecount(total_bytes)))
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1830 start = time.time()
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1831 for i in xrange(total_files):
3564 eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1832 l = fp.readline()
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1833 try:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1834 name, size = l.split('\0', 1)
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1835 size = int(size)
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1836 except ValueError, TypeError:
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1837 raise util.UnexpectedOutput(
eda9e7c9300d New UnexpectedOutput exception to catch server errors in localrepo.stream_in Thomas Arendsen Hein <thomas@intevation.de> parents: 3513 diff changeset	1838 _('Unexpected response from remote server:'), l)
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1839 self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size)))
3457 ff06fe0703ef localrepo: add separate methods for manipulating repository data Matt Mackall <mpm@selenic.com> parents: 3456 diff changeset	1840 ofp = self.sopener(name, 'w')
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1841 for chunk in util.filechunkiter(fp, limit=size):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1842 ofp.write(chunk)
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1843 ofp.close()
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1844 elapsed = time.time() - start
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1845 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	1846 (util.bytecount(total_bytes), elapsed,
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1847 util.bytecount(total_bytes / elapsed)))
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1848 self.reload()
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1849 return len(self.heads()) + 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1850
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	1851 def clone(self, remote, heads=[], stream=False):
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1852 '''clone remote repository.
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1853
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1854 keyword arguments:
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1855 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	1856 stream: use streaming clone if possible'''
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1857
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	1858 # 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	1859 # 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	1860 # them.
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1861
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1862 # 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	1863 # 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	1864 # uncompressed only if compatible.
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1865
2613 479e26afa10f clone: do not make streaming default. add --stream option instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	1866 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	1867 return self.stream_in(remote)
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2601 diff changeset	1868 return self.pull(remote, heads)
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1869
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1870 # used to avoid circular references so destructors work
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1871 def aftertrans(base):
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1872 p = base
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1873 def a():
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1874 util.rename(os.path.join(p, "journal"), os.path.join(p, "undo"))
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1875 util.rename(os.path.join(p, "journal.dirstate"),
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1876 os.path.join(p, "undo.dirstate"))
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1877 return a
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	1878
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	1879 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	1880 return localrepository(ui, util.drop_scheme('file', path), create)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3164 diff changeset	1881
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	1882 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	1883 return True

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/localrepo.py @ 3577:7f7425306925