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

annotate mercurial/localrepo.py @ 3016:aebc3f64b20f

fix incorrect warning when walking on a particular rev when a directory was given instead of a file it reported incorrectly 'No such file or directory in rev <rev>' we test if the file is a prefix directory

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date	Mon, 28 Aug 2006 21:49:02 +0200
parents	eef469259745
children	4d0e0f149581

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

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/localrepo.py @ 3016:aebc3f64b20f