annotate contrib/nopushpublish.py @ 4122:4eb3877540f1

evovle: remove redundancy in evolve output

Copying the discription of this redundancy issue given by Pierre Yves David:

When running `hg evolve` to stabilize orphan changeset output about the
currently stabilized changeset is issued. For example:

$ hg evolve
  move:[3] a3
  atop:[4] a2
  working directory is now at 7c5649f73d11

This output can become quite repetitive when orphan are stabilized atop
each other. For example:

$ hg evolve --all
  move:[8] dansk 2!
  atop:[10] dansk!
  merging main-file-1
  move:[9] dansk 3!
  atop:[11] dansk 2!

In this case it would be smoother to issue:

$ hg evolve --all
  move:[8] dansk 2!
  atop:[10] dansk!
  merging main-file-1
  move:[9] dansk 3!

Since we are moving "dansk 3!" atop the changeset we just stabilized.

When adding this be careful that we still want to issue the "atop" message
in various cases:

  1. first changesets in a stack
  2. when the orphan is not stabilized atop previous one
  3. when using hg evolve --continue to resume an evolution

So, I have made the changes which also respect above listed three points.
And changes in tests/test-evovle*.t reflecting the changed behavior.

# Extension which prevent changeset to be turn public by push operation
#
# Copyright 2011 Logilab SA        <[e-mail]>
#
# 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 forbidden",
                         hint="Use `hg phase -p <rev>` to manually publish them")

    return ret

def uisetup(ui):
    extensions.wrapfunction(discovery, 'checkheads', checkpublish)