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

equal deleted inserted replaced

-:b43db44cd047
+:30d4d8985dd8
 self.dirstate.invalidate, _('working directory of %s') %
 self.origroot)
 self._wlockref = weakref.ref(l)
 return l
-def filecommit(self, fn, manifest1, manifest2, linkrev, transaction, changelist):
+def filecommit(self, fn, manifest1, manifest2, linkrev, tr, changelist):
 """
 commit an individual file as part of a larger transaction
 """
 t = self.wread(fn)
 # is the file unmodified from the parent? report existing entry
 if fp2 == nullid and not fl.cmp(fp1, t):
 return fp1
 changelist.append(fn)
-return fl.add(t, meta, transaction, linkrev, fp1, fp2)
+return fl.add(t, meta, tr, linkrev, fp1, fp2)
 def rawcommit(self, files, text, user, date, p1=None, p2=None, extra={}):
 if p1 is None:
 p1, p2 = self.dirstate.parents()
 return self.commit(files=files, text=text, user=user, date=date,
 self.hook("precommit", throw=True, parent1=xp1, parent2=xp2)
 wlock = self.wlock()
 lock = self.lock()
 tr = self.transaction()
+trp = weakref.proxy(tr)
 # check in files
 new = {}
 linkrev = self.changelog.count()
 commit.sort()
 is_exec = util.execfunc(self.root, m1.execf)
 is_link = util.linkfunc(self.root, m1.linkf)
 for f in commit:
 self.ui.note(f + "\n")
 try:
-new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed)
+new[f] = self.filecommit(f, m1, m2, linkrev, trp, changed)
 new_exec = is_exec(f)
 new_link = is_link(f)
 if not changed or changed[-1] != f:
 # mention the file in the changelog if some
 # flag changed, even if there was no content
 if f in m1:
 del m1[f]
 removed.append(f)
 elif f in m2:
 removed.append(f)
-mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0],
+mn = self.manifest.add(m1, trp, linkrev, c1[0], c2[0],
 (new, removed))
 # add changeset
 new = new.keys()
 new.sort()
 if not lines:
 return None
 text = '\n'.join(lines)
 if branchname:
 extra["branch"] = branchname
-n = self.changelog.add(mn, changed + removed, text, tr, p1, p2,
+n = self.changelog.add(mn, changed + removed, text, trp, p1, p2,
 user, date, extra)
 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
 parent2=xp2)
 tr.close()
 cl.delayupdate()
 oldheads = len(cl.heads())
 tr = self.transaction()
 try:
+trp = weakref.proxy(tr)
 # pull off the changeset group
 self.ui.status(_("adding changesets\n"))
 cor = cl.count() - 1
 chunkiter = changegroup.chunkiter(source)
-if cl.addgroup(chunkiter, csmap, tr, 1) is None:
+if cl.addgroup(chunkiter, csmap, trp, 1) is None:
 raise util.Abort(_("received changelog group is empty"))
 cnr = cl.count() - 1
 changesets = cnr - cor
 # pull off the manifest group
 chunkiter = changegroup.chunkiter(source)
 # 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
-self.manifest.addgroup(chunkiter, revmap, tr)
+self.manifest.addgroup(chunkiter, revmap, trp)
 # process the files
 self.ui.status(_("adding file changes\n"))
 while 1:
 f = changegroup.getchunk(source)
 break
 self.ui.debug(_("adding %s revisions\n") % f)
 fl = self.file(f)
 o = fl.count()
 chunkiter = changegroup.chunkiter(source)
-if fl.addgroup(chunkiter, revmap, tr) is None:
+if fl.addgroup(chunkiter, revmap, trp) is None:
 raise util.Abort(_("received file revlog group is empty"))
 revisions += fl.count() - o
 files += 1
 # make changelog see real files again
-cl.finalize(tr)
+cl.finalize(trp)
 newheads = len(self.changelog.heads())
 heads = ""
 if oldheads and newheads != oldheads:
 heads = _(" (%+d heads)") % (newheads - oldheads)

changeset 4970	30d4d8985dd8
parent 4961	126f527b3ba3
child 5023	7f5c3fb0a37d