diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py index 0bee97fa1fa8ac455ff561b8294bcde2b15ec0f5_bWVyY3VyaWFsL2NoYW5nZWdyb3VwLnB5..f0745da75056d91d15c8522cf042262a4c2cc936_bWVyY3VyaWFsL2NoYW5nZWdyb3VwLnB5 100644 --- a/mercurial/changegroup.py +++ b/mercurial/changegroup.py @@ -820,7 +820,7 @@ repo.hook('pretxnchangegroup', throw=True, pending=p, **hookargs) added = [cl.node(r) for r in xrange(clstart, clend)] - publishing = repo.ui.configbool('phases', 'publish', True) + 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 diff --git a/mercurial/hg.py b/mercurial/hg.py index 0bee97fa1fa8ac455ff561b8294bcde2b15ec0f5_bWVyY3VyaWFsL2hnLnB5..f0745da75056d91d15c8522cf042262a4c2cc936_bWVyY3VyaWFsL2hnLnB5 100644 --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -253,7 +253,7 @@ closetopic[0] = topic else: ui.progress(topic, pos + num) - srcpublishing = srcrepo.ui.configbool('phases', 'publish', True) + srcpublishing = srcrepo.publishing() srcvfs = scmutil.vfs(srcrepo.sharedpath) dstvfs = scmutil.vfs(destpath) for f in srcrepo.store.copylist(): diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py index 0bee97fa1fa8ac455ff561b8294bcde2b15ec0f5_bWVyY3VyaWFsL2xvY2FscmVwby5weQ==..f0745da75056d91d15c8522cf042262a4c2cc936_bWVyY3VyaWFsL2xvY2FscmVwby5weQ== 100644 --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -804,7 +804,7 @@ # so statichttprepo's override of local() works if not self.local(): return False - if not self.ui.configbool('phases', 'publish', True): + if not self.publishing(): return True # if publishing we can't copy if there is filtered content return not self.filtered('visible').changelog.filteredrevs diff --git a/mercurial/phases.py b/mercurial/phases.py index 0bee97fa1fa8ac455ff561b8294bcde2b15ec0f5_bWVyY3VyaWFsL3BoYXNlcy5weQ==..f0745da75056d91d15c8522cf042262a4c2cc936_bWVyY3VyaWFsL3BoYXNlcy5weQ== 100644 --- a/mercurial/phases.py +++ b/mercurial/phases.py @@ -360,7 +360,7 @@ for root in repo._phasecache.phaseroots[draft]: keys[hex(root)] = value - if repo.ui.configbool('phases', 'publish', True): + if repo.publishing(): # Add an extra data to let remote know we are a publishing # repo. Publishing repo can't just pretend they are old repo. # When pushing to a publishing repo, the client still need to