# HG changeset patch # User Martin von Zweigbergk # Date 1497855983 25200 # Node ID 038bfc384271be6ec2354262ab198714c773ed09 # Parent 4c6e4a4486a0b00bdc6737f624a1e30c440b7f36 changegroup: inline 'publishing' variable in apply() diff -r 4c6e4a4486a0 -r 038bfc384271 mercurial/changegroup.py --- 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