amend: add a new flag `--patch` to `hg amend` This patch adds a new flag `--patch` to `hg amend` which pops up an editor with the patch of working directory parent which you can change, and when you exit the editor the patch with changes is applied to current working directory with old changeset being obsoleted in favour of new one created by the applied patch. If supplied filenames, only those filenames are present in the popped editor and rest files stay the same way in the commit as they were. The extension of the file which opens up in editor is '.diff', we cannot have it as '.patch' as there will be develwarns related to that. We need to change to patch core and undo some change to achieve this. The implementation does not use any core API rather it has picked chunks from API which are required. One main reason to not use core import API is that we have to change wdir parent before using patch.patch() which I will like to avoid to make sure we handle merge cases too. While writing this patch I have spend lot of time try to use internal API's to work for this but none of them served the purpose well. If I have time in future and work on similar problem again, I am going to write better high-level API's which uses patchstore to achieve this. A new test file test-amend-patch.t which contains a lot of testing of the feature.

     1

# Extension which prevent changeset to be turn public by push operation

     2

#

     3

# Copyright 2011 Logilab SA        <contact@logilab.fr>

     4

#

     5

# This software may be used and distributed according to the terms of the

     6

# GNU General Public License version 2 or any later version.

     7

     8

     9

from mercurial import extensions, util

    10

from mercurial import discovery

    11

    12

def checkpublish(orig, repo, remote, outgoing, *args):

    13

    14

    # is remote publishing?

    15

    publish = True

    16

    if 'phases' in remote.listkeys('namespaces'):

    17

        remotephases = remote.listkeys('phases')

    18

        publish = remotephases.get('publishing', False)

    19

    20

    npublish = 0

    21

    if publish:

    22

        for rev in outgoing.missing:

    23

            if repo[rev].phase():

    24

                npublish += 1

    25

    if npublish:

    26

        repo.ui.warn("Push would publish %s changesets" % npublish)

    27

    28

    ret = orig(repo, remote, outgoing, *args)

    29

    if npublish:

    30

        raise util.Abort("Publishing push forbidden",

    31

                         hint="Use `hg phase -p <rev>` to manually publish them")

    32

    33

    return ret

    34

    35

def uisetup(ui):

    36

    extensions.wrapfunction(discovery, 'checkheads', checkpublish)