annotate hgext/amend.py @ 35506:fa865878a849

lfs: show a friendly message when pushing lfs to a server without lfs enabled

Upfront disclaimer: I don't know anything about the wire protocol, and this was
pretty much cargo-culted from largefiles, and then clonebundles, since it seems
more modern.  I was surprised that exchange.push() will ensure all of the proper
requirements when exchanging between two local repos, but doesn't care when one
is remote.

All this new capability marker does is inform the client that the extension is
enabled remotely.  It may or may not contain commits with external blobs.

Open issues:

  - largefiles uses 'largefiles=serve' for its capability.  Someday I hope to
    be able to push lfs blobs to an `hg serve` instance.  That will probably
    require a distinct capability.  Should it change to '=serve' then?  Or just
    add an 'lfs-serve' capability then?

  - The flip side of this is more complicated.  It looks like largefiles adds an
    'lheads' command for the client to signal to the server that the extension
    is loaded.  That is then converted to 'heads' and sent through the normal
    wire protocol plumbing.  A client using the 'heads' command directly is
    kicked out with a message indicating that the largefiles extension must be
    loaded.  We could do similar with 'lfsheads', but then a repo with both
    largefiles and lfs blobs can't be pushed over the wire.  Hopefully somebody
    with more wire protocol experience can think of something else.  I see
    'x-hgarg-1' on some commands in the tests, but not on heads, and didn't dig
    any further.

# amend.py - provide the amend command
#
# Copyright 2017 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""provide the amend command (EXPERIMENTAL)

This extension provides an ``amend`` command that is similar to
``commit --amend`` but does not prompt an editor.
"""

from __future__ import absolute_import

from mercurial.i18n import _
from mercurial import (
    cmdutil,
    commands,
    error,
    pycompat,
    registrar,
)

# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
testedwith = 'ships-with-hg-core'

cmdtable = {}
command = registrar.command(cmdtable)

@command('amend',
    [('A', 'addremove', None,
      _('mark new/missing files as added/removed before committing')),
     ('e', 'edit', None, _('invoke editor on commit messages')),
     ('i', 'interactive', None, _('use interactive mode')),
     ('n', 'note', '', _('store a note on the amend')),
    ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2,
    _('[OPTION]... [FILE]...'),
    inferrepo=True)
def amend(ui, repo, *pats, **opts):
    """amend the working copy parent with all or specified outstanding changes

    Similar to :hg:`commit --amend`, but reuse the commit message without
    invoking editor, unless ``--edit`` was set.

    See :hg:`help commit` for more details.
    """
    opts = pycompat.byteskwargs(opts)
    if len(opts['note']) > 255:
        raise error.Abort(_("cannot store a note of more than 255 bytes"))
    with repo.wlock(), repo.lock():
        if not opts.get('logfile'):
            opts['message'] = opts.get('message') or repo['.'].description()
        opts['amend'] = True
        return commands._docommit(ui, repo, *pats, **pycompat.strkwargs(opts))