##// END OF EJS Templates
py3: replace print() with assert in test-demandimport.py...
py3: replace print() with assert in test-demandimport.py Behavior of demand imports behaves differently between Python 2 and 3. .out files do not support conditional output the way that .t files do. In order to make this test work on Python 3, we'll need to make the test itself conditional. The first step of this is to port the test to not use a .out file to compare output. Unfortunately, we can't easily use the unittest framework for defining this test because putting import statements in functions changes the behavior of the demand importer (at least on Python 2). So, we effectively replace a bunch of print() with assert statements. This makes the test a bit annoying to debug, as the test will stop at first assertion failure. But we don't exactly have a good alternative. Differential Revision: https://phab.mercurial-scm.org/D5795

File last commit:

r41209:4145fd35 default
r41646:dffd6a30 default
Show More
amend.py
60 lines | 2.1 KiB | text/x-python | PythonLexer
Jun Wu
amend: new extension providing the amend command...
r33404 # 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,
Pulkit Goyal
amend: error out if the note is greater than 255bytes...
r34890 error,
Pulkit Goyal
py3: handle keyword arguments in hgext/amend.py...
r34971 pycompat,
Jun Wu
amend: new extension providing the amend command...
r33404 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')),
Pulkit Goyal
amend: add a flag `-n/--note` to store note with amend...
r34796 ('n', 'note', '', _('store a note on the amend')),
Yuya Nishihara
amend: turn currentdate into tri-state bool so config option can be negated...
r41209 ('D', 'currentdate', None,
Yuya Nishihara
amend: add -D/--currentdate option...
r41160 _('record the current date as commit date')),
Jun Wu
amend: new extension providing the amend command...
r33404 ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2,
_('[OPTION]... [FILE]...'),
rdamazio@google.com
help: assigning categories to existing commands...
r40329 helpcategory=command.CATEGORY_COMMITTING,
Jun Wu
amend: new extension providing the amend command...
r33404 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.
"""
Pulkit Goyal
py3: handle keyword arguments in hgext/amend.py...
r34971 opts = pycompat.byteskwargs(opts)
Pulkit Goyal
amend: error out if the note is greater than 255bytes...
r34890 if len(opts['note']) > 255:
raise error.Abort(_("cannot store a note of more than 255 bytes"))
Jun Wu
amend: new extension providing the amend command...
r33404 with repo.wlock(), repo.lock():
if not opts.get('logfile'):
opts['message'] = opts.get('message') or repo['.'].description()
opts['amend'] = True
Pulkit Goyal
py3: handle keyword arguments in hgext/amend.py...
r34971 return commands._docommit(ui, repo, *pats, **pycompat.strkwargs(opts))