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

comparison mercurial/localrepo.py @ 20933:d3775db748a0

localrepo: move the addchangegroup method in changegroup module This is a gratuitous code move aimed at reducing the localrepo bloatness. The method had few callers, not enough to be kept in local repo.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Tue, 01 Apr 2014 15:27:53 -0700
parents	0ac83e4e4f7c
children	8d853cad6b14

comparison

equal deleted inserted replaced

-:0ac83e4e4f7c
+:d3775db748a0
 def lock(self):
 return self._repo.lock()
 def addchangegroup(self, cg, source, url):
-return self._repo.addchangegroup(cg, source, url)
+return changegroup.addchangegroup(self._repo, cg, source, url)
 def pushkey(self, namespace, key, old, new):
 return self._repo.pushkey(namespace, key, old, new)
 def listkeys(self, namespace):
 pass
 def push(self, remote, force=False, revs=None, newbranch=False):
 return exchange.push(self, remote, force, revs, newbranch)
-@unfilteredmethod
-def addchangegroup(self, source, srctype, url, emptyok=False):
-"""Add the changegroup returned by source.read() to this repo.
-srctype is a string like 'push', 'pull', or 'unbundle'.  url is
-the URL of the repo where this changegroup is coming from.
-Return an integer summarizing the change to this repo:
-- nothing changed or no source: 0
-- more heads than before: 1+added heads (2..n)
-- fewer heads than before: -1-removed heads (-2..-n)
-- number of heads stays the same: 1
-"""
-def csmap(x):
-self.ui.debug("add changeset %s\n" % short(x))
-return len(cl)
-def revmap(x):
-return cl.rev(x)
-if not source:
-return 0
-self.hook('prechangegroup', throw=True, source=srctype, url=url)
-changesets = files = revisions = 0
-efiles = set()
-# write changelog data to temp files so concurrent readers will not see
-# inconsistent view
-cl = self.changelog
-cl.delayupdate()
-oldheads = cl.heads()
-tr = self.transaction("\n".join([srctype, util.hidepassword(url)]))
-try:
-trp = weakref.proxy(tr)
-# pull off the changeset group
-self.ui.status(_("adding changesets\n"))
-clstart = len(cl)
-class prog(object):
-step = _('changesets')
-count = 1
-ui = self.ui
-total = None
-def __call__(self):
-self.ui.progress(self.step, self.count, unit=_('chunks'),
-total=self.total)
-self.count += 1
-pr = prog()
-source.callback = pr
-source.changelogheader()
-srccontent = cl.addgroup(source, csmap, trp)
-if not (srccontent or emptyok):
-raise util.Abort(_("received changelog group is empty"))
-clend = len(cl)
-changesets = clend - clstart
-for c in xrange(clstart, clend):
-efiles.update(self[c].files())
-efiles = len(efiles)
-self.ui.progress(_('changesets'), None)
-# pull off the manifest group
-self.ui.status(_("adding manifests\n"))
-pr.step = _('manifests')
-pr.count = 1
-pr.total = changesets # manifests <= changesets
-# no need to check for empty manifest group here:
-# if the result of the merge of 1 and 2 is the same in 3 and 4,
-# no new manifest will be created and the manifest group will
-# be empty during the pull
-source.manifestheader()
-self.manifest.addgroup(source, revmap, trp)
-self.ui.progress(_('manifests'), None)
-needfiles = {}
-if self.ui.configbool('server', 'validate', default=False):
-# validate incoming csets have their manifests
-for cset in xrange(clstart, clend):
-mfest = self.changelog.read(self.changelog.node(cset))[0]
-mfest = self.manifest.readdelta(mfest)
-# store file nodes we must see
-for f, n in mfest.iteritems():
-needfiles.setdefault(f, set()).add(n)
-# process the files
-self.ui.status(_("adding file changes\n"))
-pr.step = _('files')
-pr.count = 1
-pr.total = efiles
-source.callback = None
-newrevs, newfiles = changegroup.addchangegroupfiles(self,
-source,
-revmap,
-trp,
-pr,
-needfiles)
-revisions += newrevs
-files += newfiles
-dh = 0
-if oldheads:
-heads = cl.heads()
-dh = len(heads) - len(oldheads)
-for h in heads:
-if h not in oldheads and self[h].closesbranch():
-dh -= 1
-htext = ""
-if dh:
-htext = _(" (%+d heads)") % dh
-self.ui.status(_("added %d changesets"
-" with %d changes to %d files%s\n")
-% (changesets, revisions, files, htext))
-self.invalidatevolatilesets()
-if changesets > 0:
-p = lambda: cl.writepending() and self.root or ""
-self.hook('pretxnchangegroup', throw=True,
-node=hex(cl.node(clstart)), source=srctype,
-url=url, pending=p)
-added = [cl.node(r) for r in xrange(clstart, clend)]
-publishing = self.ui.configbool('phases', 'publish', True)
-if srctype == 'push':
-# Old servers can not push the boundary themselves.
-# New servers won't push the boundary if changeset already
-# exists locally as secret
-#
-# We should not use added here but the list of all change in
-# the bundle
-if publishing:
-phases.advanceboundary(self, phases.public, srccontent)
-else:
-phases.advanceboundary(self, phases.draft, srccontent)
-phases.retractboundary(self, phases.draft, added)
-elif srctype != 'strip':
-# publishing only alter behavior during push
-#
-# strip should not touch boundary at all
-phases.retractboundary(self, phases.draft, added)
-# make changelog see real files again
-cl.finalize(trp)
-tr.close()
-if changesets > 0:
-if srctype != 'strip':
-# During strip, branchcache is invalid but coming call to
-# `destroyed` will repair it.
-# In other case we can safely update cache on disk.
-branchmap.updatecache(self.filtered('served'))
-def runhooks():
-# These hooks run when the lock releases, not when the
-# transaction closes. So it's possible for the changelog
-# to have changed since we last saw it.
-if clstart >= len(self):
-return
-# forcefully update the on-disk branch cache
-self.ui.debug("updating the branch cache\n")
-self.hook("changegroup", node=hex(cl.node(clstart)),
-source=srctype, url=url)
-for n in added:
-self.hook("incoming", node=hex(n), source=srctype,
-url=url)
-newheads = [h for h in self.heads() if h not in oldheads]
-self.ui.log("incoming",
-"%s incoming changes - new heads: %s\n",
-len(added),
-', '.join([hex(c[:6]) for c in newheads]))
-self._afterlock(runhooks)
-finally:
-tr.release()
-# never return 0 here:
-if dh < 0:
-return dh - 1
-else:
-return dh + 1
 def stream_in(self, remote, requirements):
 lock = self.lock()
 try:
 # Save remote branchmap. We will use it later
 # to speed up branchcache creation

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 20933:d3775db748a0