with: use context manager for transaction in changegroup apply

(This needs some line wrapping due to the additional indent level. -mpm)

mercurial/changegroup.py

@@ -323,8 +323,9 b' class cg1unpacker(object):'
 
         changesets = files = revisions = 0
 
-        tr = repo.transaction("\n".join([srctype, util.hidepassword(url)]))
         try:
+            with repo.transaction("\n".join([srctype,
+                                             util.hidepassword(url)])) as tr:
             # The transaction could have been created before and already
             # carries source information. In this case we use the top
             # level data. We overwrite the argument because we need to use
@@ -349,8 +350,8 b' class cg1unpacker(object):'
                     self._total = total
                     self._count = 1
                 def __call__(self):
-                    repo.ui.progress(self._step, self._count, unit=_('chunks'),
-                                     total=self._total)
+                        repo.ui.progress(self._step, self._count,
+                                         unit=_('chunks'), total=self._total)
                     self._count += 1
             self.callback = prog(_('changesets'), expectedtotal)
 
@@ -377,7 +378,8 b' class cg1unpacker(object):'
             if repo.ui.configbool('server', 'validate', default=False):
                 # validate incoming csets have their manifests
                 for cset in xrange(clstart, clend):
-                    mfnode = repo.changelog.read(repo.changelog.node(cset))[0]
+                        mfnode = repo.changelog.read(
+                            repo.changelog.node(cset))[0]
                     mfest = repo.manifest.readdelta(mfnode)
                     # store file nodes we must see
                     for f, n in mfest.iteritems():
@@ -429,12 +431,15 b' class cg1unpacker(object):'
                 # We should not use added here but the list of all change in
                 # the bundle
                 if publishing:
-                    phases.advanceboundary(repo, tr, phases.public, srccontent)
+                        phases.advanceboundary(repo, tr, phases.public,
+                                               srccontent)
                 else:
-                    # Those changesets have been pushed from the outside, their
-                    # phases are going to be pushed alongside. Therefor
-                    # `targetphase` is ignored.
-                    phases.advanceboundary(repo, tr, phases.draft, srccontent)
+                        # Those changesets have been pushed from the
+                        # outside, their phases are going to be pushed
+                        # alongside. Therefor `targetphase` is
+                        # ignored.
+                        phases.advanceboundary(repo, tr, phases.draft,
+                                               srccontent)
                     phases.retractboundary(repo, tr, phases.draft, added)
             elif srctype != 'strip':
                 # publishing only alter behavior during push
@@ -444,9 +449,10 b' class cg1unpacker(object):'
 
             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.
+                        # 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(repo.filtered('served'))
 
                 def runhooks():
@@ -466,7 +472,8 b' class cg1unpacker(object):'
                         del args['node_last']
                         repo.hook("incoming", **args)
 
-                    newheads = [h for h in repo.heads() if h not in oldheads]
+                        newheads = [h for h in repo.heads()
+                                    if h not in oldheads]
                     repo.ui.log("incoming",
                                 "%s incoming changes - new heads: %s\n",
                                 len(added),
@@ -474,11 +481,7 b' class cg1unpacker(object):'
 
                 tr.addpostclose('changegroup-runhooks-%020i' % clstart,
                                 lambda tr: repo._afterlock(runhooks))
-
-            tr.close()
-
         finally:
-            tr.release()
             repo.ui.flush()
         # never return 0 here:
         if dh < 0: