Mercurial > evolve
view contrib/nopushpublish.py @ 1467:5c385b812500 stable
evolve: dedupe divergents when running evolve --all --any or evolve --rev
Before this patch, when running evolve --all --any or evolve --rev with the
--divergent flag, we were selecting all of the divergents. After solving the
first one, its counterparts would get pruned and potentially hidden which would
crash when trying to resolve them. This patch introduces logic to dedupe the
divergents to be resolved by keeping only one per group of divergent with the
lower revision number.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Wed, 24 Jun 2015 16:54:23 -0700 |
parents | 984be08ef504 |
children | 4f5e915ddb71 |
line wrap: on
line source
# Extension which prevent changeset to be turn public by push operation # # Copyright 2011 Logilab SA <contact@logilab.fr> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from mercurial import extensions, util from mercurial import discovery def checkpublish(orig, repo, remote, outgoing, *args): # is remote publishing? publish = True if 'phases' in remote.listkeys('namespaces'): remotephases = remote.listkeys('phases') publish = remotephases.get('publishing', False) npublish = 0 if publish: for rev in outgoing.missing: if repo[rev].phase(): npublish += 1 if npublish: repo.ui.warn("Push would publish %s changesets" % npublish) ret = orig(repo, remote, outgoing, *args) if npublish: raise util.Abort("Publishing push forbiden", hint="Use `hg phase -p <rev>` to manually publish them") return ret def uisetup(ui): extensions.wrapfunction(discovery, 'checkheads', checkpublish)