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

annotate mercurial/localrepo.py @ 2439:e8c4f3d3df8c

extend network protocol to stop clients from locking servers now all repositories have capabilities slot, tuple with list of names. if 'unbundle' capability present, repo supports push where client does not need to lock server. repository classes that have unbundle capability also have unbundle method. implemented for ssh now, will be base for push over http. unbundle protocol acts this way. server tells client what heads it has during normal negotiate step. client starts unbundle by repeat server's heads back to it. if server has new heads, abort immediately. otherwise, transfer changes to server. once data transferred, server locks and checks heads again. if heads same, changes can be added. else someone else added heads, and server aborts. if client wants to force server to add heads, sends special heads list of 'force'.

author	Vadim Gelfer <vadim.gelfer@gmail.com>
date	Thu, 15 Jun 2006 16:37:23 -0700
parents	092039246d73
children	b77a2ef61b81

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 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
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
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1967 diff changeset	8 import os, util
1100 d6b6a15cc7c6 localrepo: more import/namespace tidying mpm@selenic.com parents: 1094 1097 diff changeset	9 import filelog, manifest, changelog, dirstate, repo
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	10 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	11 from i18n import gettext as _
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	12 from demandload import *
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	13 demandload(globals(), "appendfile changegroup")
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")
2335 f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2320 diff changeset	15 demandload(globals(), "revlog")
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 495 diff changeset	16
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	17 class localrepository(object):
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):
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	23 if not path:
2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	24 p = os.getcwd()
2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	25 while not os.path.isdir(os.path.join(p, ".hg")):
2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	26 oldp = p
2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	27 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	28 if p == oldp:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	29 raise repo.RepoError(_("no repo found"))
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	30 path = p
2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	31 self.path = os.path.join(path, ".hg")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	32
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	33 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	34 raise repo.RepoError(_("repository %s not found") % path)
405 99470ae6b424 Check if repository exists mpm@selenic.com parents: 402 diff changeset	35
933 9c43d68ad59f Fixed --repository option when handling relative path tksoh@users.sf.net parents: 926 diff changeset	36 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	37 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	38 self.ui = ui.ui(parentui=parentui)
1102 c81d264cd17d localrepo: minor opener usage restructuring mpm@selenic.com parents: 1101 1101 diff changeset	39 self.opener = util.opener(self.path)
c81d264cd17d localrepo: minor opener usage restructuring mpm@selenic.com parents: 1101 1101 diff changeset	40 self.wopener = util.opener(self.root)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	41
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	42 try:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	43 self.ui.readconfig(self.join("hgrc"), self.root)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	44 except IOError:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	45 pass
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	46
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	47 v = self.ui.revlogopts
2222 c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	48 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	49 self.revlogv1 = self.revlogversion != revlog.REVLOGV0
2222 c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	50 fl = v.get('flags', None)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	51 flags = 0
2222 c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	52 if fl != None:
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	53 for x in fl.split():
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	54 flags \|= revlog.flagstr(x)
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	55 elif self.revlogv1:
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2221 diff changeset	56 flags = revlog.REVLOG_DEFAULT_FLAGS
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	57
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	58 v = self.revlogversion \| flags
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	59 self.manifest = manifest.manifest(self.opener, v)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	60 self.changelog = changelog.changelog(self.opener, v)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	61
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	62 # the changelog might not have the inline index flag
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	63 # 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	64 # .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	65 # Otherwise, just version from the changelog
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	66 v = self.changelog.version
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	67 if v == self.revlogversion:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	68 v \|= flags
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	69 self.revlogversion = v
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	70
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	71 self.tagscache = None
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	72 self.nodetagscache = None
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	73 self.encodepats = None
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	74 self.decodepats = None
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	75 self.transhandle = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	76
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	77 if create:
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 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	79 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	80
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	81 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	82
1718 c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	83 def hook(self, name, throw=False, **args):
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	84 def callhook(hname, funcname):
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	85 '''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	86 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	87 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	88 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	89
05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	90 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	91 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	92 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	93
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	94 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	95 d = funcname.rfind('.')
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	96 if d == -1:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	97 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	98 % (hname, funcname))
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	99 modname = funcname[:d]
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	100 try:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	101 obj = __import__(modname)
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	102 except ImportError:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	103 raise util.Abort(_('%s hook is invalid '
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	104 '(import of "%s" failed)') %
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	105 (hname, modname))
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 for p in funcname.split('.')[1:]:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	108 obj = getattr(obj, p)
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	109 except AttributeError, err:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	110 raise util.Abort(_('%s hook is invalid '
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	111 '("%s" is not defined)') %
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	112 (hname, funcname))
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	113 if not callable(obj):
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	114 raise util.Abort(_('%s hook is invalid '
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	115 '("%s" is not callable)') %
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	116 (hname, funcname))
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	117 try:
2190 b67fcd91dd1b fix minor bugs in localrepo.hook. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2175 diff changeset	118 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	119 except (KeyboardInterrupt, util.SignalInterrupt):
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	120 raise
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	121 except Exception, exc:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	122 if isinstance(exc, util.Abort):
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	123 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	124 (hname, exc.args[0] % exc.args[1:]))
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	125 else:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	126 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	127 '%s\n') % (hname, exc))
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	128 if throw:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	129 raise
2335 f0680b2d1d64 add ui.print_exc(), make all traceback printing central. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2320 diff changeset	130 self.ui.print_exc()
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	131 return True
05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	132 if r:
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	133 if throw:
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	134 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	135 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	136 return r
ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	137
1480 ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	138 def runhook(name, cmd):
ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	139 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	140 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	141 r = util.system(cmd, environ=env, cwd=self.root)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	142 if r:
1718 c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	143 desc, r = util.explain_exit(r)
c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	144 if throw:
c1996b84d4f5 make hook code nicer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1717 diff changeset	145 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	146 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	147 return r
1480 ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	148
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	149 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	150 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	151 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	152 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	153 for hname, cmd in hooks:
2155 ff255b41b4aa support hooks written in python. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2150 diff changeset	154 if cmd.startswith('python:'):
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	155 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	156 else:
2221 05b6c13f43c6 reverse sense of return value from python hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2190 diff changeset	157 r = runhook(hname, cmd) or r
1480 ae0d8d632b83 allow multiples hook Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1477 diff changeset	158 return r
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	159
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	160 def tags(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	161 '''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	162 if not self.tagscache:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	163 self.tagscache = {}
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	164
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	165 def parsetag(line, context):
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	166 if not line:
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	167 return
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	168 s = l.split(" ", 1)
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	169 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	170 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	171 return
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	172 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	173 key = key.strip()
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	174 try:
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	175 bin_n = bin(node)
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	176 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	177 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	178 (context, node))
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	179 return
719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	180 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	181 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	182 (context, key))
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	183 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	184 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	185
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	186 # 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	187 # 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	188 # 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	189 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	190 heads.reverse()
1986 719cf07b076d add checking for invalid entries in tag files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1983 diff changeset	191 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	192 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	193 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	194 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	195 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	196 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	197 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	198 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	199 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	200 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	201 (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	202 try:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	203 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	204 count = 0
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	205 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	206 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	207 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	208 except IOError:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 608 diff changeset	209 pass
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	210
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	211 self.tagscache['tip'] = self.changelog.tip()
659 3662e3d6b690 Whitespace cleanup Matt Mackall <mpm@selenic.com> parents: 658 diff changeset	212
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	213 return self.tagscache
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	214
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	215 def tagslist(self):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	216 '''return a list of tags ordered by revision'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	217 l = []
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 471 diff changeset	218 for t, n in self.tags().items():
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	219 try:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	220 r = self.changelog.rev(n)
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	221 except:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	222 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	223 l.append((r, t, n))
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	224 l.sort()
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	225 return [(t, n) for r, t, n in l]
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	226
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	227 def nodetags(self, node):
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	228 '''return the tags associated with a node'''
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	229 if not self.nodetagscache:
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	230 self.nodetagscache = {}
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	231 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	232 self.nodetagscache.setdefault(n, []).append(t)
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	233 return self.nodetagscache.get(node, [])
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	234
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	235 def lookup(self, key):
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	236 try:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 337 diff changeset	237 return self.tags()[key]
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	238 except KeyError:
658 f8098ae9f5b6 Generate a friendlier except for failed lookups Matt Mackall <mpm@selenic.com> parents: 657 diff changeset	239 try:
f8098ae9f5b6 Generate a friendlier except for failed lookups Matt Mackall <mpm@selenic.com> parents: 657 diff changeset	240 return self.changelog.lookup(key)
f8098ae9f5b6 Generate a friendlier except for failed lookups Matt Mackall <mpm@selenic.com> parents: 657 diff changeset	241 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	242 raise repo.RepoError(_("unknown revision '%s'") % key)
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	243
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	244 def dev(self):
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	245 return os.stat(self.path).st_dev
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 627 diff changeset	246
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	247 def local(self):
1101 2cf5c8a4eae5 Separate out old-http support mpm@selenic.com parents: 1094 1100 diff changeset	248 return True
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	249
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	250 def join(self, f):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	251 return os.path.join(self.path, f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	252
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	253 def wjoin(self, f):
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	254 return os.path.join(self.root, f)
43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	255
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	256 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	257 if f[0] == '/':
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	258 f = f[1:]
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	259 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	260
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	261 def getcwd(self):
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	262 return self.dirstate.getcwd()
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 624 diff changeset	263
291 2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	264 def wfile(self, f, mode='r'):
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	265 return self.wopener(f, mode)
2c4f2be05587 Add wopener for opening files in the working directory mpm@selenic.com parents: 288 diff changeset	266
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	267 def wread(self, filename):
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	268 if self.encodepats == None:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	269 l = []
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	270 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	271 mf = util.matcher(self.root, "", [pat], [], [])[1]
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	272 l.append((mf, cmd))
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	273 self.encodepats = l
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	274
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	275 data = self.wopener(filename, 'r').read()
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	276
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	277 for mf, cmd in self.encodepats:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	278 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	279 self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	280 data = util.filter(data, cmd)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	281 break
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	282
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	283 return data
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	284
a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	285 def wwrite(self, filename, data, fd=None):
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	286 if self.decodepats == None:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	287 l = []
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	288 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	289 mf = util.matcher(self.root, "", [pat], [], [])[1]
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	290 l.append((mf, cmd))
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	291 self.decodepats = l
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	292
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	293 for mf, cmd in self.decodepats:
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	294 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	295 self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
1258 1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	296 data = util.filter(data, cmd)
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	297 break
1945754e466b Add file encoding/decoding support mpm@selenic.com parents: 1236 diff changeset	298
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	299 if fd:
a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	300 return fd.write(data)
a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	301 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	302
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	303 def transaction(self):
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	304 tr = self.transhandle
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	305 if tr != None and tr.running():
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	306 return tr.nest()
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	307
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2354 diff changeset	308 # save dirstate for rollback
263 e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	309 try:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	310 ds = self.opener("dirstate").read()
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	311 except IOError:
e8eb427c6d71 Fix empty repository transaction bug mpm@selenic.com parents: 262 diff changeset	312 ds = ""
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 781 diff changeset	313 self.opener("journal.dirstate", "w").write(ds)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	314
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	315 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	316 self.join("journal"),
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	317 aftertrans(self.path))
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	318 self.transhandle = tr
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	319 return tr
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	320
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	321 def recover(self):
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	322 l = self.lock()
557 b9fee419a1bd recover: the journal is named 'journal' mpm@selenic.com parents: 556 diff changeset	323 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	324 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	325 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	326 self.reload()
1516 0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1510 diff changeset	327 return True
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	328 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	329 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	330 return False
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	331
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2354 diff changeset	332 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	333 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	334 wlock = self.wlock()
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	335 l = self.lock()
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 207 diff changeset	336 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	337 self.ui.status(_("rolling back last transaction\n"))
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	338 transaction.rollback(self.opener, self.join("undo"))
421 43b8da7420a9 [PATCH] rename under the other OS mpm@selenic.com parents: 420 diff changeset	339 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	340 self.reload()
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	341 self.wreload()
163 f38c90953c2c Make undo and recover friendlier mpm@selenic.com parents: 162 diff changeset	342 else:
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2354 diff changeset	343 self.ui.warn(_("no rollback information available\n"))
162 5dcbe4d9a30c Implement recover and undo commands mpm@selenic.com parents: 161 diff changeset	344
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	345 def wreload(self):
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	346 self.dirstate.read()
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	347
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	348 def reload(self):
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	349 self.changelog.load()
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	350 self.manifest.load()
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	351 self.tagscache = None
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	352 self.nodetagscache = None
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1782 diff changeset	353
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	354 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	355 desc=None):
161 0b4c5cb953d9 Simply repository locking mpm@selenic.com parents: 155 diff changeset	356 try:
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	357 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	358 except lock.LockHeld, inst:
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	359 if not wait:
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	360 raise
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	361 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	362 (desc, inst.args[0]))
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	363 # default to 600 seconds timeout
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	364 l = lock.lock(self.join(lockname),
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	365 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	366 releasefn, desc=desc)
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	367 if acquirefn:
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	368 acquirefn()
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	369 return l
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	370
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	371 def lock(self, wait=1):
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	372 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	373 desc=_('repository %s') % self.origroot)
1751 e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	374
e9bf415a8ecb localrepo: refactor the locking functions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	375 def wlock(self, wait=1):
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	376 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	377 self.wreload,
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	378 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	379
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	380 def checkfilemerge(self, filename, text, filelog, manifest1, manifest2):
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	381 "determine whether a new filenode is needed"
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	382 fp1 = manifest1.get(filename, nullid)
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	383 fp2 = manifest2.get(filename, nullid)
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	384
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	385 if fp2 != nullid:
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	386 # is one parent an ancestor of the other?
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	387 fpa = filelog.ancestor(fp1, fp2)
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	388 if fpa == fp1:
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	389 fp1, fp2 = fp2, nullid
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	390 elif fpa == fp2:
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	391 fp2 = nullid
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	392
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	393 # 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	394 if fp2 == nullid and text == filelog.read(fp1):
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	395 return (fp1, None, None)
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	396
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	397 return (None, fp1, fp2)
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	398
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	399 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	400 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	401 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	402 p2 = p2 or self.dirstate.parents()[1] or nullid
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	403 c1 = self.changelog.read(p1)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	404 c2 = self.changelog.read(p2)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	405 m1 = self.manifest.read(c1[0])
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	406 mf1 = self.manifest.readflags(c1[0])
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	407 m2 = self.manifest.read(c2[0])
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	408 changed = []
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	409
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	410 if orig_parent == p1:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	411 update_dirstate = 1
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	412 else:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	413 update_dirstate = 0
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	414
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	415 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	416 wlock = self.wlock()
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	417 l = self.lock()
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	418 tr = self.transaction()
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	419 mm = m1.copy()
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	420 mfm = mf1.copy()
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	421 linkrev = self.changelog.count()
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	422 for f in files:
0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	423 try:
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	424 t = self.wread(f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	425 tm = util.is_exec(self.wjoin(f), mfm.get(f, False))
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	426 r = self.file(f)
498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	427 mfm[f] = tm
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	428
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	429 (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	430 if entry:
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	431 mm[f] = entry
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	432 continue
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	433
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	434 mm[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	435 changed.append(f)
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	436 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	437 self.dirstate.update([f], "n")
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	438 except IOError:
314 3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	439 try:
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	440 del mm[f]
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	441 del mfm[f]
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	442 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	443 self.dirstate.forget([f])
314 3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	444 except:
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	445 # deleted from p2?
3402cb9a4c06 More tweaking to rawcommit for repo conversion mpm@selenic.com parents: 313 diff changeset	446 pass
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	447
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	448 mnode = self.manifest.add(mm, mfm, tr, linkrev, c1[0], c2[0])
608 d2994b5298fb Add username/merge/editor to .hgrc Matt Mackall <mpm@selenic.com> parents: 588 diff changeset	449 user = user or self.ui.username()
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	450 n = self.changelog.add(mnode, changed, text, tr, p1, p2, user, date)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	451 tr.close()
442 3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	452 if update_dirstate:
3e2aee6c5500 rawcommit dirstate tweak mpm@selenic.com parents: 441 diff changeset	453 self.dirstate.setparents(n, nullid)
203 0b486b5e0796 hg rawcommit command mpm@selenic.com parents: 200 diff changeset	454
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	455 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	456 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	457 force_editor=False):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	458 commit = []
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	459 remove = []
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	460 changed = []
f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	461
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	462 if files:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	463 for f in files:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	464 s = self.dirstate.state(f)
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	465 if s in 'nmai':
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	466 commit.append(f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	467 elif s == 'r':
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	468 remove.append(f)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	469 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	470 self.ui.warn(_("%s not tracked!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	471 else:
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	472 modified, added, removed, deleted, unknown = self.changes(match=match)
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	473 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	474 remove = removed
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	475
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	476 p1, p2 = self.dirstate.parents()
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	477 c1 = self.changelog.read(p1)
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	478 c2 = self.changelog.read(p2)
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	479 m1 = self.manifest.read(c1[0])
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	480 mf1 = self.manifest.readflags(c1[0])
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	481 m2 = self.manifest.read(c2[0])
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	482
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	483 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	484 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	485 return None
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	486
1721 801756d0ca84 add pretxncommit hook. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1719 diff changeset	487 xp1 = hex(p1)
801756d0ca84 add pretxncommit hook. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1719 diff changeset	488 if p2 == nullid: xp2 = ''
801756d0ca84 add pretxncommit hook. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1719 diff changeset	489 else: xp2 = hex(p2)
801756d0ca84 add pretxncommit hook. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1719 diff changeset	490
1727 019e6a47a53e fix names of parent changeset ids in hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1726 diff changeset	491 self.hook("precommit", throw=True, parent1=xp1, parent2=xp2)
487 2ad41189bee5 Add initial hook support mpm@selenic.com parents: 484 diff changeset	492
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	493 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	494 wlock = self.wlock()
1807 f1f43ea22cbf Allow repo lock to be passed in to localrepo.commit for performance mason@suse.com parents: 1806 diff changeset	495 if not lock:
f1f43ea22cbf Allow repo lock to be passed in to localrepo.commit for performance mason@suse.com parents: 1806 diff changeset	496 lock = self.lock()
151 1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	497 tr = self.transaction()
1f6c61a60586 Bail on attempts to do an empty commit mpm@selenic.com parents: 149 diff changeset	498
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	499 # check in files
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	500 new = {}
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	501 linkrev = self.changelog.count()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	502 commit.sort()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	503 for f in commit:
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	504 self.ui.note(f + "\n")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	505 try:
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	506 mf1[f] = util.is_exec(self.wjoin(f), mf1.get(f, False))
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	507 t = self.wread(f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	508 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	509 self.ui.warn(_("trouble committing %s!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	510 raise
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	511
1117 30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1102 diff changeset	512 r = self.file(f)
30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1102 diff changeset	513
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	514 meta = {}
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	515 cp = self.dirstate.copied(f)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	516 if cp:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	517 meta["copy"] = cp
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	518 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	519 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	520 fp1, fp2 = nullid, nullid
30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1102 diff changeset	521 else:
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	522 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	523 if entry:
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: 1713 diff changeset	524 new[f] = entry
990 5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	525 continue
5007e0bdeed2 Fix long-standing excessive file merges mpm@selenic.com parents: 981 diff changeset	526
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	527 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	528 # 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	529 # 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	530 changed.append(f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	531
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	532 # update manifest
1629 3024cacfb2c9 Copy manifest map before modifying it (see issue86) Thomas Arendsen Hein <thomas@intevation.de> parents: 1621 diff changeset	533 m1 = m1.copy()
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	534 m1.update(new)
416 5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	535 for f in remove:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	536 if f in m1:
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: 415 diff changeset	537 del m1[f]
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	538 mn = self.manifest.add(m1, mf1, tr, linkrev, c1[0], c2[0],
156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	539 (new, remove))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	540
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	541 # add changeset
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	542 new = new.keys()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	543 new.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	544
1983 ae12a81549a7 Pass correct username as $HGUSER to hgeditor if "commit -u" is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 1981 diff changeset	545 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	546 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	547 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	548 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	549 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	550 edittext.append("")
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	551 if p2 != nullid:
1709 069129d24b26 Create default commit message in a more pythonic way. Thomas Arendsen Hein <thomas@intevation.de> parents: 1708 diff changeset	552 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	553 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	554 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	555 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	556 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	557 edittext.append("")
1706 20b621154e17 Run commit message editor in the repo root (like hooks). Thomas Arendsen Hein <thomas@intevation.de> parents: 1680 diff changeset	558 # 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	559 olddir = os.getcwd()
20b621154e17 Run commit message editor in the repo root (like hooks). Thomas Arendsen Hein <thomas@intevation.de> parents: 1680 diff changeset	560 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	561 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	562 os.chdir(olddir)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	563
2301 7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	564 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	565 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	566 del lines[0]
7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	567 if not lines:
7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	568 return None
7c2623aedeb4 Strip empty lines and trailing spaces around commit messages. Thomas Arendsen Hein <thomas@intevation.de> parents: 2288 diff changeset	569 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	570 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	571 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	572 parent2=xp2)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	573 tr.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	574
229 1b11da6ee69e teach commit about dirstate.parents() mpm@selenic.com parents: 228 diff changeset	575 self.dirstate.setparents(n)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	576 self.dirstate.update(new, "n")
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	577 self.dirstate.forget(remove)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	578
1727 019e6a47a53e fix names of parent changeset ids in hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1726 diff changeset	579 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	580 return n
660 2c83350784c3 Move commit hook after commit completes Matt Mackall <mpm@selenic.com> parents: 659 diff changeset	581
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	582 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	583 if node:
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	584 fdict = dict.fromkeys(files)
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	585 for fn in self.manifest.read(self.changelog.read(node)[0]):
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	586 fdict.pop(fn, None)
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	587 if match(fn):
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	588 yield 'm', fn
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	589 for fn in fdict:
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	590 if badmatch and badmatch(fn):
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	591 if match(fn):
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	592 yield 'b', fn
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	593 else:
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	594 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	595 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	596 else:
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2038 diff changeset	597 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	598 yield src, fn
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	599
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	600 def changes(self, node1=None, node2=None, files=[], match=util.always,
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2021 diff changeset	601 wlock=None, show_ignored=None):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	602 """return changes between two nodes or node and working directory
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	603
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	604 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	605 If node2 is None, compare node1 with working directory.
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	606 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	607
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	608 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	609 t1 = self.wread(fn)
994 88c15682d9b0 Fix callers to file.revision to use file.read mpm@selenic.com parents: 993 diff changeset	610 t2 = self.file(fn).read(mf.get(fn, nullid))
29 4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	611 return cmp(t1, t2)
4d3a5dcb6972 Make diffdir take a revision argument mpm@selenic.com parents: 25 diff changeset	612
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	613 def mfmatches(node):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	614 change = self.changelog.read(node)
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	615 mf = dict(self.manifest.read(change[0]))
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	616 for fn in mf.keys():
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	617 if not match(fn):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	618 del mf[fn]
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	619 return mf
741 156dc2f3be7f Fix some line wrapping mpm@selenic.com parents: 740 diff changeset	620
1802 8a7a24b96697 speed up hg log --debug Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1789 diff changeset	621 if node1:
8a7a24b96697 speed up hg log --debug Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1789 diff changeset	622 # 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	623 # 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	624 # 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	625 mf1 = mfmatches(node1)
8a7a24b96697 speed up hg log --debug Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1789 diff changeset	626
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	627 # are we comparing the working directory?
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	628 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	629 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	630 try:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	631 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	632 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	633 wlock = None
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2021 diff changeset	634 lookup, modified, added, removed, deleted, unknown, ignored = (
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2021 diff changeset	635 self.dirstate.changes(files, match, show_ignored))
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	636
c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	637 # are we comparing working dir against its parent?
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	638 if not node1:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	639 if lookup:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	640 # 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	641 mf2 = mfmatches(self.dirstate.parents()[0])
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	642 for f in lookup:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	643 if fcmp(f, mf2):
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	644 modified.append(f)
1532 27077812fffb reset mtime when two files are equal Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1531 diff changeset	645 elif wlock is not None:
27077812fffb reset mtime when two files are equal Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1531 diff changeset	646 self.dirstate.update([f], "n")
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	647 else:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	648 # we are comparing working dir against non-parent
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	649 # generate a pseudo-manifest for the working dir
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	650 mf2 = mfmatches(self.dirstate.parents()[0])
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	651 for f in lookup + modified + added:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	652 mf2[f] = ""
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	653 for f in removed:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	654 if f in mf2:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	655 del mf2[f]
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	656 else:
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	657 # we are comparing two revisions
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2021 diff changeset	658 deleted, unknown, ignored = [], [], []
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	659 mf2 = mfmatches(node2)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	660
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	661 if node1:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	662 # flush lists from dirstate before comparing manifests
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	663 modified, added = [], []
566 b2c9b36bd639 repo.changes: fix duplicate changes mpm@selenic.com parents: 561 diff changeset	664
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	665 for fn in mf2:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	666 if mf1.has_key(fn):
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	667 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	668 modified.append(fn)
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	669 del mf1[fn]
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	670 else:
f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	671 added.append(fn)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	672
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	673 removed = mf1.keys()
ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1616 diff changeset	674
1616 f0f9e84849e7 Cleaned up localrepo.changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	675 # sort and return results:
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2021 diff changeset	676 for l in modified, added, removed, deleted, unknown, ignored:
561 cdddf4652aec Fix dodiff/changes mpm@selenic.com parents: 557 diff changeset	677 l.sort()
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2021 diff changeset	678 if show_ignored is None:
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2021 diff changeset	679 return (modified, added, removed, deleted, unknown)
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2021 diff changeset	680 else:
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2021 diff changeset	681 return (modified, added, removed, deleted, unknown, ignored)
32 6a4d8718bee0 Add diffrevs function to compare two nodes mpm@selenic.com parents: 30 diff changeset	682
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	683 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	684 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	685 wlock = self.wlock()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	686 for f in list:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	687 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	688 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	689 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	690 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	691 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	692 % 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	693 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	694 self.ui.warn(_("%s already tracked!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	695 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	696 self.dirstate.update([f], "a")
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	697
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	698 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	699 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	700 wlock = self.wlock()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	701 for f in list:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	702 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	703 self.ui.warn(_("%s not added!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	704 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	705 self.dirstate.forget([f])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	706
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	707 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	708 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	709 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	710 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	711 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	712 except OSError, inst:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	713 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	714 raise
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	715 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	716 wlock = self.wlock()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	717 for f in list:
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	718 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	719 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	720 self.ui.warn(_("%s still exists!\n") % f)
402 2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: 385 diff changeset	721 elif self.dirstate.state(f) == 'a':
657 22bc6fb9aefc dirstate.forget() takes a list Matt Mackall <mpm@selenic.com> parents: 656 diff changeset	722 self.dirstate.forget([f])
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	723 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	724 self.ui.warn(_("%s not tracked!\n") % f)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	725 else:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	726 self.dirstate.update([f], "r")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	727
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	728 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	729 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	730 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	731 mf = self.manifest.readflags(mn)
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	732 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	733 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	734 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	735 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	736 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	737 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	738 else:
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	739 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	740 self.wwrite(f, t)
1447 508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	741 util.set_exec(self.wjoin(f), mf[f])
508a3f559553 revert added and removed files to their normal state before reverting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1427 diff changeset	742 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	743
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	744 def copy(self, source, dest, wlock=None):
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	745 p = self.wjoin(dest)
781 26f3d353851f Fix copy in subdirectories mpm@selenic.com parents: 780 diff changeset	746 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	747 self.ui.warn(_("%s does not exist!\n") % dest)
781 26f3d353851f Fix copy in subdirectories mpm@selenic.com parents: 780 diff changeset	748 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	749 self.ui.warn(_("copy failed: %s is not a file\n") % dest)
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	750 else:
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	751 if not wlock:
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	752 wlock = self.wlock()
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	753 if self.dirstate.state(dest) == '?':
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	754 self.dirstate.update([dest], "a")
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	755 self.dirstate.copy(source, dest)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	756
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	757 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	758 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	759 # 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	760 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	761 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	762 return [n for (r, n) in heads]
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	763
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	764 # branchlookup returns a dict giving a list of branches for
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	765 # 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	766 # 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	767 # branch tags, tags are eliminated if they are visible from other
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	768 # branch tags.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	769 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	770 # So, for this graph: a->b->c->d->e
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	771 # \ /
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	772 # aa -----/
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	773 # a has tag 2.6.12
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	774 # d has tag 2.6.13
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	775 # 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	776 # 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	777 # from the list.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	778 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	779 # 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	780 # 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	781 # 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	782 # branch).
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	783 #
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	784 # 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	785 # 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	786 # result though.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	787 def branchlookup(self, heads=None, branch=None):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	788 if not heads:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	789 heads = self.heads()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	790 headt = [ h for h in heads ]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	791 chlog = self.changelog
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	792 branches = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	793 merges = []
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	794 seenmerge = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	795
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	796 # traverse the tree once for each head, recording in the branches
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	797 # dict which tags are visible from this head. The branches
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	798 # dict also records which tags are visible from each tag
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	799 # while we traverse.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	800 while headt or merges:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	801 if merges:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	802 n, found = merges.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	803 visit = [n]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	804 else:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	805 h = headt.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	806 visit = [h]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	807 found = [h]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	808 seen = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	809 while visit:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	810 n = visit.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	811 if n in seen:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	812 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	813 pp = chlog.parents(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	814 tags = self.nodetags(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	815 if tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	816 for x in tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	817 if x == 'tip':
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	818 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	819 for f in found:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	820 branches.setdefault(f, {})[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	821 branches.setdefault(n, {})[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	822 break
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	823 if n not in found:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	824 found.append(n)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	825 if branch in tags:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	826 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	827 seen[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	828 if pp[1] != nullid and n not in seenmerge:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	829 merges.append((pp[1], [x for x in found]))
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	830 seenmerge[n] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	831 if pp[0] != nullid:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	832 visit.append(pp[0])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	833 # traverse the branches dict, eliminating branch tags from each
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	834 # head that are visible from another branch tag for that head.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	835 out = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	836 viscache = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	837 for h in heads:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	838 def visible(node):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	839 if node in viscache:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	840 return viscache[node]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	841 ret = {}
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	842 visit = [node]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	843 while visit:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	844 x = visit.pop()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	845 if x in viscache:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	846 ret.update(viscache[x])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	847 elif x not in ret:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	848 ret[x] = 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	849 if x in branches:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	850 visit[len(visit):] = branches[x].keys()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	851 viscache[node] = ret
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	852 return ret
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	853 if h not in branches:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	854 continue
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	855 # O(n^2), but somewhat limited. This only searches the
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	856 # 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	857 # whole repo.
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	858 for b in branches[h]:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	859 vis = False
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	860 for bb in branches[h].keys():
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	861 if b != bb:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	862 if b in visible(bb):
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	863 vis = True
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	864 break
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	865 if not vis:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	866 l = out.setdefault(h, [])
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	867 l[len(l):] = self.nodetags(b)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	868 return out
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	869
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	870 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	871 if not nodes:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	872 nodes = [self.changelog.tip()]
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	873 b = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	874 for n in nodes:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	875 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	876 while 1:
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	877 p = self.changelog.parents(n)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	878 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	879 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	880 break
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	881 n = p[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	882 return b
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	883
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	884 def between(self, pairs):
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	885 r = []
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	886
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	887 for top, bottom in pairs:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	888 n, l, i = top, [], 0
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	889 f = 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	890
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	891 while n != bottom:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	892 p = self.changelog.parents(n)[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	893 if i == f:
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 566 diff changeset	894 l.append(n)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	895 f = f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	896 n = p
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	897 i += 1
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	898
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	899 r.append(l)
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	900
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	901 return r
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	902
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	903 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	904 """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	905
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	906 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	907 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	908 in both remote and self.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	909 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	910 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	911 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	912 or ancestors of these heads.
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	913
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	914 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	915 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	916 (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	917 outgoing)
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	918 """
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	919 m = self.changelog.nodemap
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	920 search = []
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	921 fetch = {}
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	922 seen = {}
c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	923 seenbranch = {}
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	924 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	925 base = {}
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 191 diff changeset	926
2108 30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	927 if not heads:
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	928 heads = remote.heads()
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	929
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	930 if self.changelog.tip() == nullid:
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	931 base[nullid] = 1
2108 30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	932 if heads != [nullid]:
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	933 return [nullid]
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	934 return []
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	935
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	936 # 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	937 # 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	938 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	939
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	940 unknown = []
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	941 for h in heads:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	942 if h not in m:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	943 unknown.append(h)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	944 else:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	945 base[h] = 1
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	946
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	947 if not unknown:
1895 d7c038e805e9 findincoming should return an iterable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1893 diff changeset	948 return []
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	949
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	950 req = dict.fromkeys(unknown)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	951 reqcnt = 0
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	952
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	953 # search through remote branches
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	954 # 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	955 # head, root, first parent, second parent
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	956 # (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	957 unknown = remote.branches(unknown)
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	958 while unknown:
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	959 r = []
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	960 while unknown:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	961 n = unknown.pop(0)
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	962 if n[0] in seen:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	963 continue
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	964
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	965 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	966 % (short(n[0]), short(n[1])))
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	967 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	968 pass
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	969 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	970 self.ui.debug(_("branch already found\n"))
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	971 continue
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	972 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	973 self.ui.debug(_("found incomplete branch %s:%s\n")
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	974 % (short(n[0]), short(n[1])))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	975 search.append(n) # schedule branch range for scanning
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	976 seenbranch[n] = 1
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	977 else:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	978 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	979 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	980 self.ui.debug(_("found new changeset %s\n") %
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	981 short(n[1]))
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	982 fetch[n[1]] = 1 # earliest unknown
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	983 for p in n[2:4]:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	984 if p in m:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	985 base[p] = 1 # latest known
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	986
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	987 for p in n[2:4]:
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	988 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	989 r.append(p)
11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	990 req[p] = 1
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	991 seen[n[0]] = 1
dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	992
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	993 if r:
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	994 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	995 self.ui.debug(_("request %d: %s\n") %
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	996 (reqcnt, " ".join(map(short, r))))
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	997 for p in range(0, len(r), 10):
ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	998 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	999 self.ui.debug(_("received %s:%s\n") %
148 c32286d0a665 Improve pruning of branches in outstanding changeset algorithm mpm@selenic.com parents: 146 diff changeset	1000 (short(b[0]), short(b[1])))
2339 11422943cf72 document and fix findincoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2335 diff changeset	1001 unknown.append(b)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1002
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1003 # 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	1004 while search:
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1005 n = search.pop(0)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1006 reqcnt += 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1007 l = remote.between([(n[0], n[1])])[0]
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1008 l.append(n[1])
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1009 p = n[0]
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1010 f = 1
328 dac675ef6189 hg pull: more query fixes mpm@selenic.com parents: 324 diff changeset	1011 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	1012 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	1013 if i in m:
85 58a1a0425c9b Fix merge bug, I hope mpm@selenic.com parents: 83 diff changeset	1014 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	1015 self.ui.debug(_("found new branch changeset %s\n") %
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1016 short(p))
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1017 fetch[p] = 1
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1018 base[i] = 1
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1019 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	1020 self.ui.debug(_("narrowed branch search to %s:%s\n")
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1021 % (short(p), short(i)))
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1022 search.append((p, i))
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1023 break
56 ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1024 p, f = i, f * 2
ad2ea1185f04 Add getchangegroup code to efficiently calculate and request a changegroup mpm@selenic.com parents: 55 diff changeset	1025
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1026 # sanity check our fetch list
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1027 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	1028 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	1029 raise repo.RepoError(_("already have changeset ") + short(f[:4]))
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1030
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: 578 diff changeset	1031 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	1032 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	1033 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	1034 else:
d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1035 raise util.Abort(_("repository is unrelated"))
511 9f67222186bd Disallow merging of unrelated projects mpm@selenic.com parents: 504 diff changeset	1036
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	1037 self.ui.note(_("found new changesets starting at ") +
83 9fd5b35cfc45 Add -q quiet option mpm@selenic.com parents: 79 diff changeset	1038 " ".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	1039
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	1040 self.ui.debug(_("%d total queries\n") % reqcnt)
324 ce81bdd91d06 hg merge: some getchangegroup fixups mpm@selenic.com parents: 321 diff changeset	1041
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1042 return fetch.keys()
516 873228c2f6cf Change getchangegroup to findincoming mpm@selenic.com parents: 515 diff changeset	1043
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1044 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	1045 """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	1046
fc22ed56afe3 Fix hg push and hg push -r sometimes creating new heads without --force. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	1047 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	1048 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	1049 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	1050 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	1051 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	1052 """
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1053 if base == None:
8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1054 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	1055 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	1056
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	1057 self.ui.debug(_("common changesets up to ")
1072 05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1058 + " ".join(map(short, base.keys())) + "\n")
05dc7aba22eb Fixes for push corner case mpm@selenic.com parents: 1069 diff changeset	1059
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1060 remain = dict.fromkeys(self.changelog.nodemap)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1061
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1062 # 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	1063 del remain[nullid]
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1064 remove = base.keys()
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1065 while remove:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1066 n = remove.pop(0)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1067 if n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1068 del remain[n]
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1069 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	1070 remove.append(p)
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1071
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1072 # 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	1073 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	1074 # 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	1075 updated_heads = {}
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1076 for n in remain:
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1077 p1, p2 = self.changelog.parents(n)
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1078 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	1079 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	1080 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	1081 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	1082 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	1083 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	1084 updated_heads[p2] = True
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1085
004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1086 # 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	1087 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	1088 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	1089 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	1090 return subset
621 004e811f7706 Add a function to calculate the outgoing changegroup Matt Mackall <mpm@selenic.com> parents: 616 diff changeset	1091
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1947 diff changeset	1092 def pull(self, remote, heads=None, force=False):
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	1093 l = self.lock()
636 ac0ec421e3a5 Move the empty changeset detection out of findincoming to pull Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1094
2108 30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1095 fetch = self.findincoming(remote, force=force)
30c7564f6dfc Move empty local repo logic for pull into findincoming Matt Mackall <mpm@selenic.com> parents: 2107 diff changeset	1096 if fetch == [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	1097 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	1098
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1099 if not fetch:
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	1100 self.ui.status(_("no changes found\n"))
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1101 return 0
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1102
1461 02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1460 diff changeset	1103 if heads is None:
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1104 cg = remote.changegroup(fetch, 'pull')
1461 02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1460 diff changeset	1105 else:
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1106 cg = remote.changegroupsubset(fetch, heads, 'pull')
2230 332950340788 localrepository.addchangegroup: add more source infos to hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2229 diff changeset	1107 return self.addchangegroup(cg, 'pull')
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1108
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	1109 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	1110 # 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	1111 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1112 # 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	1113 # 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	1114 #
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1115 # 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	1116 # servers, http servers).
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1117
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1118 if 'unbundle' in remote.capabilities:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1119 self.push_unbundle(remote, force, revs)
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1120 else:
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1121 self.push_addchangegroup(remote, force, revs)
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1122
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1123 def prepush(self, remote, force, revs):
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1124 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	1125 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	1126 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	1127 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	1128 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	1129 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	1130 " 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	1131 return None, 1
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1132
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	1133 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	1134 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	1135 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	1136 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	1137 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	1138
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1713 diff changeset	1139 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	1140 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	1141 return None, 1
816 8674b7803714 Warn on pushing unsynced repo or adding new heads mpm@selenic.com parents: 814 diff changeset	1142 elif not force:
2109 1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2108 diff changeset	1143 # 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	1144 # 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	1145 if not revs and len(remote_heads) < len(heads) \
1b183976e007 Revert push new heads logic Matt Mackall <mpm@selenic.com> parents: 2108 diff changeset	1146 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	1147 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	1148 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	1149 " 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	1150 return None, 1
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1151
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	1152 if revs is None:
1782 b9671b41e360 merge with crew Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1781 1754 diff changeset	1153 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	1154 else:
1782 b9671b41e360 merge with crew Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1781 1754 diff changeset	1155 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	1156 return cg, remote_heads
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1157
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1158 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	1159 lock = remote.lock()
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1160
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1161 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	1162 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	1163 cg, remote_heads = ret
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1164 return remote.addchangegroup(cg, 'push')
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1165 return ret[1]
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1166
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1167 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	1168 # 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	1169 # 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	1170 # 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	1171 # aborts.
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1172
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1173 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	1174 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	1175 cg, remote_heads = ret
e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2424 diff changeset	1176 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	1177 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	1178 return ret[1]
622 e9fe5d5e67f7 Add generic repo commands for pull and push Matt Mackall <mpm@selenic.com> parents: 621 diff changeset	1179
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1180 def changegroupsubset(self, bases, heads, source):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1181 """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	1182 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	1183 the heads.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1184
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1185 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	1186 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	1187 is non-trivial.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1188
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1189 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	1190 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	1191
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1192 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1193
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1194 # Set up some initial variables
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1195 # 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	1196 cl = self.changelog
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1197 # 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	1198 # changegroup.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1199 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	1200 # 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	1201 # 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	1202 # necessary to re-create the changegroup.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1203
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1204 # 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	1205 # 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	1206 knownheads = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1207 # 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	1208 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	1209 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	1210 if p != nullid:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1211 knownheads[p] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1212 knownheads = knownheads.keys()
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1213 if knownheads:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1214 # 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	1215 # 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	1216 # 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	1217 # changeset.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1218 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	1219 junk = None
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1220 # 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	1221 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	1222 else:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1223 # 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	1224 # know about any changesets.
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1225 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	1226
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1227 # 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	1228 mnfst = self.manifest
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1229 # 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	1230 msng_mnfst_set = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1231 # 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	1232 msng_filenode_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1233
1460 40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1234 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	1235 junk = None
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1236
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1237 # 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	1238 # 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	1239 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1240 return x
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1241
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1242 # 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	1243 # inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1244 def cmp_by_rev_func(revlog):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1245 # 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	1246 # 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	1247 # 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	1248 # 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	1249 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	1250 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	1251 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	1252
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1253 # 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	1254 # 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	1255 # 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	1256 # 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	1257 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	1258 haslst = hasset.keys()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1259 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	1260 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	1261 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	1262 while parentlst:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1263 n = parentlst.pop()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1264 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	1265 hasset[n] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1266 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	1267 parentlst.extend(p)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1268 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	1269 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	1270
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1271 # 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	1272 # 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	1273 def manifest_and_file_collector(changedfileset):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1274 # 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	1275 # 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	1276 # 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	1277 # 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	1278 # 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	1279 # changed in any changeset in the changegroup.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1280 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1281 # 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	1282 # 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	1283 # the manifest.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1284 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	1285 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	1286 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	1287 # 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	1288 # 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	1289 changedfileset.setdefault(f, f)
40d08cf1c544 Bug fixing in localrepository.changegroupsubset. Bugs found in testing. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	1290 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	1291 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	1292
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1293 # 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	1294 # 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	1295 # 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	1296 def prune_manifests():
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1297 has_mnfst_set = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1298 for n in msng_mnfst_set:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1299 # 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	1300 # 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	1301 # 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	1302 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	1303 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	1304 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	1305 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	1306
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1307 # 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	1308 # 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	1309 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	1310 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	1311
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1312 # 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	1313 # 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	1314 def filenode_collector(changedfiles):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1315 next_rev = [0]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1316 # 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	1317 # 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	1318 # 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	1319 #
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1320 # 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	1321 # 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	1322 # 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	1323 def collect_msng_filenodes(mnfstnode):
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1324 r = mnfst.rev(mnfstnode)
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1325 if r == next_rev[0]:
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1326 # 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	1327 # 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	1328 delta = mdiff.patchtext(mnfst.delta(mnfstnode))
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1329 # 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	1330 for dline in delta.splitlines():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1331 # 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	1332 f, fnode = dline.split('\0')
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1333 fnode = bin(fnode[:40])
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1334 f = changedfiles.get(f, None)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1335 # 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	1336 # about.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1337 if f is not None:
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1338 # Get the changenode this manifest belongs to
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1339 clnode = msng_mnfst_set[mnfstnode]
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1340 # 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	1341 # there isn't one already.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1342 ndset = msng_filenode_set.setdefault(f, {})
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1343 # 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	1344 # 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	1345 ndset.setdefault(fnode, clnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1346 else:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1347 # Otherwise we need a full manifest.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1348 m = mnfst.read(mnfstnode)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1349 # For every file in we care about.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1350 for f in changedfiles:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1351 fnode = m.get(f, None)
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1352 # If it's in the manifest
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1353 if fnode is not None:
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1354 # See comments above.
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1355 clnode = msng_mnfst_set[mnfstnode]
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1356 ndset = msng_filenode_set.setdefault(f, {})
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1357 ndset.setdefault(fnode, clnode)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1358 # 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	1359 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	1360 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	1361
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1362 # 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	1363 # 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	1364 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	1365 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	1366 hasset = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1367 # 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	1368 # 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	1369 # that filenode.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1370 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	1371 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	1372 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	1373 hasset[n] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1374 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	1375
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1376 # 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	1377 # inner function.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1378 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	1379 msngset = msng_filenode_set[fname]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1380 # 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	1381 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	1382 return msngset[fnode]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1383 return lookup_filenode_link
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1384
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1385 # 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	1386 # 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	1387 def gengroup():
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1388 # 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	1389 changedfiles = {}
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1390 # 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	1391 # 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	1392 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	1393 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	1394 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	1395 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1396
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1397 # 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	1398 # 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	1399 prune_manifests()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1400 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	1401 # 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	1402 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	1403 # 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	1404 # 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	1405 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	1406 filenode_collector(changedfiles))
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1407 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	1408 yield chnk
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1409
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1410 # 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	1411 # them.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1412 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	1413 msng_mnfst_set.clear()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1414
1462 12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1415 changedfiles = changedfiles.keys()
12a8d772fa32 Optimizing manifest reads in changegroupsubset by using deltas. Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1416 changedfiles.sort()
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1417 # 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	1418 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	1419 filerevlog = self.file(fname)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1420 # 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	1421 # 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	1422 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	1423 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	1424 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	1425 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	1426 msng_filenode_lst = []
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1427 # 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	1428 # 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	1429 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	1430 yield changegroup.genchunk(fname)
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1431 # 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	1432 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	1433 # 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	1434 # 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	1435 # from filenodes.
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1436 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	1437 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	1438 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	1439 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	1440 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	1441 # 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	1442 del msng_filenode_set[fname]
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1443 # 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	1444 yield changegroup.closechunk()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1445
2150 f15c6394d90d fix a NameError in changegroupsubset Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2149 diff changeset	1446 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	1447 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	1448
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1449 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	1450
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1451 def changegroup(self, basenodes, source):
1466 b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1452 """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	1453 doesn't.
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1454
b6d9ea0bc107 Added a lot of comments to changegroupsubset. Eric Hopper <hopper@omnifarious.org> parents: 1464 diff changeset	1455 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	1456 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	1457
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1458 self.hook('preoutgoing', throw=True, source=source)
50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	1459
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1460 cl = self.changelog
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1461 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	1462 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	1463
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1464 def identity(x):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1465 return x
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1466
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1467 def gennodelst(revlog):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1468 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	1469 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	1470 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	1471 yield n
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1472
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1473 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	1474 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	1475 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	1476 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	1477 changedfileset[fname] = 1
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1478 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	1479
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1480 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	1481 def lookuprevlink(n):
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1482 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	1483 return lookuprevlink
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1484
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1485 def gengroup():
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1486 # 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	1487 changedfiles = {}
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1488
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1489 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	1490 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	1491 yield chnk
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1492 changedfiles = changedfiles.keys()
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1493 changedfiles.sort()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1494
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1495 mnfst = self.manifest
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1496 nodeiter = gennodelst(mnfst)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1497 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	1498 yield chnk
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1499
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1500 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	1501 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	1502 nodeiter = gennodelst(filerevlog)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1503 nodeiter = list(nodeiter)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1504 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	1505 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	1506 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	1507 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	1508 yield chnk
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1509
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1967 diff changeset	1510 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	1511
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1512 if nodes:
7ff92c04f8e5 Don't die calling outgoing hook if we have no changesets Matt Mackall <mpm@selenic.com> parents: 2098 diff changeset	1513 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	1514
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1515 return util.chunkbuffer(gengroup())
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1516
2230 332950340788 localrepository.addchangegroup: add more source infos to hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2229 diff changeset	1517 def addchangegroup(self, source, srctype):
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1518 """add changegroup to repo.
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1519 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	1520
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1521 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	1522 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	1523 return cl.count()
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1524
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1525 def revmap(x):
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1526 return cl.rev(x)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1527
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1528 if not source:
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1529 return 0
1730 0f1d2c75db5e add prechangegroup and pretxnchangegroup hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1721 diff changeset	1530
2230 332950340788 localrepository.addchangegroup: add more source infos to hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2229 diff changeset	1531 self.hook('prechangegroup', throw=True, source=srctype)
1730 0f1d2c75db5e add prechangegroup and pretxnchangegroup hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1721 diff changeset	1532
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1533 changesets = files = revisions = 0
225 1651a3e61925 fix repo locking mpm@selenic.com parents: 224 diff changeset	1534
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1535 tr = self.transaction()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1536
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1537 # 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	1538 # inconsistent view
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1539 cl = None
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1540 try:
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1541 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	1542
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1543 oldheads = len(cl.heads())
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1544
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1545 # pull off the changeset group
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1546 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	1547 cor = cl.count() - 1
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1548 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	1549 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	1550 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	1551 cnr = cl.count() - 1
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1552 changesets = cnr - cor
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1553
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1554 # 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	1555 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	1556 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	1557 # 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	1558 # 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	1559 # 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	1560 # 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	1561 self.manifest.addgroup(chunkiter, revmap, tr)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1562
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1563 # process the files
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1564 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	1565 while 1:
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1566 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	1567 if not f:
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1568 break
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1569 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	1570 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	1571 o = fl.count()
8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1572 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	1573 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	1574 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	1575 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	1576 files += 1
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1577
2232 ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1578 cl.writedata()
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1579 finally:
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1580 if cl:
ef3c039e7ab8 Always remove appendopener tmp files (fixes issue235). Thomas Arendsen Hein <thomas@intevation.de> parents: 2230 diff changeset	1581 cl.cleanup()
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1582
2395 8ed45fb1053a remove appendfile for the manifest when adding a changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2362 diff changeset	1583 # make changelog see real files again
2082 856f0ba200bc Additional appendfile fixes for interleaved data/index files mason@suse.com parents: 2075 diff changeset	1584 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	1585 self.changelog.checkinlinesize(tr)
1998 65cc17ae9649 fix race in localrepo.addchangegroup. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1995 diff changeset	1586
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1587 newheads = len(self.changelog.heads())
35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1588 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	1589 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	1590 heads = _(" (%+d heads)") % (newheads - oldheads)
1040 35e883d1ff9b Show number of new heads when doing a pull mpm@selenic.com parents: 1019 diff changeset	1591
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	1592 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	1593 " 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	1594 % (changesets, revisions, files, heads))
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1595
2259 181b0643ffb1 fix a traceback when unbundling does not add any changesets Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2232 diff changeset	1596 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	1597 self.hook('pretxnchangegroup', throw=True,
181b0643ffb1 fix a traceback when unbundling does not add any changesets Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2232 diff changeset	1598 node=hex(self.changelog.node(cor+1)), source=srctype)
1730 0f1d2c75db5e add prechangegroup and pretxnchangegroup hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1721 diff changeset	1599
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	1600 tr.close()
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1601
1375 f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	1602 if changesets > 0:
2229 0ff326c2b286 changegroup hooks: add source to hook parameters Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	1603 self.hook("changegroup", node=hex(self.changelog.node(cor+1)),
2230 332950340788 localrepository.addchangegroup: add more source infos to hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2229 diff changeset	1604 source=srctype)
780 5cb8a3a023b2 Add changegroup hook for push/pull mpm@selenic.com parents: 772 diff changeset	1605
1375 f2b00be33e2c Fix traceback when nothing was added during unbundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1353 diff changeset	1606 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	1607 self.hook("incoming", node=hex(self.changelog.node(i)),
2230 332950340788 localrepository.addchangegroup: add more source infos to hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2229 diff changeset	1608 source=srctype)
1316 b650bfdfc7ee Hook fixups mpm@selenic.com parents: 1280 diff changeset	1609
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1610 return newheads - oldheads + 1
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1611
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1612 def update(self, node, allow=False, force=False, choose=None,
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1613 moddirstate=True, forcemerge=False, wlock=None, show_stats=True):
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1614 pl = self.dirstate.parents()
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1615 if not force and pl[1] != nullid:
2264 fdb699b5e132 localrepo.update: abort if outstanding merges, instead of warn/return 1 Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2259 diff changeset	1616 raise util.Abort(_("outstanding uncommitted merges"))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1617
1663 d529cdc0a3ee return a non-zero exit code when a merge failed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1645 diff changeset	1618 err = False
d529cdc0a3ee return a non-zero exit code when a merge failed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1645 diff changeset	1619
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1620 p1, p2 = pl[0], node
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1621 pa = self.changelog.ancestor(p1, p2)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1622 m1n = self.changelog.read(p1)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1623 m2n = self.changelog.read(p2)[0]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1624 man = self.manifest.ancestor(m1n, m2n)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1625 m1 = self.manifest.read(m1n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1626 mf1 = self.manifest.readflags(m1n)
1629 3024cacfb2c9 Copy manifest map before modifying it (see issue86) Thomas Arendsen Hein <thomas@intevation.de> parents: 1621 diff changeset	1627 m2 = self.manifest.read(m2n).copy()
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1628 mf2 = self.manifest.readflags(m2n)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1629 ma = self.manifest.read(man)
412 40cfa2d0c088 [PATCH]: Typo in localrepository.update mpm@selenic.com parents: 408 diff changeset	1630 mfa = self.manifest.readflags(man)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1631
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1632 modified, added, removed, deleted, unknown = self.changes()
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1633
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1667 diff changeset	1634 # is this a jump, or a merge? i.e. is there a linear path
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1667 diff changeset	1635 # from p1 to p2?
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1667 diff changeset	1636 linear_path = (pa == p1 or pa == p2)
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1667 diff changeset	1637
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1667 diff changeset	1638 if allow and linear_path:
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1667 diff changeset	1639 raise util.Abort(_("there is nothing to merge, "
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1667 diff changeset	1640 "just use 'hg update'"))
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1641 if allow and not forcemerge:
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	1642 if modified or added or removed:
1995 2da2d46862fb Spelling fix: "commited" -> "committed" mcmillen@cs.cmu.edu parents: 1986 diff changeset	1643 raise util.Abort(_("outstanding uncommitted changes"))
2266 3f7692b0ff13 hooks: add preupdate and update hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2264 diff changeset	1644
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1645 if not forcemerge and not force:
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	1646 for f in unknown:
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1647 if f in m2:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1648 t1 = self.wread(f)
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1649 t2 = self.file(f).read(m2[f])
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1650 if cmp(t1, t2) != 0:
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1651 raise util.Abort(_("'%s' already exists in the working"
db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1652 " dir and differs from remote") % f)
db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1653
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1654 # resolve the manifest to determine which files
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1655 # we care about merging
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	1656 self.ui.note(_("resolving manifests\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	1657 self.ui.debug(_(" force %s allow %s moddirstate %s linear %s\n") %
650 2c934c7b79dc Fix bug in reverting deleted files Matt Mackall <mpm@selenic.com> parents: 649 diff changeset	1658 (force, allow, moddirstate, linear_path))
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	1659 self.ui.debug(_(" ancestor %s local %s remote %s\n") %
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1660 (short(man), short(m1n), short(m2n)))
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1661
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1662 merge = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1663 get = {}
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1664 remove = []
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1665
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1666 # construct a working dir manifest
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1667 mw = m1.copy()
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1668 mfw = mf1.copy()
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	1669 umap = dict.fromkeys(unknown)
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1670
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	1671 for f in added + modified + unknown:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1672 mw[f] = ""
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1673 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False))
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1674
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1709 diff changeset	1675 if moddirstate and not wlock:
1531 2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	1676 wlock = self.wlock()
2ba8bf7defda add localrepo.wlock for protecting the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1516 diff changeset	1677
1621 ee16f06174bd Restored old behaviour for 'hg co' and 'hg co -C' for removed files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1619 diff changeset	1678 for f in deleted + removed:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1679 if f in mw:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1680 del mw[f]
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1681
408 3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1682 # If we're jumping between revisions (as opposed to merging),
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1683 # and if neither the working directory nor the target rev has
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1684 # the file, then we need to remove it from the dirstate, to
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1685 # prevent the dirstate from listing the file when it is no
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1686 # longer in the manifest.
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1687 if moddirstate and linear_path and f not in m2:
408 3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1688 self.dirstate.forget((f,))
3695fbd2c33b [PATCH] Merging files that are deleted in both branches mpm@selenic.com parents: 407 diff changeset	1689
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1690 # Compare manifests
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1691 for f, n in mw.iteritems():
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1692 if choose and not choose(f):
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1693 continue
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1694 if f in m2:
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1695 s = 0
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1696
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1697 # is the wfile new since m1, and match m2?
428 183c87d4e1a0 Fix typo in merging new files mpm@selenic.com parents: 421 diff changeset	1698 if f not in m1:
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	1699 t1 = self.wread(f)
994 88c15682d9b0 Fix callers to file.revision to use file.read mpm@selenic.com parents: 993 diff changeset	1700 t2 = self.file(f).read(m2[f])
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1701 if cmp(t1, t2) == 0:
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1702 n = m2[f]
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1703 del t1, t2
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: 405 diff changeset	1704
296 a3d83bf86755 hg update: fix clobbering files when going backwards mpm@selenic.com parents: 292 diff changeset	1705 # are files different?
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1706 if n != m2[f]:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1707 a = ma.get(f, nullid)
296 a3d83bf86755 hg update: fix clobbering files when going backwards mpm@selenic.com parents: 292 diff changeset	1708 # are both different from the ancestor?
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1709 if n != a and m2[f] != a:
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	1710 self.ui.debug(_(" %s versions differ, resolve\n") % f)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1711 # merge executable bits
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1712 # "if we changed or they changed, change in merge"
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1713 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1714 mode = ((a^b) \| (a^c)) ^ a
10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1715 merge[f] = (m1.get(f, nullid), m2[f], mode)
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1716 s = 1
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1717 # are we clobbering?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1718 # is remote's version newer?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1719 # or are we going back in time?
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1720 elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]):
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	1721 self.ui.debug(_(" remote %s is newer, get\n") % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1722 get[f] = m2[f]
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1723 s = 1
2065 2ff37e3bf780 fix update when a locally added file match the target revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2042 diff changeset	1724 elif f in umap or f in added:
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1725 # this unknown file is the same as the checkout
2065 2ff37e3bf780 fix update when a locally added file match the target revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2042 diff changeset	1726 # we need to reset the dirstate if the file was added
576 da11baf5de7b Handle unknown files better on update mpm@selenic.com parents: 575 diff changeset	1727 get[f] = m2[f]
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1728
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1729 if not s and mfw[f] != mf2[f]:
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1730 if force:
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	1731 self.ui.debug(_(" updating permissions for %s\n") % f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1732 util.set_exec(self.wjoin(f), mf2[f])
277 79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1733 else:
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1734 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1735 mode = ((a^b) \| (a^c)) ^ a
79279550c8ff merge: update permissions even if file contents didn't change mpm@selenic.com parents: 276 diff changeset	1736 if mode != b:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1737 self.ui.debug(_(" updating permissions for %s\n")
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1738 % f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1739 util.set_exec(self.wjoin(f), mode)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1740 del m2[f]
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1741 elif f in ma:
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1742 if n != ma[f]:
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	1743 r = _("d")
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1744 if not force and (linear_path or allow):
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1745 r = self.ui.prompt(
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	1746 (_(" local changed %s which remote deleted\n") % f) +
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	1747 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
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	1748 if r == _("d"):
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1749 remove.append(f)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1750 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	1751 self.ui.debug(_("other deleted %s\n") % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1752 remove.append(f) # other deleted it
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1753 else:
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 1234 diff changeset	1754 # file is created on branch or in working directory
67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 1234 diff changeset	1755 if force and f not in umap:
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	1756 self.ui.debug(_("remote deleted %s, clobbering\n") % f)
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 1234 diff changeset	1757 remove.append(f)
67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 1234 diff changeset	1758 elif n == m1.get(f, nullid): # same as parent
1234 9ee8428d84a1 Revert unrelated changes in previous commit mpm@selenic.com parents: 1233 diff changeset	1759 if p2 == pa: # going backwards?
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	1760 self.ui.debug(_("remote deleted %s\n") % f)
1234 9ee8428d84a1 Revert unrelated changes in previous commit mpm@selenic.com parents: 1233 diff changeset	1761 remove.append(f)
9ee8428d84a1 Revert unrelated changes in previous commit mpm@selenic.com parents: 1233 diff changeset	1762 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	1763 self.ui.debug(_("local modified %s, keeping\n") % f)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1764 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	1765 self.ui.debug(_("working dir created %s, keeping\n") % f)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1766
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1767 for f, n in m2.iteritems():
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1768 if choose and not choose(f):
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1769 continue
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1770 if f[0] == "/":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1771 continue
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1772 if f in ma and n != ma[f]:
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	1773 r = _("k")
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1774 if not force and (linear_path or allow):
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: 413 diff changeset	1775 r = self.ui.prompt(
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	1776 (_("remote changed %s which local deleted\n") % f) +
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	1777 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1778 if r == _("k"):
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1779 get[f] = n
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1780 elif f not in ma:
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	1781 self.ui.debug(_("remote created %s\n") % f)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1782 get[f] = n
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 611 diff changeset	1783 else:
680 4b7b79d2db2c Handle undeletion of files when checking out old revisions Matt Mackall <mpm@selenic.com> parents: 679 diff changeset	1784 if force or p2 == pa: # going backwards?
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	1785 self.ui.debug(_("local deleted %s, recreating\n") % f)
650 2c934c7b79dc Fix bug in reverting deleted files Matt Mackall <mpm@selenic.com> parents: 649 diff changeset	1786 get[f] = n
680 4b7b79d2db2c Handle undeletion of files when checking out old revisions Matt Mackall <mpm@selenic.com> parents: 679 diff changeset	1787 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	1788 self.ui.debug(_("local deleted %s\n") % f)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1789
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1790 del mw, m1, m2, ma
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1791
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1792 if force:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1793 for f in merge:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1794 get[f] = merge[f][1]
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1795 merge = {}
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1796
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1797 if linear_path or force:
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1798 # we don't need to do any magic, just jump to the new rev
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1799 branch_merge = False
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1800 p1, p2 = p2, nullid
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1801 else:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1802 if not allow:
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	1803 self.ui.status(_("this update spans a branch"
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	1804 " affecting the following files:\n"))
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1805 fl = merge.keys() + get.keys()
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1806 fl.sort()
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1807 for f in fl:
719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1808 cf = ""
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1809 if f in merge:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1810 cf = _(" (resolve)")
305 719812eb0156 more merge fixes mpm@selenic.com parents: 302 diff changeset	1811 self.ui.status(" %s%s\n" % (f, cf))
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	1812 self.ui.warn(_("aborting update spanning branches!\n"))
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1998 diff changeset	1813 self.ui.status(_("(use 'hg merge' to merge across branches"
2038 5c4496ed152d Tell the user the real "hg update -C" command, not just "-C" when aborting. Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	1814 " or 'hg update -C' to lose changes)\n"))
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 273 diff changeset	1815 return 1
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1816 branch_merge = True
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 253 diff changeset	1817
2266 3f7692b0ff13 hooks: add preupdate and update hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2264 diff changeset	1818 xp1 = hex(p1)
3f7692b0ff13 hooks: add preupdate and update hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2264 diff changeset	1819 xp2 = hex(p2)
3f7692b0ff13 hooks: add preupdate and update hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2264 diff changeset	1820 if p2 == nullid: xxp2 = ''
3f7692b0ff13 hooks: add preupdate and update hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2264 diff changeset	1821 else: xxp2 = xp2
3f7692b0ff13 hooks: add preupdate and update hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2264 diff changeset	1822
3f7692b0ff13 hooks: add preupdate and update hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2264 diff changeset	1823 self.hook('preupdate', throw=True, parent1=xp1, parent2=xxp2)
3f7692b0ff13 hooks: add preupdate and update hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2264 diff changeset	1824
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1825 # get the files we don't need to change
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1826 files = get.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1827 files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1828 for f in files:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1829 if f[0] == "/":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	1830 continue
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	1831 self.ui.note(_("getting %s\n") % f)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1832 t = self.file(f).read(get[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	1833 self.wwrite(f, t)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1834 util.set_exec(self.wjoin(f), mf2[f])
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1835 if moddirstate:
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1836 if branch_merge:
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1837 self.dirstate.update([f], 'n', st_mtime=-1)
992 f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	1838 else:
f859e9cba1b9 Fix up some bugs introduced by recent merge changes mpm@selenic.com parents: 991 diff changeset	1839 self.dirstate.update([f], 'n')
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 44 diff changeset	1840
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1841 # merge the tricky bits
1922 6d50d6189269 ui: output the number of file updated/merged/removed/... on update Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1893 diff changeset	1842 failedmerge = []
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1843 files = merge.keys()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1844 files.sort()
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1845 for f in files:
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	1846 self.ui.status(_("merging %s\n") % f)
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1847 my, other, flag = merge[f]
1883 b98160cfb2f3 give more info to hgmerge script. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1882 diff changeset	1848 ret = self.merge3(f, my, other, xp1, xp2)
1663 d529cdc0a3ee return a non-zero exit code when a merge failed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1645 diff changeset	1849 if ret:
d529cdc0a3ee return a non-zero exit code when a merge failed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1645 diff changeset	1850 err = True
1922 6d50d6189269 ui: output the number of file updated/merged/removed/... on update Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1893 diff changeset	1851 failedmerge.append(f)
441 e8af362cfb01 Permission handling for the other OS mpm@selenic.com parents: 436 diff changeset	1852 util.set_exec(self.wjoin(f), flag)
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1853 if moddirstate:
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1854 if branch_merge:
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1855 # We've done a branch merge, mark this file as merged
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1856 # so that we properly record the merger later
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1857 self.dirstate.update([f], 'm')
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	1858 else:
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1859 # We've update-merged a locally modified file, so
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1860 # we set the dirstate to emulate a normal checkout
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1861 # of that file some time in the past. Thus our
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1862 # merge will appear as a normal local file
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1863 # modification.
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1864 f_len = len(self.file(f).read(other))
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1865 self.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1866
681 32b6bbf1c37b Sort files for removal Matt Mackall <mpm@selenic.com> parents: 680 diff changeset	1867 remove.sort()
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1868 for f in remove:
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	1869 self.ui.note(_("removing %s\n") % f)
1835 bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1807 diff changeset	1870 util.audit_path(f)
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1871 try:
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	1872 util.unlink(self.wjoin(f))
690 f762860f82c6 Minor merge fixups mpm@selenic.com parents: 686 diff changeset	1873 except OSError, inst:
1398 3f76ac60130d make update quieter when nothing is wrong Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1384 diff changeset	1874 if inst.errno != errno.ENOENT:
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	1875 self.ui.warn(_("update failed to remove %s: %s!\n") %
1398 3f76ac60130d make update quieter when nothing is wrong Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1384 diff changeset	1876 (f, inst.strerror))
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1877 if moddirstate:
993 6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1878 if branch_merge:
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1879 self.dirstate.update(remove, 'r')
6f274afc05c7 Clean up some merge logic mpm@selenic.com parents: 992 diff changeset	1880 else:
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1881 self.dirstate.forget(remove)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1882
1495 1e265c2bec94 Deal with merge abort more gracefully Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1883 if moddirstate:
1e265c2bec94 Deal with merge abort more gracefully Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1884 self.dirstate.setparents(p1, p2)
1922 6d50d6189269 ui: output the number of file updated/merged/removed/... on update Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1893 diff changeset	1885
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1886 if show_stats:
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1887 stats = ((len(get), _("updated")),
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1888 (len(merge) - len(failedmerge), _("merged")),
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1889 (len(remove), _("removed")),
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1890 (len(failedmerge), _("unresolved")))
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1891 note = ", ".join([_("%d files %s") % s for s in stats])
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1892 self.ui.status("%s\n" % note)
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1893 if moddirstate:
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1894 if branch_merge:
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1895 if failedmerge:
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1896 self.ui.status(_("There are unresolved merges,"
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1897 " you can redo the full merge using:\n"
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1898 " hg update -C %s\n"
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1899 " hg merge %s\n"
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1900 % (self.changelog.rev(p1),
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1901 self.changelog.rev(p2))))
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1902 else:
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1903 self.ui.status(_("(branch merge, don't forget to commit)\n"))
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1904 elif failedmerge:
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1905 self.ui.status(_("There are unresolved merges with"
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2167 diff changeset	1906 " locally modified files.\n"))
1922 6d50d6189269 ui: output the number of file updated/merged/removed/... on update Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1893 diff changeset	1907
2266 3f7692b0ff13 hooks: add preupdate and update hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2264 diff changeset	1908 self.hook('update', parent1=xp1, parent2=xxp2, error=int(err))
1663 d529cdc0a3ee return a non-zero exit code when a merge failed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1645 diff changeset	1909 return err
1495 1e265c2bec94 Deal with merge abort more gracefully Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1910
1883 b98160cfb2f3 give more info to hgmerge script. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1882 diff changeset	1911 def merge3(self, fn, my, other, p1, p2):
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1912 """perform a 3-way merge in the working directory"""
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 247 diff changeset	1913
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1914 def temp(prefix, node):
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1915 pre = "%s~%s." % (os.path.basename(fn), prefix)
2165 d821918e3bee Use better names (hg-{usage}-{random}.{suffix}) for temporary files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2156 diff changeset	1916 (fd, name) = tempfile.mkstemp(prefix=pre)
417 f2d1f5fd0179 [PATCH] file type fixes for the other 'OS' mpm@selenic.com parents: 416 diff changeset	1917 f = os.fdopen(fd, "wb")
1019 a9cca981c423 Create helper functions for I/O to files in the working directory mpm@selenic.com parents: 1013 diff changeset	1918 self.wwrite(fn, fl.read(node), f)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1919 f.close()
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1920 return name
fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1921
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1922 fl = self.file(fn)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1923 base = fl.ancestor(my, other)
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	1924 a = self.wjoin(fn)
346 f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: 344 diff changeset	1925 b = temp("base", base)
f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: 344 diff changeset	1926 c = temp("other", other)
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1927
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	1928 self.ui.note(_("resolving %s\n") % fn)
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	1929 self.ui.debug(_("file %s: my %s other %s ancestor %s\n") %
1349 c6295d2a361e More info on file merge for update --debug Matt Mackall <mpm@selenic.com> parents: 1346 diff changeset	1930 (fn, short(my), short(other), short(base)))
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1931
703 fb6f85ecc863 merge program setting from hgrc wasn't used. Thomas Arendsen Hein <thomas@intevation.de> parents: 691 diff changeset	1932 cmd = (os.environ.get("HGMERGE") or self.ui.config("ui", "merge")
fb6f85ecc863 merge program setting from hgrc wasn't used. Thomas Arendsen Hein <thomas@intevation.de> parents: 691 diff changeset	1933 or "hgmerge")
1885 c4d577262d00 run merge program in repo root. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1883 diff changeset	1934 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=self.root,
c4d577262d00 run merge program in repo root. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1883 diff changeset	1935 environ={'HG_FILE': fn,
1883 b98160cfb2f3 give more info to hgmerge script. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1882 diff changeset	1936 'HG_MY_NODE': p1,
b98160cfb2f3 give more info to hgmerge script. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1882 diff changeset	1937 'HG_OTHER_NODE': p2,
b98160cfb2f3 give more info to hgmerge script. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1882 diff changeset	1938 'HG_FILE_MY_NODE': hex(my),
b98160cfb2f3 give more info to hgmerge script. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1882 diff changeset	1939 'HG_FILE_OTHER_NODE': hex(other),
b98160cfb2f3 give more info to hgmerge script. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1882 diff changeset	1940 'HG_FILE_BASE_NODE': hex(base)})
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1941 if r:
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	1942 self.ui.warn(_("merging %s failed!\n") % fn)
232 fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1943
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1944 os.unlink(b)
fc4a6e5b5812 hg resolve: merge a given node into the working directory mpm@selenic.com parents: 231 diff changeset	1945 os.unlink(c)
1663 d529cdc0a3ee return a non-zero exit code when a merge failed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1645 diff changeset	1946 return r
96 fce47326677c Add updated merge3 code mpm@selenic.com parents: 95 diff changeset	1947
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1948 def verify(self):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1949 filelinkrevs = {}
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1950 filenodes = {}
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1951 changesets = revisions = files = 0
1383 3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1952 errors = [0]
2143 3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1953 warnings = [0]
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1954 neededmanifests = {}
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1955
1383 3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1956 def err(msg):
3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1957 self.ui.warn(msg + "\n")
3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1958 errors[0] += 1
3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	1959
2143 3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1960 def warn(msg):
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1961 self.ui.warn(msg + "\n")
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1962 warnings[0] += 1
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1963
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	1964 def checksize(obj, name):
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	1965 d = obj.checksize()
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	1966 if d[0]:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	1967 err(_("%s data length off by %d bytes") % (name, d[0]))
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	1968 if d[1]:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	1969 err(_("%s index contains %d extra bytes") % (name, d[1]))
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	1970
2143 3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1971 def checkversion(obj, name):
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1972 if obj.version != revlog.REVLOGV0:
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1973 if not revlogv1:
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1974 warn(_("warning: `%s' uses revlog format 1") % name)
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1975 elif revlogv1:
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1976 warn(_("warning: `%s' uses revlog format 0") % name)
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1977
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1978 revlogv1 = self.revlogversion != revlog.REVLOGV0
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	1979 if self.ui.verbose or revlogv1 != self.revlogv1:
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	1980 self.ui.status(_("repository uses revlog format %d\n") %
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	1981 (revlogv1 and 1 or 0))
2143 3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	1982
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1983 seen = {}
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	1984 self.ui.status(_("checking changesets\n"))
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	1985 checksize(self.changelog, "changelog")
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	1986
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1987 for i in range(self.changelog.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1988 changesets += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1989 n = self.changelog.node(i)
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1990 l = self.changelog.linkrev(n)
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	1991 if l != i:
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	1992 err(_("incorrect link (%d) for changeset revision %d") %(l, i))
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1993 if n in seen:
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	1994 err(_("duplicate changeset at revision %d") % i)
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	1995 seen[n] = 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	1996
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1997 for p in self.changelog.parents(n):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	1998 if p not in self.changelog.nodemap:
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	1999 err(_("changeset %s has unknown parent %s") %
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2000 (short(n), short(p)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2001 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2002 changes = self.changelog.read(n)
1492 5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	2003 except KeyboardInterrupt:
5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	2004 self.ui.warn(_("interrupted"))
5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	2005 raise
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2006 except Exception, inst:
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	2007 err(_("unpacking changeset %s: %s") % (short(n), inst))
1853 5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2008 continue
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2009
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2010 neededmanifests[changes[0]] = n
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2011
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2012 for f in changes[3]:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2013 filelinkrevs.setdefault(f, []).append(i)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2014
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	2015 seen = {}
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	2016 self.ui.status(_("checking manifests\n"))
2143 3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	2017 checkversion(self.manifest, "manifest")
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	2018 checksize(self.manifest, "manifest")
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	2019
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2020 for i in range(self.manifest.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2021 n = self.manifest.node(i)
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2022 l = self.manifest.linkrev(n)
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2023
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2024 if l < 0 or l >= self.changelog.count():
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	2025 err(_("bad manifest link (%d) at revision %d") % (l, i))
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2026
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2027 if n in neededmanifests:
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2028 del neededmanifests[n]
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2029
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	2030 if n in seen:
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	2031 err(_("duplicate manifest at revision %d") % i)
1383 3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	2032
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	2033 seen[n] = 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	2034
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2035 for p in self.manifest.parents(n):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2036 if p not in self.manifest.nodemap:
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	2037 err(_("manifest %s has unknown parent %s") %
1383 3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	2038 (short(n), short(p)))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2039
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2040 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2041 delta = mdiff.patchtext(self.manifest.delta(n))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2042 except KeyboardInterrupt:
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	2043 self.ui.warn(_("interrupted"))
1097 1f89ccbab6ce localrepo: adjust some imports, remove sys dependency mpm@selenic.com parents: 1094 1089 diff changeset	2044 raise
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2045 except Exception, inst:
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	2046 err(_("unpacking manifest %s: %s") % (short(n), inst))
1853 5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2047 continue
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2048
1853 5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2049 try:
5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2050 ff = [ l.split('\0') for l in delta.splitlines() ]
5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2051 for f, fn in ff:
5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2052 filenodes.setdefault(f, {})[bin(fn[:40])] = 1
5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2053 except (ValueError, TypeError), inst:
5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2054 err(_("broken delta in manifest %s: %s") % (short(n), inst))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2055
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	2056 self.ui.status(_("crosschecking files in changesets and manifests\n"))
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2057
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	2058 for m, c in neededmanifests.items():
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	2059 err(_("Changeset %s refers to unknown manifest %s") %
1384 d729850d52fa hg verify: add some bin to hex conversions Matt Mackall <mpm@selenic.com> parents: 1383 diff changeset	2060 (short(m), short(c)))
1382 b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2061 del neededmanifests
b113e7db06e9 hg verify: more consistency checking between changesets and manifests Matt Mackall <mpm@selenic.com> parents: 1375 diff changeset	2062
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2063 for f in filenodes:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2064 if f not in filelinkrevs:
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	2065 err(_("file %s in manifest but not in changesets") % f)
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2066
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2067 for f in filelinkrevs:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2068 if f not in filenodes:
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	2069 err(_("file %s in changeset but not in manifest") % f)
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2070
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	2071 self.ui.status(_("checking files\n"))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2072 ff = filenodes.keys()
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2073 ff.sort()
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2074 for f in ff:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	2075 if f == "/dev/null":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	2076 continue
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2077 files += 1
1853 5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2078 if not f:
5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2079 err(_("file without name in manifest %s") % short(n))
5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2080 continue
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2081 fl = self.file(f)
2143 3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	2082 checkversion(fl, f)
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1663 diff changeset	2083 checksize(fl, f)
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1492 diff changeset	2084
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1597 diff changeset	2085 nodes = {nullid: 1}
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	2086 seen = {}
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2087 for i in range(fl.count()):
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2088 revisions += 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2089 n = fl.node(i)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2090
302 498fb0fa2795 various fixups for git import mpm@selenic.com parents: 299 diff changeset	2091 if n in seen:
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	2092 err(_("%s: duplicate revision %d") % (f, i))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2093 if n not in filenodes[f]:
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	2094 err(_("%s: %d:%s not in manifests") % (f, i, short(n)))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2095 else:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2096 del filenodes[f][n]
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2097
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2098 flr = fl.linkrev(n)
1853 5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1839 diff changeset	2099 if flr not in filelinkrevs.get(f, []):
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	2100 err(_("%s:%s points to unexpected changeset %d")
1383 3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	2101 % (f, short(n), flr))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2102 else:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2103 filelinkrevs[f].remove(flr)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2104
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2105 # verify contents
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2106 try:
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2107 t = fl.read(n)
1492 5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	2108 except KeyboardInterrupt:
5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	2109 self.ui.warn(_("interrupted"))
5f0522d31967 Allow interrupting all parts of verify Matt Mackall <mpm@selenic.com> parents: 1480 diff changeset	2110 raise
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2111 except Exception, inst:
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	2112 err(_("unpacking file %s %s: %s") % (f, short(n), inst))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2113
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2114 # verify parents
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2115 (p1, p2) = fl.parents(n)
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2116 if p1 not in nodes:
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	2117 err(_("file %s:%s unknown parent 1 %s") %
1383 3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	2118 (f, short(n), short(p1)))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2119 if p2 not in nodes:
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	2120 err(_("file %s:%s unknown parent 2 %s") %
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2121 (f, short(n), short(p1)))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2122 nodes[n] = 1
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2123
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2124 # cross-check
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2125 for node in filenodes[f]:
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	2126 err(_("node %s in manifests not in %s") % (hex(node), f))
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2127
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	2128 self.ui.status(_("%d files, %d changesets, %d total revisions\n") %
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2129 (files, changesets, revisions))
863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2130
2143 3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	2131 if warnings[0]:
3053fc33f545 Show repo's revlog format on verify. Warn if some files use a different format. Thomas Arendsen Hein <thomas@intevation.de> parents: 2142 diff changeset	2132 self.ui.warn(_("%d warnings encountered!\n") % warnings[0])
1383 3d6d45faf8b2 hg verify: add an error reporting helper function Matt Mackall <mpm@selenic.com> parents: 1382 diff changeset	2133 if errors[0]:
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	2134 self.ui.warn(_("%d integrity errors encountered!\n") % errors[0])
247 863b508c5b36 migrate verify mpm@selenic.com parents: 244 diff changeset	2135 return 1
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2136
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2137 # 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	2138 def aftertrans(base):
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2139 p = base
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2140 def a():
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2141 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	2142 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	2143 os.path.join(p, "undo.dirstate"))
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2144 return a
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1802 diff changeset	2145

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/localrepo.py @ 2439:e8c4f3d3df8c