##// END OF EJS Templates
publishing: use new helper method
Matt Mackall -
r25624:f0745da7 default
parent child Browse files
Show More
@@ -820,7 +820,7 b' def addchangegroup(repo, source, srctype'
820 repo.hook('pretxnchangegroup', throw=True, pending=p, **hookargs)
820 repo.hook('pretxnchangegroup', throw=True, pending=p, **hookargs)
821
821
822 added = [cl.node(r) for r in xrange(clstart, clend)]
822 added = [cl.node(r) for r in xrange(clstart, clend)]
823 publishing = repo.ui.configbool('phases', 'publish', True)
823 publishing = repo.publishing()
824 if srctype in ('push', 'serve'):
824 if srctype in ('push', 'serve'):
825 # Old servers can not push the boundary themselves.
825 # Old servers can not push the boundary themselves.
826 # New servers won't push the boundary if changeset already
826 # New servers won't push the boundary if changeset already
@@ -253,7 +253,7 b' def copystore(ui, srcrepo, destpath):'
253 closetopic[0] = topic
253 closetopic[0] = topic
254 else:
254 else:
255 ui.progress(topic, pos + num)
255 ui.progress(topic, pos + num)
256 srcpublishing = srcrepo.ui.configbool('phases', 'publish', True)
256 srcpublishing = srcrepo.publishing()
257 srcvfs = scmutil.vfs(srcrepo.sharedpath)
257 srcvfs = scmutil.vfs(srcrepo.sharedpath)
258 dstvfs = scmutil.vfs(destpath)
258 dstvfs = scmutil.vfs(destpath)
259 for f in srcrepo.store.copylist():
259 for f in srcrepo.store.copylist():
@@ -804,7 +804,7 b' class localrepository(object):'
804 # so statichttprepo's override of local() works
804 # so statichttprepo's override of local() works
805 if not self.local():
805 if not self.local():
806 return False
806 return False
807 if not self.ui.configbool('phases', 'publish', True):
807 if not self.publishing():
808 return True
808 return True
809 # if publishing we can't copy if there is filtered content
809 # if publishing we can't copy if there is filtered content
810 return not self.filtered('visible').changelog.filteredrevs
810 return not self.filtered('visible').changelog.filteredrevs
@@ -360,7 +360,7 b' def listphases(repo):'
360 for root in repo._phasecache.phaseroots[draft]:
360 for root in repo._phasecache.phaseroots[draft]:
361 keys[hex(root)] = value
361 keys[hex(root)] = value
362
362
363 if repo.ui.configbool('phases', 'publish', True):
363 if repo.publishing():
364 # Add an extra data to let remote know we are a publishing
364 # Add an extra data to let remote know we are a publishing
365 # repo. Publishing repo can't just pretend they are old repo.
365 # repo. Publishing repo can't just pretend they are old repo.
366 # When pushing to a publishing repo, the client still need to
366 # When pushing to a publishing repo, the client still need to
General Comments 0
You need to be logged in to leave comments. Login now