|
|
# record.py
|
|
|
#
|
|
|
# Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
|
|
|
#
|
|
|
# This software may be used and distributed according to the terms of the
|
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
|
|
'''commands to interactively select changes for commit/qrefresh'''
|
|
|
|
|
|
from mercurial.i18n import _
|
|
|
from mercurial import cmdutil, commands, extensions
|
|
|
from mercurial import util
|
|
|
|
|
|
cmdtable = {}
|
|
|
command = cmdutil.command(cmdtable)
|
|
|
testedwith = 'internal'
|
|
|
|
|
|
|
|
|
@command("record",
|
|
|
# same options as commit + white space diff options
|
|
|
[c for c in commands.table['^commit|ci'][1][:]
|
|
|
if c[1] != "interactive"] + commands.diffwsopts,
|
|
|
_('hg record [OPTION]... [FILE]...'))
|
|
|
def record(ui, repo, *pats, **opts):
|
|
|
'''interactively select changes to commit
|
|
|
|
|
|
If a list of files is omitted, all changes reported by :hg:`status`
|
|
|
will be candidates for recording.
|
|
|
|
|
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
|
|
|
You will be prompted for whether to record changes to each
|
|
|
modified file, and for files with multiple changes, for each
|
|
|
change to use. For each query, the following responses are
|
|
|
possible::
|
|
|
|
|
|
y - record this change
|
|
|
n - skip this change
|
|
|
e - edit this change manually
|
|
|
|
|
|
s - skip remaining changes to this file
|
|
|
f - record remaining changes to this file
|
|
|
|
|
|
d - done, skip remaining changes and files
|
|
|
a - record all changes to all remaining files
|
|
|
q - quit, recording no changes
|
|
|
|
|
|
? - display help
|
|
|
|
|
|
This command is not available when committing a merge.'''
|
|
|
|
|
|
opts["interactive"] = True
|
|
|
commands.commit(ui, repo, *pats, **opts)
|
|
|
|
|
|
def qrefresh(origfn, ui, repo, *pats, **opts):
|
|
|
if not opts['interactive']:
|
|
|
return origfn(ui, repo, *pats, **opts)
|
|
|
|
|
|
mq = extensions.find('mq')
|
|
|
|
|
|
def committomq(ui, repo, *pats, **opts):
|
|
|
# At this point the working copy contains only changes that
|
|
|
# were accepted. All other changes were reverted.
|
|
|
# We can't pass *pats here since qrefresh will undo all other
|
|
|
# changed files in the patch that aren't in pats.
|
|
|
mq.refresh(ui, repo, **opts)
|
|
|
|
|
|
# backup all changed files
|
|
|
cmdutil.dorecord(ui, repo, committomq, 'qrefresh', True, *pats, **opts)
|
|
|
|
|
|
# This command registration is replaced during uisetup().
|
|
|
@command('qrecord',
|
|
|
[],
|
|
|
_('hg qrecord [OPTION]... PATCH [FILE]...'),
|
|
|
inferrepo=True)
|
|
|
def qrecord(ui, repo, patch, *pats, **opts):
|
|
|
'''interactively record a new patch
|
|
|
|
|
|
See :hg:`help qnew` & :hg:`help record` for more information and
|
|
|
usage.
|
|
|
'''
|
|
|
|
|
|
try:
|
|
|
mq = extensions.find('mq')
|
|
|
except KeyError:
|
|
|
raise util.Abort(_("'mq' extension not loaded"))
|
|
|
|
|
|
repo.mq.checkpatchname(patch)
|
|
|
|
|
|
def committomq(ui, repo, *pats, **opts):
|
|
|
opts['checkname'] = False
|
|
|
mq.new(ui, repo, patch, *pats, **opts)
|
|
|
|
|
|
cmdutil.dorecord(ui, repo, committomq, 'qnew', False, *pats, **opts)
|
|
|
|
|
|
def qnew(origfn, ui, repo, patch, *args, **opts):
|
|
|
if opts['interactive']:
|
|
|
return qrecord(ui, repo, patch, *args, **opts)
|
|
|
return origfn(ui, repo, patch, *args, **opts)
|
|
|
|
|
|
|
|
|
def uisetup(ui):
|
|
|
try:
|
|
|
mq = extensions.find('mq')
|
|
|
except KeyError:
|
|
|
return
|
|
|
|
|
|
cmdtable["qrecord"] = \
|
|
|
(qrecord,
|
|
|
# same options as qnew, but copy them so we don't get
|
|
|
# -i/--interactive for qrecord and add white space diff options
|
|
|
mq.cmdtable['^qnew'][1][:] + commands.diffwsopts,
|
|
|
_('hg qrecord [OPTION]... PATCH [FILE]...'))
|
|
|
|
|
|
_wrapcmd('qnew', mq.cmdtable, qnew, _("interactively record a new patch"))
|
|
|
_wrapcmd('qrefresh', mq.cmdtable, qrefresh,
|
|
|
_("interactively select changes to refresh"))
|
|
|
|
|
|
def _wrapcmd(cmd, table, wrapfn, msg):
|
|
|
entry = extensions.wrapcommand(table, cmd, wrapfn)
|
|
|
entry[1].append(('i', 'interactive', None, msg))
|
|
|
|