Mercurial > hg-stable

changeset 32944:038bfc384271

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changegroup: inline 'publishing' variable in apply()
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 19 Jun 2017 00:06:23 -0700
parents 4c6e4a4486a0
children febd6bfa770d
files mercurial/changegroup.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/changegroup.py	Mon Jun 19 11:24:49 2017 -0700
+++ b/mercurial/changegroup.py	Mon Jun 19 00:06:23 2017 -0700
@@ -377,7 +377,6 @@
                     repo.hook('pretxnchangegroup', throw=True, **hookargs)
 
                 added = [cl.node(r) for r in xrange(clstart, clend)]
-                publishing = repo.publishing()
                 if srctype in ('push', 'serve'):
                     # Old servers can not push the boundary themselves.
                     # New servers won't push the boundary if changeset already
@@ -385,7 +384,7 @@
                     #
                     # We should not use added here but the list of all change in
                     # the bundle
-                    if publishing:
+                    if repo.publishing():
                         phases.advanceboundary(repo, tr, phases.public, cgnodes)
                     else:
                         # Those changesets have been pushed from the