|
|
# commands.py - command processing for mercurial
|
|
|
#
|
|
|
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
|
|
|
#
|
|
|
# This software may be used and distributed according to the terms of the
|
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
|
|
from __future__ import absolute_import
|
|
|
|
|
|
import difflib
|
|
|
import errno
|
|
|
import os
|
|
|
import re
|
|
|
import sys
|
|
|
|
|
|
from .i18n import _
|
|
|
from .node import (
|
|
|
hex,
|
|
|
nullid,
|
|
|
nullrev,
|
|
|
short,
|
|
|
wdirhex,
|
|
|
wdirrev,
|
|
|
)
|
|
|
from . import (
|
|
|
archival,
|
|
|
bookmarks,
|
|
|
bundle2,
|
|
|
changegroup,
|
|
|
cmdutil,
|
|
|
copies,
|
|
|
debugcommands as debugcommandsmod,
|
|
|
destutil,
|
|
|
dirstateguard,
|
|
|
discovery,
|
|
|
encoding,
|
|
|
error,
|
|
|
exchange,
|
|
|
extensions,
|
|
|
filemerge,
|
|
|
formatter,
|
|
|
graphmod,
|
|
|
hbisect,
|
|
|
help,
|
|
|
hg,
|
|
|
logcmdutil,
|
|
|
merge as mergemod,
|
|
|
narrowspec,
|
|
|
obsolete,
|
|
|
obsutil,
|
|
|
patch,
|
|
|
phases,
|
|
|
pycompat,
|
|
|
rcutil,
|
|
|
registrar,
|
|
|
repair,
|
|
|
revsetlang,
|
|
|
rewriteutil,
|
|
|
scmutil,
|
|
|
server,
|
|
|
state as statemod,
|
|
|
streamclone,
|
|
|
tags as tagsmod,
|
|
|
templatekw,
|
|
|
ui as uimod,
|
|
|
util,
|
|
|
wireprotoserver,
|
|
|
)
|
|
|
from .utils import (
|
|
|
dateutil,
|
|
|
stringutil,
|
|
|
)
|
|
|
|
|
|
table = {}
|
|
|
table.update(debugcommandsmod.command._table)
|
|
|
|
|
|
command = registrar.command(table)
|
|
|
INTENT_READONLY = registrar.INTENT_READONLY
|
|
|
|
|
|
# common command options
|
|
|
|
|
|
globalopts = [
|
|
|
('R', 'repository', '',
|
|
|
_('repository root directory or name of overlay bundle file'),
|
|
|
_('REPO')),
|
|
|
('', 'cwd', '',
|
|
|
_('change working directory'), _('DIR')),
|
|
|
('y', 'noninteractive', None,
|
|
|
_('do not prompt, automatically pick the first choice for all prompts')),
|
|
|
('q', 'quiet', None, _('suppress output')),
|
|
|
('v', 'verbose', None, _('enable additional output')),
|
|
|
('', 'color', '',
|
|
|
# i18n: 'always', 'auto', 'never', and 'debug' are keywords
|
|
|
# and should not be translated
|
|
|
_("when to colorize (boolean, always, auto, never, or debug)"),
|
|
|
_('TYPE')),
|
|
|
('', 'config', [],
|
|
|
_('set/override config option (use \'section.name=value\')'),
|
|
|
_('CONFIG')),
|
|
|
('', 'debug', None, _('enable debugging output')),
|
|
|
('', 'debugger', None, _('start debugger')),
|
|
|
('', 'encoding', encoding.encoding, _('set the charset encoding'),
|
|
|
_('ENCODE')),
|
|
|
('', 'encodingmode', encoding.encodingmode,
|
|
|
_('set the charset encoding mode'), _('MODE')),
|
|
|
('', 'traceback', None, _('always print a traceback on exception')),
|
|
|
('', 'time', None, _('time how long the command takes')),
|
|
|
('', 'profile', None, _('print command execution profile')),
|
|
|
('', 'version', None, _('output version information and exit')),
|
|
|
('h', 'help', None, _('display help and exit')),
|
|
|
('', 'hidden', False, _('consider hidden changesets')),
|
|
|
('', 'pager', 'auto',
|
|
|
_("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
|
|
|
]
|
|
|
|
|
|
dryrunopts = cmdutil.dryrunopts
|
|
|
remoteopts = cmdutil.remoteopts
|
|
|
walkopts = cmdutil.walkopts
|
|
|
commitopts = cmdutil.commitopts
|
|
|
commitopts2 = cmdutil.commitopts2
|
|
|
formatteropts = cmdutil.formatteropts
|
|
|
templateopts = cmdutil.templateopts
|
|
|
logopts = cmdutil.logopts
|
|
|
diffopts = cmdutil.diffopts
|
|
|
diffwsopts = cmdutil.diffwsopts
|
|
|
diffopts2 = cmdutil.diffopts2
|
|
|
mergetoolopts = cmdutil.mergetoolopts
|
|
|
similarityopts = cmdutil.similarityopts
|
|
|
subrepoopts = cmdutil.subrepoopts
|
|
|
debugrevlogopts = cmdutil.debugrevlogopts
|
|
|
|
|
|
# Commands start here, listed alphabetically
|
|
|
|
|
|
@command('add',
|
|
|
walkopts + subrepoopts + dryrunopts,
|
|
|
_('[OPTION]... [FILE]...'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
helpbasic=True, inferrepo=True)
|
|
|
def add(ui, repo, *pats, **opts):
|
|
|
"""add the specified files on the next commit
|
|
|
|
|
|
Schedule files to be version controlled and added to the
|
|
|
repository.
|
|
|
|
|
|
The files will be added to the repository at the next commit. To
|
|
|
undo an add before that, see :hg:`forget`.
|
|
|
|
|
|
If no names are given, add all files to the repository (except
|
|
|
files matching ``.hgignore``).
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- New (unknown) files are added
|
|
|
automatically by :hg:`add`::
|
|
|
|
|
|
$ ls
|
|
|
foo.c
|
|
|
$ hg status
|
|
|
? foo.c
|
|
|
$ hg add
|
|
|
adding foo.c
|
|
|
$ hg status
|
|
|
A foo.c
|
|
|
|
|
|
- Specific files to be added can be specified::
|
|
|
|
|
|
$ ls
|
|
|
bar.c foo.c
|
|
|
$ hg status
|
|
|
? bar.c
|
|
|
? foo.c
|
|
|
$ hg add bar.c
|
|
|
$ hg status
|
|
|
A bar.c
|
|
|
? foo.c
|
|
|
|
|
|
Returns 0 if all files are successfully added.
|
|
|
"""
|
|
|
|
|
|
m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
|
|
|
rejected = cmdutil.add(ui, repo, m, "", False, **opts)
|
|
|
return rejected and 1 or 0
|
|
|
|
|
|
@command('addremove',
|
|
|
similarityopts + subrepoopts + walkopts + dryrunopts,
|
|
|
_('[OPTION]... [FILE]...'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
inferrepo=True)
|
|
|
def addremove(ui, repo, *pats, **opts):
|
|
|
"""add all new files, delete all missing files
|
|
|
|
|
|
Add all new files and remove all missing files from the
|
|
|
repository.
|
|
|
|
|
|
Unless names are given, new files are ignored if they match any of
|
|
|
the patterns in ``.hgignore``. As with add, these changes take
|
|
|
effect at the next commit.
|
|
|
|
|
|
Use the -s/--similarity option to detect renamed files. This
|
|
|
option takes a percentage between 0 (disabled) and 100 (files must
|
|
|
be identical) as its parameter. With a parameter greater than 0,
|
|
|
this compares every removed file with every added file and records
|
|
|
those similar enough as renames. Detecting renamed files this way
|
|
|
can be expensive. After using this option, :hg:`status -C` can be
|
|
|
used to check which files were identified as moved or renamed. If
|
|
|
not specified, -s/--similarity defaults to 100 and only renames of
|
|
|
identical files are detected.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- A number of files (bar.c and foo.c) are new,
|
|
|
while foobar.c has been removed (without using :hg:`remove`)
|
|
|
from the repository::
|
|
|
|
|
|
$ ls
|
|
|
bar.c foo.c
|
|
|
$ hg status
|
|
|
! foobar.c
|
|
|
? bar.c
|
|
|
? foo.c
|
|
|
$ hg addremove
|
|
|
adding bar.c
|
|
|
adding foo.c
|
|
|
removing foobar.c
|
|
|
$ hg status
|
|
|
A bar.c
|
|
|
A foo.c
|
|
|
R foobar.c
|
|
|
|
|
|
- A file foobar.c was moved to foo.c without using :hg:`rename`.
|
|
|
Afterwards, it was edited slightly::
|
|
|
|
|
|
$ ls
|
|
|
foo.c
|
|
|
$ hg status
|
|
|
! foobar.c
|
|
|
? foo.c
|
|
|
$ hg addremove --similarity 90
|
|
|
removing foobar.c
|
|
|
adding foo.c
|
|
|
recording removal of foobar.c as rename to foo.c (94% similar)
|
|
|
$ hg status -C
|
|
|
A foo.c
|
|
|
foobar.c
|
|
|
R foobar.c
|
|
|
|
|
|
Returns 0 if all files are successfully added.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if not opts.get('similarity'):
|
|
|
opts['similarity'] = '100'
|
|
|
matcher = scmutil.match(repo[None], pats, opts)
|
|
|
return scmutil.addremove(repo, matcher, "", opts)
|
|
|
|
|
|
@command('annotate|blame',
|
|
|
[('r', 'rev', '', _('annotate the specified revision'), _('REV')),
|
|
|
('', 'follow', None,
|
|
|
_('follow copies/renames and list the filename (DEPRECATED)')),
|
|
|
('', 'no-follow', None, _("don't follow copies and renames")),
|
|
|
('a', 'text', None, _('treat all files as text')),
|
|
|
('u', 'user', None, _('list the author (long with -v)')),
|
|
|
('f', 'file', None, _('list the filename')),
|
|
|
('d', 'date', None, _('list the date (short with -q)')),
|
|
|
('n', 'number', None, _('list the revision number (default)')),
|
|
|
('c', 'changeset', None, _('list the changeset')),
|
|
|
('l', 'line-number', None, _('show line number at the first appearance')),
|
|
|
('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
|
|
|
] + diffwsopts + walkopts + formatteropts,
|
|
|
_('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
|
|
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
|
helpbasic=True, inferrepo=True)
|
|
|
def annotate(ui, repo, *pats, **opts):
|
|
|
"""show changeset information by line for each file
|
|
|
|
|
|
List changes in files, showing the revision id responsible for
|
|
|
each line.
|
|
|
|
|
|
This command is useful for discovering when a change was made and
|
|
|
by whom.
|
|
|
|
|
|
If you include --file, --user, or --date, the revision number is
|
|
|
suppressed unless you also include --number.
|
|
|
|
|
|
Without the -a/--text option, annotate will avoid processing files
|
|
|
it detects as binary. With -a, annotate will annotate the file
|
|
|
anyway, although the results will probably be neither useful
|
|
|
nor desirable.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions. See also :hg:`help templates`.
|
|
|
|
|
|
:lines: List of lines with annotation data.
|
|
|
:path: String. Repository-absolute path of the specified file.
|
|
|
|
|
|
And each entry of ``{lines}`` provides the following sub-keywords in
|
|
|
addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
|
|
|
|
|
|
:line: String. Line content.
|
|
|
:lineno: Integer. Line number at that revision.
|
|
|
:path: String. Repository-absolute path of the file at that revision.
|
|
|
|
|
|
See :hg:`help templates.operators` for the list expansion syntax.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if not pats:
|
|
|
raise error.Abort(_('at least one filename or pattern is required'))
|
|
|
|
|
|
if opts.get('follow'):
|
|
|
# --follow is deprecated and now just an alias for -f/--file
|
|
|
# to mimic the behavior of Mercurial before version 1.5
|
|
|
opts['file'] = True
|
|
|
|
|
|
if (not opts.get('user') and not opts.get('changeset')
|
|
|
and not opts.get('date') and not opts.get('file')):
|
|
|
opts['number'] = True
|
|
|
|
|
|
linenumber = opts.get('line_number') is not None
|
|
|
if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
|
|
|
raise error.Abort(_('at least one of -n/-c is required for -l'))
|
|
|
|
|
|
rev = opts.get('rev')
|
|
|
if rev:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
ctx = scmutil.revsingle(repo, rev)
|
|
|
|
|
|
ui.pager('annotate')
|
|
|
rootfm = ui.formatter('annotate', opts)
|
|
|
if ui.debugflag:
|
|
|
shorthex = pycompat.identity
|
|
|
else:
|
|
|
def shorthex(h):
|
|
|
return h[:12]
|
|
|
if ui.quiet:
|
|
|
datefunc = dateutil.shortdate
|
|
|
else:
|
|
|
datefunc = dateutil.datestr
|
|
|
if ctx.rev() is None:
|
|
|
if opts.get('changeset'):
|
|
|
# omit "+" suffix which is appended to node hex
|
|
|
def formatrev(rev):
|
|
|
if rev == wdirrev:
|
|
|
return '%d' % ctx.p1().rev()
|
|
|
else:
|
|
|
return '%d' % rev
|
|
|
else:
|
|
|
def formatrev(rev):
|
|
|
if rev == wdirrev:
|
|
|
return '%d+' % ctx.p1().rev()
|
|
|
else:
|
|
|
return '%d ' % rev
|
|
|
def formathex(h):
|
|
|
if h == wdirhex:
|
|
|
return '%s+' % shorthex(hex(ctx.p1().node()))
|
|
|
else:
|
|
|
return '%s ' % shorthex(h)
|
|
|
else:
|
|
|
formatrev = b'%d'.__mod__
|
|
|
formathex = shorthex
|
|
|
|
|
|
opmap = [
|
|
|
('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
|
|
|
('rev', ' ', lambda x: scmutil.intrev(x.fctx), formatrev),
|
|
|
('node', ' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
|
|
|
('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
|
|
|
('path', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
|
|
|
('lineno', ':', lambda x: x.lineno, pycompat.bytestr),
|
|
|
]
|
|
|
opnamemap = {
|
|
|
'rev': 'number',
|
|
|
'node': 'changeset',
|
|
|
'path': 'file',
|
|
|
'lineno': 'line_number',
|
|
|
}
|
|
|
|
|
|
if rootfm.isplain():
|
|
|
def makefunc(get, fmt):
|
|
|
return lambda x: fmt(get(x))
|
|
|
else:
|
|
|
def makefunc(get, fmt):
|
|
|
return get
|
|
|
datahint = rootfm.datahint()
|
|
|
funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
|
|
|
if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
|
|
|
funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
|
|
|
fields = ' '.join(fn for fn, sep, get, fmt in opmap
|
|
|
if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
|
|
|
|
|
|
def bad(x, y):
|
|
|
raise error.Abort("%s: %s" % (x, y))
|
|
|
|
|
|
m = scmutil.match(ctx, pats, opts, badfn=bad)
|
|
|
|
|
|
follow = not opts.get('no_follow')
|
|
|
diffopts = patch.difffeatureopts(ui, opts, section='annotate',
|
|
|
whitespace=True)
|
|
|
skiprevs = opts.get('skip')
|
|
|
if skiprevs:
|
|
|
skiprevs = scmutil.revrange(repo, skiprevs)
|
|
|
|
|
|
for abs in ctx.walk(m):
|
|
|
fctx = ctx[abs]
|
|
|
rootfm.startitem()
|
|
|
rootfm.data(path=abs)
|
|
|
if not opts.get('text') and fctx.isbinary():
|
|
|
rootfm.plain(_("%s: binary file\n") % m.rel(abs))
|
|
|
continue
|
|
|
|
|
|
fm = rootfm.nested('lines', tmpl='{rev}: {line}')
|
|
|
lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
|
|
|
diffopts=diffopts)
|
|
|
if not lines:
|
|
|
fm.end()
|
|
|
continue
|
|
|
formats = []
|
|
|
pieces = []
|
|
|
|
|
|
for f, sep in funcmap:
|
|
|
l = [f(n) for n in lines]
|
|
|
if fm.isplain():
|
|
|
sizes = [encoding.colwidth(x) for x in l]
|
|
|
ml = max(sizes)
|
|
|
formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
|
|
|
else:
|
|
|
formats.append(['%s' for x in l])
|
|
|
pieces.append(l)
|
|
|
|
|
|
for f, p, n in zip(zip(*formats), zip(*pieces), lines):
|
|
|
fm.startitem()
|
|
|
fm.context(fctx=n.fctx)
|
|
|
fm.write(fields, "".join(f), *p)
|
|
|
if n.skip:
|
|
|
fmt = "* %s"
|
|
|
else:
|
|
|
fmt = ": %s"
|
|
|
fm.write('line', fmt, n.text)
|
|
|
|
|
|
if not lines[-1].text.endswith('\n'):
|
|
|
fm.plain('\n')
|
|
|
fm.end()
|
|
|
|
|
|
rootfm.end()
|
|
|
|
|
|
@command('archive',
|
|
|
[('', 'no-decode', None, _('do not pass files through decoders')),
|
|
|
('p', 'prefix', '', _('directory prefix for files in archive'),
|
|
|
_('PREFIX')),
|
|
|
('r', 'rev', '', _('revision to distribute'), _('REV')),
|
|
|
('t', 'type', '', _('type of distribution to create'), _('TYPE')),
|
|
|
] + subrepoopts + walkopts,
|
|
|
_('[OPTION]... DEST'),
|
|
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
|
def archive(ui, repo, dest, **opts):
|
|
|
'''create an unversioned archive of a repository revision
|
|
|
|
|
|
By default, the revision used is the parent of the working
|
|
|
directory; use -r/--rev to specify a different revision.
|
|
|
|
|
|
The archive type is automatically detected based on file
|
|
|
extension (to override, use -t/--type).
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- create a zip file containing the 1.0 release::
|
|
|
|
|
|
hg archive -r 1.0 project-1.0.zip
|
|
|
|
|
|
- create a tarball excluding .hg files::
|
|
|
|
|
|
hg archive project.tar.gz -X ".hg*"
|
|
|
|
|
|
Valid types are:
|
|
|
|
|
|
:``files``: a directory full of files (default)
|
|
|
:``tar``: tar archive, uncompressed
|
|
|
:``tbz2``: tar archive, compressed using bzip2
|
|
|
:``tgz``: tar archive, compressed using gzip
|
|
|
:``uzip``: zip archive, uncompressed
|
|
|
:``zip``: zip archive, compressed using deflate
|
|
|
|
|
|
The exact name of the destination archive or directory is given
|
|
|
using a format string; see :hg:`help export` for details.
|
|
|
|
|
|
Each member added to an archive file has a directory prefix
|
|
|
prepended. Use -p/--prefix to specify a format string for the
|
|
|
prefix. The default is the basename of the archive, with suffixes
|
|
|
removed.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
'''
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
rev = opts.get('rev')
|
|
|
if rev:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
ctx = scmutil.revsingle(repo, rev)
|
|
|
if not ctx:
|
|
|
raise error.Abort(_('no working directory: please specify a revision'))
|
|
|
node = ctx.node()
|
|
|
dest = cmdutil.makefilename(ctx, dest)
|
|
|
if os.path.realpath(dest) == repo.root:
|
|
|
raise error.Abort(_('repository root cannot be destination'))
|
|
|
|
|
|
kind = opts.get('type') or archival.guesskind(dest) or 'files'
|
|
|
prefix = opts.get('prefix')
|
|
|
|
|
|
if dest == '-':
|
|
|
if kind == 'files':
|
|
|
raise error.Abort(_('cannot archive plain files to stdout'))
|
|
|
dest = cmdutil.makefileobj(ctx, dest)
|
|
|
if not prefix:
|
|
|
prefix = os.path.basename(repo.root) + '-%h'
|
|
|
|
|
|
prefix = cmdutil.makefilename(ctx, prefix)
|
|
|
match = scmutil.match(ctx, [], opts)
|
|
|
archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
|
|
|
match, prefix, subrepos=opts.get('subrepos'))
|
|
|
|
|
|
@command('backout',
|
|
|
[('', 'merge', None, _('merge with old dirstate parent after backout')),
|
|
|
('', 'commit', None,
|
|
|
_('commit if no conflicts were encountered (DEPRECATED)')),
|
|
|
('', 'no-commit', None, _('do not commit')),
|
|
|
('', 'parent', '',
|
|
|
_('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
|
|
|
('r', 'rev', '', _('revision to backout'), _('REV')),
|
|
|
('e', 'edit', False, _('invoke editor on commit messages')),
|
|
|
] + mergetoolopts + walkopts + commitopts + commitopts2,
|
|
|
_('[OPTION]... [-r] REV'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
|
|
|
def backout(ui, repo, node=None, rev=None, **opts):
|
|
|
'''reverse effect of earlier changeset
|
|
|
|
|
|
Prepare a new changeset with the effect of REV undone in the
|
|
|
current working directory. If no conflicts were encountered,
|
|
|
it will be committed immediately.
|
|
|
|
|
|
If REV is the parent of the working directory, then this new changeset
|
|
|
is committed automatically (unless --no-commit is specified).
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
:hg:`backout` cannot be used to fix either an unwanted or
|
|
|
incorrect merge.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- Reverse the effect of the parent of the working directory.
|
|
|
This backout will be committed immediately::
|
|
|
|
|
|
hg backout -r .
|
|
|
|
|
|
- Reverse the effect of previous bad revision 23::
|
|
|
|
|
|
hg backout -r 23
|
|
|
|
|
|
- Reverse the effect of previous bad revision 23 and
|
|
|
leave changes uncommitted::
|
|
|
|
|
|
hg backout -r 23 --no-commit
|
|
|
hg commit -m "Backout revision 23"
|
|
|
|
|
|
By default, the pending changeset will have one parent,
|
|
|
maintaining a linear history. With --merge, the pending
|
|
|
changeset will instead have two parents: the old parent of the
|
|
|
working directory and a new child of REV that simply undoes REV.
|
|
|
|
|
|
Before version 1.7, the behavior without --merge was equivalent
|
|
|
to specifying --merge followed by :hg:`update --clean .` to
|
|
|
cancel the merge and leave the child of REV as a head to be
|
|
|
merged separately.
|
|
|
|
|
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
|
|
|
See :hg:`help revert` for a way to restore files to the state
|
|
|
of another revision.
|
|
|
|
|
|
Returns 0 on success, 1 if nothing to backout or there are unresolved
|
|
|
files.
|
|
|
'''
|
|
|
with repo.wlock(), repo.lock():
|
|
|
return _dobackout(ui, repo, node, rev, **opts)
|
|
|
|
|
|
def _dobackout(ui, repo, node=None, rev=None, **opts):
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if opts.get('commit') and opts.get('no_commit'):
|
|
|
raise error.Abort(_("cannot use --commit with --no-commit"))
|
|
|
if opts.get('merge') and opts.get('no_commit'):
|
|
|
raise error.Abort(_("cannot use --merge with --no-commit"))
|
|
|
|
|
|
if rev and node:
|
|
|
raise error.Abort(_("please specify just one revision"))
|
|
|
|
|
|
if not rev:
|
|
|
rev = node
|
|
|
|
|
|
if not rev:
|
|
|
raise error.Abort(_("please specify a revision to backout"))
|
|
|
|
|
|
date = opts.get('date')
|
|
|
if date:
|
|
|
opts['date'] = dateutil.parsedate(date)
|
|
|
|
|
|
cmdutil.checkunfinished(repo)
|
|
|
cmdutil.bailifchanged(repo)
|
|
|
node = scmutil.revsingle(repo, rev).node()
|
|
|
|
|
|
op1, op2 = repo.dirstate.parents()
|
|
|
if not repo.changelog.isancestor(node, op1):
|
|
|
raise error.Abort(_('cannot backout change that is not an ancestor'))
|
|
|
|
|
|
p1, p2 = repo.changelog.parents(node)
|
|
|
if p1 == nullid:
|
|
|
raise error.Abort(_('cannot backout a change with no parents'))
|
|
|
if p2 != nullid:
|
|
|
if not opts.get('parent'):
|
|
|
raise error.Abort(_('cannot backout a merge changeset'))
|
|
|
p = repo.lookup(opts['parent'])
|
|
|
if p not in (p1, p2):
|
|
|
raise error.Abort(_('%s is not a parent of %s') %
|
|
|
(short(p), short(node)))
|
|
|
parent = p
|
|
|
else:
|
|
|
if opts.get('parent'):
|
|
|
raise error.Abort(_('cannot use --parent on non-merge changeset'))
|
|
|
parent = p1
|
|
|
|
|
|
# the backout should appear on the same branch
|
|
|
branch = repo.dirstate.branch()
|
|
|
bheads = repo.branchheads(branch)
|
|
|
rctx = scmutil.revsingle(repo, hex(parent))
|
|
|
if not opts.get('merge') and op1 != node:
|
|
|
with dirstateguard.dirstateguard(repo, 'backout'):
|
|
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
with ui.configoverride(overrides, 'backout'):
|
|
|
stats = mergemod.update(repo, parent, branchmerge=True,
|
|
|
force=True, ancestor=node,
|
|
|
mergeancestor=False)
|
|
|
repo.setparents(op1, op2)
|
|
|
hg._showstats(repo, stats)
|
|
|
if stats.unresolvedcount:
|
|
|
repo.ui.status(_("use 'hg resolve' to retry unresolved "
|
|
|
"file merges\n"))
|
|
|
return 1
|
|
|
else:
|
|
|
hg.clean(repo, node, show_stats=False)
|
|
|
repo.dirstate.setbranch(branch)
|
|
|
cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
|
|
|
|
|
|
if opts.get('no_commit'):
|
|
|
msg = _("changeset %s backed out, "
|
|
|
"don't forget to commit.\n")
|
|
|
ui.status(msg % short(node))
|
|
|
return 0
|
|
|
|
|
|
def commitfunc(ui, repo, message, match, opts):
|
|
|
editform = 'backout'
|
|
|
e = cmdutil.getcommiteditor(editform=editform,
|
|
|
**pycompat.strkwargs(opts))
|
|
|
if not message:
|
|
|
# we don't translate commit messages
|
|
|
message = "Backed out changeset %s" % short(node)
|
|
|
e = cmdutil.getcommiteditor(edit=True, editform=editform)
|
|
|
return repo.commit(message, opts.get('user'), opts.get('date'),
|
|
|
match, editor=e)
|
|
|
newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
|
|
|
if not newnode:
|
|
|
ui.status(_("nothing changed\n"))
|
|
|
return 1
|
|
|
cmdutil.commitstatus(repo, newnode, branch, bheads)
|
|
|
|
|
|
def nice(node):
|
|
|
return '%d:%s' % (repo.changelog.rev(node), short(node))
|
|
|
ui.status(_('changeset %s backs out changeset %s\n') %
|
|
|
(nice(repo.changelog.tip()), nice(node)))
|
|
|
if opts.get('merge') and op1 != node:
|
|
|
hg.clean(repo, op1, show_stats=False)
|
|
|
ui.status(_('merging with changeset %s\n')
|
|
|
% nice(repo.changelog.tip()))
|
|
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
with ui.configoverride(overrides, 'backout'):
|
|
|
return hg.merge(repo, hex(repo.changelog.tip()))
|
|
|
return 0
|
|
|
|
|
|
@command('bisect',
|
|
|
[('r', 'reset', False, _('reset bisect state')),
|
|
|
('g', 'good', False, _('mark changeset good')),
|
|
|
('b', 'bad', False, _('mark changeset bad')),
|
|
|
('s', 'skip', False, _('skip testing changeset')),
|
|
|
('e', 'extend', False, _('extend the bisect range')),
|
|
|
('c', 'command', '', _('use command to check changeset state'), _('CMD')),
|
|
|
('U', 'noupdate', False, _('do not update to target'))],
|
|
|
_("[-gbsr] [-U] [-c CMD] [REV]"),
|
|
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
|
|
|
def bisect(ui, repo, rev=None, extra=None, command=None,
|
|
|
reset=None, good=None, bad=None, skip=None, extend=None,
|
|
|
noupdate=None):
|
|
|
"""subdivision search of changesets
|
|
|
|
|
|
This command helps to find changesets which introduce problems. To
|
|
|
use, mark the earliest changeset you know exhibits the problem as
|
|
|
bad, then mark the latest changeset which is free from the problem
|
|
|
as good. Bisect will update your working directory to a revision
|
|
|
for testing (unless the -U/--noupdate option is specified). Once
|
|
|
you have performed tests, mark the working directory as good or
|
|
|
bad, and bisect will either update to another candidate changeset
|
|
|
or announce that it has found the bad revision.
|
|
|
|
|
|
As a shortcut, you can also use the revision argument to mark a
|
|
|
revision as good or bad without checking it out first.
|
|
|
|
|
|
If you supply a command, it will be used for automatic bisection.
|
|
|
The environment variable HG_NODE will contain the ID of the
|
|
|
changeset being tested. The exit status of the command will be
|
|
|
used to mark revisions as good or bad: status 0 means good, 125
|
|
|
means to skip the revision, 127 (command not found) will abort the
|
|
|
bisection, and any other non-zero exit status means the revision
|
|
|
is bad.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Some examples:
|
|
|
|
|
|
- start a bisection with known bad revision 34, and good revision 12::
|
|
|
|
|
|
hg bisect --bad 34
|
|
|
hg bisect --good 12
|
|
|
|
|
|
- advance the current bisection by marking current revision as good or
|
|
|
bad::
|
|
|
|
|
|
hg bisect --good
|
|
|
hg bisect --bad
|
|
|
|
|
|
- mark the current revision, or a known revision, to be skipped (e.g. if
|
|
|
that revision is not usable because of another issue)::
|
|
|
|
|
|
hg bisect --skip
|
|
|
hg bisect --skip 23
|
|
|
|
|
|
- skip all revisions that do not touch directories ``foo`` or ``bar``::
|
|
|
|
|
|
hg bisect --skip "!( file('path:foo') & file('path:bar') )"
|
|
|
|
|
|
- forget the current bisection::
|
|
|
|
|
|
hg bisect --reset
|
|
|
|
|
|
- use 'make && make tests' to automatically find the first broken
|
|
|
revision::
|
|
|
|
|
|
hg bisect --reset
|
|
|
hg bisect --bad 34
|
|
|
hg bisect --good 12
|
|
|
hg bisect --command "make && make tests"
|
|
|
|
|
|
- see all changesets whose states are already known in the current
|
|
|
bisection::
|
|
|
|
|
|
hg log -r "bisect(pruned)"
|
|
|
|
|
|
- see the changeset currently being bisected (especially useful
|
|
|
if running with -U/--noupdate)::
|
|
|
|
|
|
hg log -r "bisect(current)"
|
|
|
|
|
|
- see all changesets that took part in the current bisection::
|
|
|
|
|
|
hg log -r "bisect(range)"
|
|
|
|
|
|
- you can even get a nice graph::
|
|
|
|
|
|
hg log --graph -r "bisect(range)"
|
|
|
|
|
|
See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
# backward compatibility
|
|
|
if rev in "good bad reset init".split():
|
|
|
ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
|
|
|
cmd, rev, extra = rev, extra, None
|
|
|
if cmd == "good":
|
|
|
good = True
|
|
|
elif cmd == "bad":
|
|
|
bad = True
|
|
|
else:
|
|
|
reset = True
|
|
|
elif extra:
|
|
|
raise error.Abort(_('incompatible arguments'))
|
|
|
|
|
|
incompatibles = {
|
|
|
'--bad': bad,
|
|
|
'--command': bool(command),
|
|
|
'--extend': extend,
|
|
|
'--good': good,
|
|
|
'--reset': reset,
|
|
|
'--skip': skip,
|
|
|
}
|
|
|
|
|
|
enabled = [x for x in incompatibles if incompatibles[x]]
|
|
|
|
|
|
if len(enabled) > 1:
|
|
|
raise error.Abort(_('%s and %s are incompatible') %
|
|
|
tuple(sorted(enabled)[0:2]))
|
|
|
|
|
|
if reset:
|
|
|
hbisect.resetstate(repo)
|
|
|
return
|
|
|
|
|
|
state = hbisect.load_state(repo)
|
|
|
|
|
|
# update state
|
|
|
if good or bad or skip:
|
|
|
if rev:
|
|
|
nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
|
|
|
else:
|
|
|
nodes = [repo.lookup('.')]
|
|
|
if good:
|
|
|
state['good'] += nodes
|
|
|
elif bad:
|
|
|
state['bad'] += nodes
|
|
|
elif skip:
|
|
|
state['skip'] += nodes
|
|
|
hbisect.save_state(repo, state)
|
|
|
if not (state['good'] and state['bad']):
|
|
|
return
|
|
|
|
|
|
def mayupdate(repo, node, show_stats=True):
|
|
|
"""common used update sequence"""
|
|
|
if noupdate:
|
|
|
return
|
|
|
cmdutil.checkunfinished(repo)
|
|
|
cmdutil.bailifchanged(repo)
|
|
|
return hg.clean(repo, node, show_stats=show_stats)
|
|
|
|
|
|
displayer = logcmdutil.changesetdisplayer(ui, repo, {})
|
|
|
|
|
|
if command:
|
|
|
changesets = 1
|
|
|
if noupdate:
|
|
|
try:
|
|
|
node = state['current'][0]
|
|
|
except LookupError:
|
|
|
raise error.Abort(_('current bisect revision is unknown - '
|
|
|
'start a new bisect to fix'))
|
|
|
else:
|
|
|
node, p2 = repo.dirstate.parents()
|
|
|
if p2 != nullid:
|
|
|
raise error.Abort(_('current bisect revision is a merge'))
|
|
|
if rev:
|
|
|
node = repo[scmutil.revsingle(repo, rev, node)].node()
|
|
|
try:
|
|
|
while changesets:
|
|
|
# update state
|
|
|
state['current'] = [node]
|
|
|
hbisect.save_state(repo, state)
|
|
|
status = ui.system(command, environ={'HG_NODE': hex(node)},
|
|
|
blockedtag='bisect_check')
|
|
|
if status == 125:
|
|
|
transition = "skip"
|
|
|
elif status == 0:
|
|
|
transition = "good"
|
|
|
# status < 0 means process was killed
|
|
|
elif status == 127:
|
|
|
raise error.Abort(_("failed to execute %s") % command)
|
|
|
elif status < 0:
|
|
|
raise error.Abort(_("%s killed") % command)
|
|
|
else:
|
|
|
transition = "bad"
|
|
|
state[transition].append(node)
|
|
|
ctx = repo[node]
|
|
|
ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
|
|
|
transition))
|
|
|
hbisect.checkstate(state)
|
|
|
# bisect
|
|
|
nodes, changesets, bgood = hbisect.bisect(repo, state)
|
|
|
# update to next check
|
|
|
node = nodes[0]
|
|
|
mayupdate(repo, node, show_stats=False)
|
|
|
finally:
|
|
|
state['current'] = [node]
|
|
|
hbisect.save_state(repo, state)
|
|
|
hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
|
|
|
return
|
|
|
|
|
|
hbisect.checkstate(state)
|
|
|
|
|
|
# actually bisect
|
|
|
nodes, changesets, good = hbisect.bisect(repo, state)
|
|
|
if extend:
|
|
|
if not changesets:
|
|
|
extendnode = hbisect.extendrange(repo, state, nodes, good)
|
|
|
if extendnode is not None:
|
|
|
ui.write(_("Extending search to changeset %d:%s\n")
|
|
|
% (extendnode.rev(), extendnode))
|
|
|
state['current'] = [extendnode.node()]
|
|
|
hbisect.save_state(repo, state)
|
|
|
return mayupdate(repo, extendnode.node())
|
|
|
raise error.Abort(_("nothing to extend"))
|
|
|
|
|
|
if changesets == 0:
|
|
|
hbisect.printresult(ui, repo, state, displayer, nodes, good)
|
|
|
else:
|
|
|
assert len(nodes) == 1 # only a single node can be tested next
|
|
|
node = nodes[0]
|
|
|
# compute the approximate number of remaining tests
|
|
|
tests, size = 0, 2
|
|
|
while size <= changesets:
|
|
|
tests, size = tests + 1, size * 2
|
|
|
rev = repo.changelog.rev(node)
|
|
|
ui.write(_("Testing changeset %d:%s "
|
|
|
"(%d changesets remaining, ~%d tests)\n")
|
|
|
% (rev, short(node), changesets, tests))
|
|
|
state['current'] = [node]
|
|
|
hbisect.save_state(repo, state)
|
|
|
return mayupdate(repo, node)
|
|
|
|
|
|
@command('bookmarks|bookmark',
|
|
|
[('f', 'force', False, _('force')),
|
|
|
('r', 'rev', '', _('revision for bookmark action'), _('REV')),
|
|
|
('d', 'delete', False, _('delete a given bookmark')),
|
|
|
('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
|
|
|
('i', 'inactive', False, _('mark a bookmark inactive')),
|
|
|
('l', 'list', False, _('list existing bookmarks')),
|
|
|
] + formatteropts,
|
|
|
_('hg bookmarks [OPTIONS]... [NAME]...'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
|
def bookmark(ui, repo, *names, **opts):
|
|
|
'''create a new bookmark or list existing bookmarks
|
|
|
|
|
|
Bookmarks are labels on changesets to help track lines of development.
|
|
|
Bookmarks are unversioned and can be moved, renamed and deleted.
|
|
|
Deleting or moving a bookmark has no effect on the associated changesets.
|
|
|
|
|
|
Creating or updating to a bookmark causes it to be marked as 'active'.
|
|
|
The active bookmark is indicated with a '*'.
|
|
|
When a commit is made, the active bookmark will advance to the new commit.
|
|
|
A plain :hg:`update` will also advance an active bookmark, if possible.
|
|
|
Updating away from a bookmark will cause it to be deactivated.
|
|
|
|
|
|
Bookmarks can be pushed and pulled between repositories (see
|
|
|
:hg:`help push` and :hg:`help pull`). If a shared bookmark has
|
|
|
diverged, a new 'divergent bookmark' of the form 'name@path' will
|
|
|
be created. Using :hg:`merge` will resolve the divergence.
|
|
|
|
|
|
Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
|
|
|
the active bookmark's name.
|
|
|
|
|
|
A bookmark named '@' has the special property that :hg:`clone` will
|
|
|
check it out by default if it exists.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions such as ``{bookmark}``. See also
|
|
|
:hg:`help templates`.
|
|
|
|
|
|
:active: Boolean. True if the bookmark is active.
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- create an active bookmark for a new line of development::
|
|
|
|
|
|
hg book new-feature
|
|
|
|
|
|
- create an inactive bookmark as a place marker::
|
|
|
|
|
|
hg book -i reviewed
|
|
|
|
|
|
- create an inactive bookmark on another changeset::
|
|
|
|
|
|
hg book -r .^ tested
|
|
|
|
|
|
- rename bookmark turkey to dinner::
|
|
|
|
|
|
hg book -m turkey dinner
|
|
|
|
|
|
- move the '@' bookmark from another branch::
|
|
|
|
|
|
hg book -f @
|
|
|
|
|
|
- print only the active bookmark name::
|
|
|
|
|
|
hg book -ql .
|
|
|
'''
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
force = opts.get('force')
|
|
|
rev = opts.get('rev')
|
|
|
inactive = opts.get('inactive') # meaning add/rename to inactive bookmark
|
|
|
|
|
|
selactions = [k for k in ['delete', 'rename', 'list'] if opts.get(k)]
|
|
|
if len(selactions) > 1:
|
|
|
raise error.Abort(_('--%s and --%s are incompatible')
|
|
|
% tuple(selactions[:2]))
|
|
|
if selactions:
|
|
|
action = selactions[0]
|
|
|
elif names or rev:
|
|
|
action = 'add'
|
|
|
elif inactive:
|
|
|
action = 'inactive' # meaning deactivate
|
|
|
else:
|
|
|
action = 'list'
|
|
|
|
|
|
if rev and action in {'delete', 'rename', 'list'}:
|
|
|
raise error.Abort(_("--rev is incompatible with --%s") % action)
|
|
|
if inactive and action in {'delete', 'list'}:
|
|
|
raise error.Abort(_("--inactive is incompatible with --%s") % action)
|
|
|
if not names and action in {'add', 'delete'}:
|
|
|
raise error.Abort(_("bookmark name required"))
|
|
|
|
|
|
if action in {'add', 'delete', 'rename', 'inactive'}:
|
|
|
with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
|
|
|
if action == 'delete':
|
|
|
names = pycompat.maplist(repo._bookmarks.expandname, names)
|
|
|
bookmarks.delete(repo, tr, names)
|
|
|
elif action == 'rename':
|
|
|
if not names:
|
|
|
raise error.Abort(_("new bookmark name required"))
|
|
|
elif len(names) > 1:
|
|
|
raise error.Abort(_("only one new bookmark name allowed"))
|
|
|
oldname = repo._bookmarks.expandname(opts['rename'])
|
|
|
bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
|
|
|
elif action == 'add':
|
|
|
bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
|
|
|
elif action == 'inactive':
|
|
|
if len(repo._bookmarks) == 0:
|
|
|
ui.status(_("no bookmarks set\n"))
|
|
|
elif not repo._activebookmark:
|
|
|
ui.status(_("no active bookmark\n"))
|
|
|
else:
|
|
|
bookmarks.deactivate(repo)
|
|
|
elif action == 'list':
|
|
|
names = pycompat.maplist(repo._bookmarks.expandname, names)
|
|
|
with ui.formatter('bookmarks', opts) as fm:
|
|
|
bookmarks.printbookmarks(ui, repo, fm, names)
|
|
|
else:
|
|
|
raise error.ProgrammingError('invalid action: %s' % action)
|
|
|
|
|
|
@command('branch',
|
|
|
[('f', 'force', None,
|
|
|
_('set branch name even if it shadows an existing branch')),
|
|
|
('C', 'clean', None, _('reset branch name to parent branch name')),
|
|
|
('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
|
|
|
],
|
|
|
_('[-fC] [NAME]'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
|
def branch(ui, repo, label=None, **opts):
|
|
|
"""set or show the current branch name
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
Branch names are permanent and global. Use :hg:`bookmark` to create a
|
|
|
light-weight bookmark instead. See :hg:`help glossary` for more
|
|
|
information about named branches and bookmarks.
|
|
|
|
|
|
With no argument, show the current branch name. With one argument,
|
|
|
set the working directory branch name (the branch will not exist
|
|
|
in the repository until the next commit). Standard practice
|
|
|
recommends that primary development take place on the 'default'
|
|
|
branch.
|
|
|
|
|
|
Unless -f/--force is specified, branch will not let you set a
|
|
|
branch name that already exists.
|
|
|
|
|
|
Use -C/--clean to reset the working directory branch to that of
|
|
|
the parent of the working directory, negating a previous branch
|
|
|
change.
|
|
|
|
|
|
Use the command :hg:`update` to switch to an existing branch. Use
|
|
|
:hg:`commit --close-branch` to mark this branch head as closed.
|
|
|
When all heads of a branch are closed, the branch will be
|
|
|
considered closed.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
revs = opts.get('rev')
|
|
|
if label:
|
|
|
label = label.strip()
|
|
|
|
|
|
if not opts.get('clean') and not label:
|
|
|
if revs:
|
|
|
raise error.Abort(_("no branch name specified for the revisions"))
|
|
|
ui.write("%s\n" % repo.dirstate.branch())
|
|
|
return
|
|
|
|
|
|
with repo.wlock():
|
|
|
if opts.get('clean'):
|
|
|
label = repo[None].p1().branch()
|
|
|
repo.dirstate.setbranch(label)
|
|
|
ui.status(_('reset working directory to branch %s\n') % label)
|
|
|
elif label:
|
|
|
|
|
|
scmutil.checknewlabel(repo, label, 'branch')
|
|
|
if revs:
|
|
|
return cmdutil.changebranch(ui, repo, revs, label)
|
|
|
|
|
|
if not opts.get('force') and label in repo.branchmap():
|
|
|
if label not in [p.branch() for p in repo[None].parents()]:
|
|
|
raise error.Abort(_('a branch of the same name already'
|
|
|
' exists'),
|
|
|
# i18n: "it" refers to an existing branch
|
|
|
hint=_("use 'hg update' to switch to it"))
|
|
|
|
|
|
repo.dirstate.setbranch(label)
|
|
|
ui.status(_('marked working directory as branch %s\n') % label)
|
|
|
|
|
|
# find any open named branches aside from default
|
|
|
others = [n for n, h, t, c in repo.branchmap().iterbranches()
|
|
|
if n != "default" and not c]
|
|
|
if not others:
|
|
|
ui.status(_('(branches are permanent and global, '
|
|
|
'did you want a bookmark?)\n'))
|
|
|
|
|
|
@command('branches',
|
|
|
[('a', 'active', False,
|
|
|
_('show only branches that have unmerged heads (DEPRECATED)')),
|
|
|
('c', 'closed', False, _('show normal and closed branches')),
|
|
|
] + formatteropts,
|
|
|
_('[-c]'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
|
|
|
intents={INTENT_READONLY})
|
|
|
def branches(ui, repo, active=False, closed=False, **opts):
|
|
|
"""list repository named branches
|
|
|
|
|
|
List the repository's named branches, indicating which ones are
|
|
|
inactive. If -c/--closed is specified, also list branches which have
|
|
|
been marked closed (see :hg:`commit --close-branch`).
|
|
|
|
|
|
Use the command :hg:`update` to switch to an existing branch.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions such as ``{branch}``. See also
|
|
|
:hg:`help templates`.
|
|
|
|
|
|
:active: Boolean. True if the branch is active.
|
|
|
:closed: Boolean. True if the branch is closed.
|
|
|
:current: Boolean. True if it is the current branch.
|
|
|
|
|
|
Returns 0.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
ui.pager('branches')
|
|
|
fm = ui.formatter('branches', opts)
|
|
|
hexfunc = fm.hexfunc
|
|
|
|
|
|
allheads = set(repo.heads())
|
|
|
branches = []
|
|
|
for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
|
|
|
isactive = False
|
|
|
if not isclosed:
|
|
|
openheads = set(repo.branchmap().iteropen(heads))
|
|
|
isactive = bool(openheads & allheads)
|
|
|
branches.append((tag, repo[tip], isactive, not isclosed))
|
|
|
branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
|
|
|
reverse=True)
|
|
|
|
|
|
for tag, ctx, isactive, isopen in branches:
|
|
|
if active and not isactive:
|
|
|
continue
|
|
|
if isactive:
|
|
|
label = 'branches.active'
|
|
|
notice = ''
|
|
|
elif not isopen:
|
|
|
if not closed:
|
|
|
continue
|
|
|
label = 'branches.closed'
|
|
|
notice = _(' (closed)')
|
|
|
else:
|
|
|
label = 'branches.inactive'
|
|
|
notice = _(' (inactive)')
|
|
|
current = (tag == repo.dirstate.branch())
|
|
|
if current:
|
|
|
label = 'branches.current'
|
|
|
|
|
|
fm.startitem()
|
|
|
fm.write('branch', '%s', tag, label=label)
|
|
|
rev = ctx.rev()
|
|
|
padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
|
|
|
fmt = ' ' * padsize + ' %d:%s'
|
|
|
fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
|
|
|
label='log.changeset changeset.%s' % ctx.phasestr())
|
|
|
fm.context(ctx=ctx)
|
|
|
fm.data(active=isactive, closed=not isopen, current=current)
|
|
|
if not ui.quiet:
|
|
|
fm.plain(notice)
|
|
|
fm.plain('\n')
|
|
|
fm.end()
|
|
|
|
|
|
@command('bundle',
|
|
|
[('f', 'force', None, _('run even when the destination is unrelated')),
|
|
|
('r', 'rev', [], _('a changeset intended to be added to the destination'),
|
|
|
_('REV')),
|
|
|
('b', 'branch', [], _('a specific branch you would like to bundle'),
|
|
|
_('BRANCH')),
|
|
|
('', 'base', [],
|
|
|
_('a base changeset assumed to be available at the destination'),
|
|
|
_('REV')),
|
|
|
('a', 'all', None, _('bundle all changesets in the repository')),
|
|
|
('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
|
|
|
] + remoteopts,
|
|
|
_('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
|
|
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
|
def bundle(ui, repo, fname, dest=None, **opts):
|
|
|
"""create a bundle file
|
|
|
|
|
|
Generate a bundle file containing data to be transferred to another
|
|
|
repository.
|
|
|
|
|
|
To create a bundle containing all changesets, use -a/--all
|
|
|
(or --base null). Otherwise, hg assumes the destination will have
|
|
|
all the nodes you specify with --base parameters. Otherwise, hg
|
|
|
will assume the repository has all the nodes in destination, or
|
|
|
default-push/default if no destination is specified, where destination
|
|
|
is the repository you provide through DEST option.
|
|
|
|
|
|
You can change bundle format with the -t/--type option. See
|
|
|
:hg:`help bundlespec` for documentation on this format. By default,
|
|
|
the most appropriate format is used and compression defaults to
|
|
|
bzip2.
|
|
|
|
|
|
The bundle file can then be transferred using conventional means
|
|
|
and applied to another repository with the unbundle or pull
|
|
|
command. This is useful when direct push and pull are not
|
|
|
available or when exporting an entire repository is undesirable.
|
|
|
|
|
|
Applying bundles preserves all changeset contents including
|
|
|
permissions, copy/rename information, and revision history.
|
|
|
|
|
|
Returns 0 on success, 1 if no changes found.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
revs = None
|
|
|
if 'rev' in opts:
|
|
|
revstrings = opts['rev']
|
|
|
revs = scmutil.revrange(repo, revstrings)
|
|
|
if revstrings and not revs:
|
|
|
raise error.Abort(_('no commits to bundle'))
|
|
|
|
|
|
bundletype = opts.get('type', 'bzip2').lower()
|
|
|
try:
|
|
|
bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
|
|
|
except error.UnsupportedBundleSpecification as e:
|
|
|
raise error.Abort(pycompat.bytestr(e),
|
|
|
hint=_("see 'hg help bundlespec' for supported "
|
|
|
"values for --type"))
|
|
|
cgversion = bundlespec.contentopts["cg.version"]
|
|
|
|
|
|
# Packed bundles are a pseudo bundle format for now.
|
|
|
if cgversion == 's1':
|
|
|
raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
|
|
|
hint=_("use 'hg debugcreatestreamclonebundle'"))
|
|
|
|
|
|
if opts.get('all'):
|
|
|
if dest:
|
|
|
raise error.Abort(_("--all is incompatible with specifying "
|
|
|
"a destination"))
|
|
|
if opts.get('base'):
|
|
|
ui.warn(_("ignoring --base because --all was specified\n"))
|
|
|
base = [nullrev]
|
|
|
else:
|
|
|
base = scmutil.revrange(repo, opts.get('base'))
|
|
|
if cgversion not in changegroup.supportedoutgoingversions(repo):
|
|
|
raise error.Abort(_("repository does not support bundle version %s") %
|
|
|
cgversion)
|
|
|
|
|
|
if base:
|
|
|
if dest:
|
|
|
raise error.Abort(_("--base is incompatible with specifying "
|
|
|
"a destination"))
|
|
|
common = [repo[rev].node() for rev in base]
|
|
|
heads = [repo[r].node() for r in revs] if revs else None
|
|
|
outgoing = discovery.outgoing(repo, common, heads)
|
|
|
else:
|
|
|
dest = ui.expandpath(dest or 'default-push', dest or 'default')
|
|
|
dest, branches = hg.parseurl(dest, opts.get('branch'))
|
|
|
other = hg.peer(repo, opts, dest)
|
|
|
revs = [repo[r].hex() for r in revs]
|
|
|
revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
|
|
|
heads = revs and pycompat.maplist(repo.lookup, revs) or revs
|
|
|
outgoing = discovery.findcommonoutgoing(repo, other,
|
|
|
onlyheads=heads,
|
|
|
force=opts.get('force'),
|
|
|
portable=True)
|
|
|
|
|
|
if not outgoing.missing:
|
|
|
scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
|
|
|
return 1
|
|
|
|
|
|
if cgversion == '01': #bundle1
|
|
|
bversion = 'HG10' + bundlespec.wirecompression
|
|
|
bcompression = None
|
|
|
elif cgversion in ('02', '03'):
|
|
|
bversion = 'HG20'
|
|
|
bcompression = bundlespec.wirecompression
|
|
|
else:
|
|
|
raise error.ProgrammingError(
|
|
|
'bundle: unexpected changegroup version %s' % cgversion)
|
|
|
|
|
|
# TODO compression options should be derived from bundlespec parsing.
|
|
|
# This is a temporary hack to allow adjusting bundle compression
|
|
|
# level without a) formalizing the bundlespec changes to declare it
|
|
|
# b) introducing a command flag.
|
|
|
compopts = {}
|
|
|
complevel = ui.configint('experimental',
|
|
|
'bundlecomplevel.' + bundlespec.compression)
|
|
|
if complevel is None:
|
|
|
complevel = ui.configint('experimental', 'bundlecomplevel')
|
|
|
if complevel is not None:
|
|
|
compopts['level'] = complevel
|
|
|
|
|
|
# Allow overriding the bundling of obsmarker in phases through
|
|
|
# configuration while we don't have a bundle version that include them
|
|
|
if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
|
|
|
bundlespec.contentopts['obsolescence'] = True
|
|
|
if repo.ui.configbool('experimental', 'bundle-phases'):
|
|
|
bundlespec.contentopts['phases'] = True
|
|
|
|
|
|
bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
|
|
|
bundlespec.contentopts, compression=bcompression,
|
|
|
compopts=compopts)
|
|
|
|
|
|
@command('cat',
|
|
|
[('o', 'output', '',
|
|
|
_('print output to file with formatted name'), _('FORMAT')),
|
|
|
('r', 'rev', '', _('print the given revision'), _('REV')),
|
|
|
('', 'decode', None, _('apply any matching decode filter')),
|
|
|
] + walkopts + formatteropts,
|
|
|
_('[OPTION]... FILE...'),
|
|
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
|
inferrepo=True,
|
|
|
intents={INTENT_READONLY})
|
|
|
def cat(ui, repo, file1, *pats, **opts):
|
|
|
"""output the current or given revision of files
|
|
|
|
|
|
Print the specified files as they were at the given revision. If
|
|
|
no revision is given, the parent of the working directory is used.
|
|
|
|
|
|
Output may be to a file, in which case the name of the file is
|
|
|
given using a template string. See :hg:`help templates`. In addition
|
|
|
to the common template keywords, the following formatting rules are
|
|
|
supported:
|
|
|
|
|
|
:``%%``: literal "%" character
|
|
|
:``%s``: basename of file being printed
|
|
|
:``%d``: dirname of file being printed, or '.' if in repository root
|
|
|
:``%p``: root-relative path name of file being printed
|
|
|
:``%H``: changeset hash (40 hexadecimal digits)
|
|
|
:``%R``: changeset revision number
|
|
|
:``%h``: short-form changeset hash (12 hexadecimal digits)
|
|
|
:``%r``: zero-padded changeset revision number
|
|
|
:``%b``: basename of the exporting repository
|
|
|
:``\\``: literal "\\" character
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions. See also :hg:`help templates`.
|
|
|
|
|
|
:data: String. File content.
|
|
|
:path: String. Repository-absolute path of the file.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
rev = opts.get('rev')
|
|
|
if rev:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
ctx = scmutil.revsingle(repo, rev)
|
|
|
m = scmutil.match(ctx, (file1,) + pats, opts)
|
|
|
fntemplate = opts.pop('output', '')
|
|
|
if cmdutil.isstdiofilename(fntemplate):
|
|
|
fntemplate = ''
|
|
|
|
|
|
if fntemplate:
|
|
|
fm = formatter.nullformatter(ui, 'cat', opts)
|
|
|
else:
|
|
|
ui.pager('cat')
|
|
|
fm = ui.formatter('cat', opts)
|
|
|
with fm:
|
|
|
return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
|
|
|
**pycompat.strkwargs(opts))
|
|
|
|
|
|
@command('clone',
|
|
|
[('U', 'noupdate', None, _('the clone will include an empty working '
|
|
|
'directory (only a repository)')),
|
|
|
('u', 'updaterev', '', _('revision, tag, or branch to check out'),
|
|
|
_('REV')),
|
|
|
('r', 'rev', [], _('do not clone everything, but include this changeset'
|
|
|
' and its ancestors'), _('REV')),
|
|
|
('b', 'branch', [], _('do not clone everything, but include this branch\'s'
|
|
|
' changesets and their ancestors'), _('BRANCH')),
|
|
|
('', 'pull', None, _('use pull protocol to copy metadata')),
|
|
|
('', 'uncompressed', None,
|
|
|
_('an alias to --stream (DEPRECATED)')),
|
|
|
('', 'stream', None,
|
|
|
_('clone with minimal data processing')),
|
|
|
] + remoteopts,
|
|
|
_('[OPTION]... SOURCE [DEST]'),
|
|
|
helpcategory=command.CATEGORY_REPO_CREATION,
|
|
|
helpbasic=True, norepo=True)
|
|
|
def clone(ui, source, dest=None, **opts):
|
|
|
"""make a copy of an existing repository
|
|
|
|
|
|
Create a copy of an existing repository in a new directory.
|
|
|
|
|
|
If no destination directory name is specified, it defaults to the
|
|
|
basename of the source.
|
|
|
|
|
|
The location of the source is added to the new repository's
|
|
|
``.hg/hgrc`` file, as the default to be used for future pulls.
|
|
|
|
|
|
Only local paths and ``ssh://`` URLs are supported as
|
|
|
destinations. For ``ssh://`` destinations, no working directory or
|
|
|
``.hg/hgrc`` will be created on the remote side.
|
|
|
|
|
|
If the source repository has a bookmark called '@' set, that
|
|
|
revision will be checked out in the new repository by default.
|
|
|
|
|
|
To check out a particular version, use -u/--update, or
|
|
|
-U/--noupdate to create a clone with no working directory.
|
|
|
|
|
|
To pull only a subset of changesets, specify one or more revisions
|
|
|
identifiers with -r/--rev or branches with -b/--branch. The
|
|
|
resulting clone will contain only the specified changesets and
|
|
|
their ancestors. These options (or 'clone src#rev dest') imply
|
|
|
--pull, even for local source repositories.
|
|
|
|
|
|
In normal clone mode, the remote normalizes repository data into a common
|
|
|
exchange format and the receiving end translates this data into its local
|
|
|
storage format. --stream activates a different clone mode that essentially
|
|
|
copies repository files from the remote with minimal data processing. This
|
|
|
significantly reduces the CPU cost of a clone both remotely and locally.
|
|
|
However, it often increases the transferred data size by 30-40%. This can
|
|
|
result in substantially faster clones where I/O throughput is plentiful,
|
|
|
especially for larger repositories. A side-effect of --stream clones is
|
|
|
that storage settings and requirements on the remote are applied locally:
|
|
|
a modern client may inherit legacy or inefficient storage used by the
|
|
|
remote or a legacy Mercurial client may not be able to clone from a
|
|
|
modern Mercurial remote.
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
Specifying a tag will include the tagged changeset but not the
|
|
|
changeset containing the tag.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
For efficiency, hardlinks are used for cloning whenever the
|
|
|
source and destination are on the same filesystem (note this
|
|
|
applies only to the repository data, not to the working
|
|
|
directory). Some filesystems, such as AFS, implement hardlinking
|
|
|
incorrectly, but do not report errors. In these cases, use the
|
|
|
--pull option to avoid hardlinking.
|
|
|
|
|
|
Mercurial will update the working directory to the first applicable
|
|
|
revision from this list:
|
|
|
|
|
|
a) null if -U or the source repository has no changesets
|
|
|
b) if -u . and the source repository is local, the first parent of
|
|
|
the source repository's working directory
|
|
|
c) the changeset specified with -u (if a branch name, this means the
|
|
|
latest head of that branch)
|
|
|
d) the changeset specified with -r
|
|
|
e) the tipmost head specified with -b
|
|
|
f) the tipmost head specified with the url#branch source syntax
|
|
|
g) the revision marked with the '@' bookmark, if present
|
|
|
h) the tipmost head of the default branch
|
|
|
i) tip
|
|
|
|
|
|
When cloning from servers that support it, Mercurial may fetch
|
|
|
pre-generated data from a server-advertised URL or inline from the
|
|
|
same stream. When this is done, hooks operating on incoming changesets
|
|
|
and changegroups may fire more than once, once for each pre-generated
|
|
|
bundle and as well as for any additional remaining data. In addition,
|
|
|
if an error occurs, the repository may be rolled back to a partial
|
|
|
clone. This behavior may change in future releases.
|
|
|
See :hg:`help -e clonebundles` for more.
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- clone a remote repository to a new directory named hg/::
|
|
|
|
|
|
hg clone https://www.mercurial-scm.org/repo/hg/
|
|
|
|
|
|
- create a lightweight local clone::
|
|
|
|
|
|
hg clone project/ project-feature/
|
|
|
|
|
|
- clone from an absolute path on an ssh server (note double-slash)::
|
|
|
|
|
|
hg clone ssh://user@server//home/projects/alpha/
|
|
|
|
|
|
- do a streaming clone while checking out a specified version::
|
|
|
|
|
|
hg clone --stream http://server/repo -u 1.5
|
|
|
|
|
|
- create a repository without changesets after a particular revision::
|
|
|
|
|
|
hg clone -r 04e544 experimental/ good/
|
|
|
|
|
|
- clone (and track) a particular named branch::
|
|
|
|
|
|
hg clone https://www.mercurial-scm.org/repo/hg/#stable
|
|
|
|
|
|
See :hg:`help urls` for details on specifying URLs.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if opts.get('noupdate') and opts.get('updaterev'):
|
|
|
raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
|
|
|
|
|
|
# --include/--exclude can come from narrow or sparse.
|
|
|
includepats, excludepats = None, None
|
|
|
|
|
|
# hg.clone() differentiates between None and an empty set. So make sure
|
|
|
# patterns are sets if narrow is requested without patterns.
|
|
|
if opts.get('narrow'):
|
|
|
includepats = set()
|
|
|
excludepats = set()
|
|
|
|
|
|
if opts.get('include'):
|
|
|
includepats = narrowspec.parsepatterns(opts.get('include'))
|
|
|
if opts.get('exclude'):
|
|
|
excludepats = narrowspec.parsepatterns(opts.get('exclude'))
|
|
|
|
|
|
r = hg.clone(ui, opts, source, dest,
|
|
|
pull=opts.get('pull'),
|
|
|
stream=opts.get('stream') or opts.get('uncompressed'),
|
|
|
revs=opts.get('rev'),
|
|
|
update=opts.get('updaterev') or not opts.get('noupdate'),
|
|
|
branch=opts.get('branch'),
|
|
|
shareopts=opts.get('shareopts'),
|
|
|
storeincludepats=includepats,
|
|
|
storeexcludepats=excludepats,
|
|
|
depth=opts.get('depth') or None)
|
|
|
|
|
|
return r is None
|
|
|
|
|
|
@command('commit|ci',
|
|
|
[('A', 'addremove', None,
|
|
|
_('mark new/missing files as added/removed before committing')),
|
|
|
('', 'close-branch', None,
|
|
|
_('mark a branch head as closed')),
|
|
|
('', 'amend', None, _('amend the parent of the working directory')),
|
|
|
('s', 'secret', None, _('use the secret phase for committing')),
|
|
|
('e', 'edit', None, _('invoke editor on commit messages')),
|
|
|
('i', 'interactive', None, _('use interactive mode')),
|
|
|
] + walkopts + commitopts + commitopts2 + subrepoopts,
|
|
|
_('[OPTION]... [FILE]...'),
|
|
|
helpcategory=command.CATEGORY_COMMITTING, helpbasic=True,
|
|
|
inferrepo=True)
|
|
|
def commit(ui, repo, *pats, **opts):
|
|
|
"""commit the specified files or all outstanding changes
|
|
|
|
|
|
Commit changes to the given files into the repository. Unlike a
|
|
|
centralized SCM, this operation is a local operation. See
|
|
|
:hg:`push` for a way to actively distribute your changes.
|
|
|
|
|
|
If a list of files is omitted, all changes reported by :hg:`status`
|
|
|
will be committed.
|
|
|
|
|
|
If you are committing the result of a merge, do not provide any
|
|
|
filenames or -I/-X filters.
|
|
|
|
|
|
If no commit message is specified, Mercurial starts your
|
|
|
configured editor where you can enter a message. In case your
|
|
|
commit fails, you will find a backup of your message in
|
|
|
``.hg/last-message.txt``.
|
|
|
|
|
|
The --close-branch flag can be used to mark the current branch
|
|
|
head closed. When all heads of a branch are closed, the branch
|
|
|
will be considered closed and no longer listed.
|
|
|
|
|
|
The --amend flag can be used to amend the parent of the
|
|
|
working directory with a new commit that contains the changes
|
|
|
in the parent in addition to those currently reported by :hg:`status`,
|
|
|
if there are any. The old commit is stored in a backup bundle in
|
|
|
``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
|
|
|
on how to restore it).
|
|
|
|
|
|
Message, user and date are taken from the amended commit unless
|
|
|
specified. When a message isn't specified on the command line,
|
|
|
the editor will open with the message of the amended commit.
|
|
|
|
|
|
It is not possible to amend public changesets (see :hg:`help phases`)
|
|
|
or changesets that have children.
|
|
|
|
|
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
|
|
|
Returns 0 on success, 1 if nothing changed.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- commit all files ending in .py::
|
|
|
|
|
|
hg commit --include "set:**.py"
|
|
|
|
|
|
- commit all non-binary files::
|
|
|
|
|
|
hg commit --exclude "set:binary()"
|
|
|
|
|
|
- amend the current commit and set the date to now::
|
|
|
|
|
|
hg commit --amend --date now
|
|
|
"""
|
|
|
with repo.wlock(), repo.lock():
|
|
|
return _docommit(ui, repo, *pats, **opts)
|
|
|
|
|
|
def _docommit(ui, repo, *pats, **opts):
|
|
|
if opts.get(r'interactive'):
|
|
|
opts.pop(r'interactive')
|
|
|
ret = cmdutil.dorecord(ui, repo, commit, None, False,
|
|
|
cmdutil.recordfilter, *pats,
|
|
|
**opts)
|
|
|
# ret can be 0 (no changes to record) or the value returned by
|
|
|
# commit(), 1 if nothing changed or None on success.
|
|
|
return 1 if ret == 0 else ret
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if opts.get('subrepos'):
|
|
|
if opts.get('amend'):
|
|
|
raise error.Abort(_('cannot amend with --subrepos'))
|
|
|
# Let --subrepos on the command line override config setting.
|
|
|
ui.setconfig('ui', 'commitsubrepos', True, 'commit')
|
|
|
|
|
|
cmdutil.checkunfinished(repo, commit=True)
|
|
|
|
|
|
branch = repo[None].branch()
|
|
|
bheads = repo.branchheads(branch)
|
|
|
|
|
|
extra = {}
|
|
|
if opts.get('close_branch'):
|
|
|
extra['close'] = '1'
|
|
|
|
|
|
if not bheads:
|
|
|
raise error.Abort(_('can only close branch heads'))
|
|
|
elif opts.get('amend'):
|
|
|
if repo[None].parents()[0].p1().branch() != branch and \
|
|
|
repo[None].parents()[0].p2().branch() != branch:
|
|
|
raise error.Abort(_('can only close branch heads'))
|
|
|
|
|
|
if opts.get('amend'):
|
|
|
if ui.configbool('ui', 'commitsubrepos'):
|
|
|
raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
|
|
|
|
|
|
old = repo['.']
|
|
|
rewriteutil.precheck(repo, [old.rev()], 'amend')
|
|
|
|
|
|
# Currently histedit gets confused if an amend happens while histedit
|
|
|
# is in progress. Since we have a checkunfinished command, we are
|
|
|
# temporarily honoring it.
|
|
|
#
|
|
|
# Note: eventually this guard will be removed. Please do not expect
|
|
|
# this behavior to remain.
|
|
|
if not obsolete.isenabled(repo, obsolete.createmarkersopt):
|
|
|
cmdutil.checkunfinished(repo)
|
|
|
|
|
|
node = cmdutil.amend(ui, repo, old, extra, pats, opts)
|
|
|
if node == old.node():
|
|
|
ui.status(_("nothing changed\n"))
|
|
|
return 1
|
|
|
else:
|
|
|
def commitfunc(ui, repo, message, match, opts):
|
|
|
overrides = {}
|
|
|
if opts.get('secret'):
|
|
|
overrides[('phases', 'new-commit')] = 'secret'
|
|
|
|
|
|
baseui = repo.baseui
|
|
|
with baseui.configoverride(overrides, 'commit'):
|
|
|
with ui.configoverride(overrides, 'commit'):
|
|
|
editform = cmdutil.mergeeditform(repo[None],
|
|
|
'commit.normal')
|
|
|
editor = cmdutil.getcommiteditor(
|
|
|
editform=editform, **pycompat.strkwargs(opts))
|
|
|
return repo.commit(message,
|
|
|
opts.get('user'),
|
|
|
opts.get('date'),
|
|
|
match,
|
|
|
editor=editor,
|
|
|
extra=extra)
|
|
|
|
|
|
node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
|
|
|
|
|
|
if not node:
|
|
|
stat = cmdutil.postcommitstatus(repo, pats, opts)
|
|
|
if stat[3]:
|
|
|
ui.status(_("nothing changed (%d missing files, see "
|
|
|
"'hg status')\n") % len(stat[3]))
|
|
|
else:
|
|
|
ui.status(_("nothing changed\n"))
|
|
|
return 1
|
|
|
|
|
|
cmdutil.commitstatus(repo, node, branch, bheads, opts)
|
|
|
|
|
|
@command('config|showconfig|debugconfig',
|
|
|
[('u', 'untrusted', None, _('show untrusted configuration options')),
|
|
|
('e', 'edit', None, _('edit user config')),
|
|
|
('l', 'local', None, _('edit repository config')),
|
|
|
('g', 'global', None, _('edit global config'))] + formatteropts,
|
|
|
_('[-u] [NAME]...'),
|
|
|
helpcategory=command.CATEGORY_HELP,
|
|
|
optionalrepo=True,
|
|
|
intents={INTENT_READONLY})
|
|
|
def config(ui, repo, *values, **opts):
|
|
|
"""show combined config settings from all hgrc files
|
|
|
|
|
|
With no arguments, print names and values of all config items.
|
|
|
|
|
|
With one argument of the form section.name, print just the value
|
|
|
of that config item.
|
|
|
|
|
|
With multiple arguments, print names and values of all config
|
|
|
items with matching section names or section.names.
|
|
|
|
|
|
With --edit, start an editor on the user-level config file. With
|
|
|
--global, edit the system-wide config file. With --local, edit the
|
|
|
repository-level config file.
|
|
|
|
|
|
With --debug, the source (filename and line number) is printed
|
|
|
for each config item.
|
|
|
|
|
|
See :hg:`help config` for more information about config files.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported. See also :hg:`help templates`.
|
|
|
|
|
|
:name: String. Config name.
|
|
|
:source: String. Filename and line number where the item is defined.
|
|
|
:value: String. Config value.
|
|
|
|
|
|
Returns 0 on success, 1 if NAME does not exist.
|
|
|
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if opts.get('edit') or opts.get('local') or opts.get('global'):
|
|
|
if opts.get('local') and opts.get('global'):
|
|
|
raise error.Abort(_("can't use --local and --global together"))
|
|
|
|
|
|
if opts.get('local'):
|
|
|
if not repo:
|
|
|
raise error.Abort(_("can't use --local outside a repository"))
|
|
|
paths = [repo.vfs.join('hgrc')]
|
|
|
elif opts.get('global'):
|
|
|
paths = rcutil.systemrcpath()
|
|
|
else:
|
|
|
paths = rcutil.userrcpath()
|
|
|
|
|
|
for f in paths:
|
|
|
if os.path.exists(f):
|
|
|
break
|
|
|
else:
|
|
|
if opts.get('global'):
|
|
|
samplehgrc = uimod.samplehgrcs['global']
|
|
|
elif opts.get('local'):
|
|
|
samplehgrc = uimod.samplehgrcs['local']
|
|
|
else:
|
|
|
samplehgrc = uimod.samplehgrcs['user']
|
|
|
|
|
|
f = paths[0]
|
|
|
fp = open(f, "wb")
|
|
|
fp.write(util.tonativeeol(samplehgrc))
|
|
|
fp.close()
|
|
|
|
|
|
editor = ui.geteditor()
|
|
|
ui.system("%s \"%s\"" % (editor, f),
|
|
|
onerr=error.Abort, errprefix=_("edit failed"),
|
|
|
blockedtag='config_edit')
|
|
|
return
|
|
|
ui.pager('config')
|
|
|
fm = ui.formatter('config', opts)
|
|
|
for t, f in rcutil.rccomponents():
|
|
|
if t == 'path':
|
|
|
ui.debug('read config from: %s\n' % f)
|
|
|
elif t == 'items':
|
|
|
for section, name, value, source in f:
|
|
|
ui.debug('set config by: %s\n' % source)
|
|
|
else:
|
|
|
raise error.ProgrammingError('unknown rctype: %s' % t)
|
|
|
untrusted = bool(opts.get('untrusted'))
|
|
|
|
|
|
selsections = selentries = []
|
|
|
if values:
|
|
|
selsections = [v for v in values if '.' not in v]
|
|
|
selentries = [v for v in values if '.' in v]
|
|
|
uniquesel = (len(selentries) == 1 and not selsections)
|
|
|
selsections = set(selsections)
|
|
|
selentries = set(selentries)
|
|
|
|
|
|
matched = False
|
|
|
for section, name, value in ui.walkconfig(untrusted=untrusted):
|
|
|
source = ui.configsource(section, name, untrusted)
|
|
|
value = pycompat.bytestr(value)
|
|
|
if fm.isplain():
|
|
|
source = source or 'none'
|
|
|
value = value.replace('\n', '\\n')
|
|
|
entryname = section + '.' + name
|
|
|
if values and not (section in selsections or entryname in selentries):
|
|
|
continue
|
|
|
fm.startitem()
|
|
|
fm.condwrite(ui.debugflag, 'source', '%s: ', source)
|
|
|
if uniquesel:
|
|
|
fm.data(name=entryname)
|
|
|
fm.write('value', '%s\n', value)
|
|
|
else:
|
|
|
fm.write('name value', '%s=%s\n', entryname, value)
|
|
|
matched = True
|
|
|
fm.end()
|
|
|
if matched:
|
|
|
return 0
|
|
|
return 1
|
|
|
|
|
|
@command('copy|cp',
|
|
|
[('A', 'after', None, _('record a copy that has already occurred')),
|
|
|
('f', 'force', None, _('forcibly copy over an existing managed file')),
|
|
|
] + walkopts + dryrunopts,
|
|
|
_('[OPTION]... [SOURCE]... DEST'),
|
|
|
helpcategory=command.CATEGORY_FILE_CONTENTS)
|
|
|
def copy(ui, repo, *pats, **opts):
|
|
|
"""mark files as copied for the next commit
|
|
|
|
|
|
Mark dest as having copies of source files. If dest is a
|
|
|
directory, copies are put in that directory. If dest is a file,
|
|
|
the source must be a single file.
|
|
|
|
|
|
By default, this command copies the contents of files as they
|
|
|
exist in the working directory. If invoked with -A/--after, the
|
|
|
operation is recorded, but no copying is performed.
|
|
|
|
|
|
This command takes effect with the next commit. To undo a copy
|
|
|
before that, see :hg:`revert`.
|
|
|
|
|
|
Returns 0 on success, 1 if errors are encountered.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
with repo.wlock(False):
|
|
|
return cmdutil.copy(ui, repo, pats, opts)
|
|
|
|
|
|
@command(
|
|
|
'debugcommands', [], _('[COMMAND]'),
|
|
|
helpcategory=command.CATEGORY_HELP,
|
|
|
norepo=True)
|
|
|
def debugcommands(ui, cmd='', *args):
|
|
|
"""list all available commands and options"""
|
|
|
for cmd, vals in sorted(table.iteritems()):
|
|
|
cmd = cmd.split('|')[0]
|
|
|
opts = ', '.join([i[1] for i in vals[1]])
|
|
|
ui.write('%s: %s\n' % (cmd, opts))
|
|
|
|
|
|
@command('debugcomplete',
|
|
|
[('o', 'options', None, _('show the command options'))],
|
|
|
_('[-o] CMD'),
|
|
|
helpcategory=command.CATEGORY_HELP,
|
|
|
norepo=True)
|
|
|
def debugcomplete(ui, cmd='', **opts):
|
|
|
"""returns the completion list associated with the given command"""
|
|
|
|
|
|
if opts.get(r'options'):
|
|
|
options = []
|
|
|
otables = [globalopts]
|
|
|
if cmd:
|
|
|
aliases, entry = cmdutil.findcmd(cmd, table, False)
|
|
|
otables.append(entry[1])
|
|
|
for t in otables:
|
|
|
for o in t:
|
|
|
if "(DEPRECATED)" in o[3]:
|
|
|
continue
|
|
|
if o[0]:
|
|
|
options.append('-%s' % o[0])
|
|
|
options.append('--%s' % o[1])
|
|
|
ui.write("%s\n" % "\n".join(options))
|
|
|
return
|
|
|
|
|
|
cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
|
|
|
if ui.verbose:
|
|
|
cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
|
|
|
ui.write("%s\n" % "\n".join(sorted(cmdlist)))
|
|
|
|
|
|
@command('diff',
|
|
|
[('r', 'rev', [], _('revision'), _('REV')),
|
|
|
('c', 'change', '', _('change made by revision'), _('REV'))
|
|
|
] + diffopts + diffopts2 + walkopts + subrepoopts,
|
|
|
_('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
|
|
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
|
helpbasic=True, inferrepo=True, intents={INTENT_READONLY})
|
|
|
def diff(ui, repo, *pats, **opts):
|
|
|
"""diff repository (or selected files)
|
|
|
|
|
|
Show differences between revisions for the specified files.
|
|
|
|
|
|
Differences between files are shown using the unified diff format.
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
:hg:`diff` may generate unexpected results for merges, as it will
|
|
|
default to comparing against the working directory's first
|
|
|
parent changeset if no revisions are specified.
|
|
|
|
|
|
When two revision arguments are given, then changes are shown
|
|
|
between those revisions. If only one revision is specified then
|
|
|
that revision is compared to the working directory, and, when no
|
|
|
revisions are specified, the working directory files are compared
|
|
|
to its first parent.
|
|
|
|
|
|
Alternatively you can specify -c/--change with a revision to see
|
|
|
the changes in that changeset relative to its first parent.
|
|
|
|
|
|
Without the -a/--text option, diff will avoid generating diffs of
|
|
|
files it detects as binary. With -a, diff will generate a diff
|
|
|
anyway, probably with undesirable results.
|
|
|
|
|
|
Use the -g/--git option to generate diffs in the git extended diff
|
|
|
format. For more information, read :hg:`help diffs`.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- compare a file in the current working directory to its parent::
|
|
|
|
|
|
hg diff foo.c
|
|
|
|
|
|
- compare two historical versions of a directory, with rename info::
|
|
|
|
|
|
hg diff --git -r 1.0:1.2 lib/
|
|
|
|
|
|
- get change stats relative to the last change on some date::
|
|
|
|
|
|
hg diff --stat -r "date('may 2')"
|
|
|
|
|
|
- diff all newly-added files that contain a keyword::
|
|
|
|
|
|
hg diff "set:added() and grep(GNU)"
|
|
|
|
|
|
- compare a revision and its parents::
|
|
|
|
|
|
hg diff -c 9353 # compare against first parent
|
|
|
hg diff -r 9353^:9353 # same using revset syntax
|
|
|
hg diff -r 9353^2:9353 # compare against the second parent
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
revs = opts.get('rev')
|
|
|
change = opts.get('change')
|
|
|
stat = opts.get('stat')
|
|
|
reverse = opts.get('reverse')
|
|
|
|
|
|
if revs and change:
|
|
|
msg = _('cannot specify --rev and --change at the same time')
|
|
|
raise error.Abort(msg)
|
|
|
elif change:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
|
|
|
ctx2 = scmutil.revsingle(repo, change, None)
|
|
|
ctx1 = ctx2.p1()
|
|
|
else:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
|
|
|
ctx1, ctx2 = scmutil.revpair(repo, revs)
|
|
|
node1, node2 = ctx1.node(), ctx2.node()
|
|
|
|
|
|
if reverse:
|
|
|
node1, node2 = node2, node1
|
|
|
|
|
|
diffopts = patch.diffallopts(ui, opts)
|
|
|
m = scmutil.match(ctx2, pats, opts)
|
|
|
m = repo.narrowmatch(m)
|
|
|
ui.pager('diff')
|
|
|
logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
|
|
|
listsubrepos=opts.get('subrepos'),
|
|
|
root=opts.get('root'))
|
|
|
|
|
|
@command('export',
|
|
|
[('B', 'bookmark', '',
|
|
|
_('export changes only reachable by given bookmark'), _('BOOKMARK')),
|
|
|
('o', 'output', '',
|
|
|
_('print output to file with formatted name'), _('FORMAT')),
|
|
|
('', 'switch-parent', None, _('diff against the second parent')),
|
|
|
('r', 'rev', [], _('revisions to export'), _('REV')),
|
|
|
] + diffopts + formatteropts,
|
|
|
_('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
|
|
|
helpcategory=command.CATEGORY_IMPORT_EXPORT,
|
|
|
helpbasic=True, intents={INTENT_READONLY})
|
|
|
def export(ui, repo, *changesets, **opts):
|
|
|
"""dump the header and diffs for one or more changesets
|
|
|
|
|
|
Print the changeset header and diffs for one or more revisions.
|
|
|
If no revision is given, the parent of the working directory is used.
|
|
|
|
|
|
The information shown in the changeset header is: author, date,
|
|
|
branch name (if non-default), changeset hash, parent(s) and commit
|
|
|
comment.
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
:hg:`export` may generate unexpected diff output for merge
|
|
|
changesets, as it will compare the merge changeset against its
|
|
|
first parent only.
|
|
|
|
|
|
Output may be to a file, in which case the name of the file is
|
|
|
given using a template string. See :hg:`help templates`. In addition
|
|
|
to the common template keywords, the following formatting rules are
|
|
|
supported:
|
|
|
|
|
|
:``%%``: literal "%" character
|
|
|
:``%H``: changeset hash (40 hexadecimal digits)
|
|
|
:``%N``: number of patches being generated
|
|
|
:``%R``: changeset revision number
|
|
|
:``%b``: basename of the exporting repository
|
|
|
:``%h``: short-form changeset hash (12 hexadecimal digits)
|
|
|
:``%m``: first line of the commit message (only alphanumeric characters)
|
|
|
:``%n``: zero-padded sequence number, starting at 1
|
|
|
:``%r``: zero-padded changeset revision number
|
|
|
:``\\``: literal "\\" character
|
|
|
|
|
|
Without the -a/--text option, export will avoid generating diffs
|
|
|
of files it detects as binary. With -a, export will generate a
|
|
|
diff anyway, probably with undesirable results.
|
|
|
|
|
|
With -B/--bookmark changesets reachable by the given bookmark are
|
|
|
selected.
|
|
|
|
|
|
Use the -g/--git option to generate diffs in the git extended diff
|
|
|
format. See :hg:`help diffs` for more information.
|
|
|
|
|
|
With the --switch-parent option, the diff will be against the
|
|
|
second parent. It can be useful to review a merge.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions. See also :hg:`help templates`.
|
|
|
|
|
|
:diff: String. Diff content.
|
|
|
:parents: List of strings. Parent nodes of the changeset.
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- use export and import to transplant a bugfix to the current
|
|
|
branch::
|
|
|
|
|
|
hg export -r 9353 | hg import -
|
|
|
|
|
|
- export all the changesets between two revisions to a file with
|
|
|
rename information::
|
|
|
|
|
|
hg export --git -r 123:150 > changes.txt
|
|
|
|
|
|
- split outgoing changes into a series of patches with
|
|
|
descriptive names::
|
|
|
|
|
|
hg export -r "outgoing()" -o "%n-%m.patch"
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
bookmark = opts.get('bookmark')
|
|
|
changesets += tuple(opts.get('rev', []))
|
|
|
|
|
|
if bookmark and changesets:
|
|
|
raise error.Abort(_("-r and -B are mutually exclusive"))
|
|
|
|
|
|
if bookmark:
|
|
|
if bookmark not in repo._bookmarks:
|
|
|
raise error.Abort(_("bookmark '%s' not found") % bookmark)
|
|
|
|
|
|
revs = scmutil.bookmarkrevs(repo, bookmark)
|
|
|
else:
|
|
|
if not changesets:
|
|
|
changesets = ['.']
|
|
|
|
|
|
repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
|
|
|
revs = scmutil.revrange(repo, changesets)
|
|
|
|
|
|
if not revs:
|
|
|
raise error.Abort(_("export requires at least one changeset"))
|
|
|
if len(revs) > 1:
|
|
|
ui.note(_('exporting patches:\n'))
|
|
|
else:
|
|
|
ui.note(_('exporting patch:\n'))
|
|
|
|
|
|
fntemplate = opts.get('output')
|
|
|
if cmdutil.isstdiofilename(fntemplate):
|
|
|
fntemplate = ''
|
|
|
|
|
|
if fntemplate:
|
|
|
fm = formatter.nullformatter(ui, 'export', opts)
|
|
|
else:
|
|
|
ui.pager('export')
|
|
|
fm = ui.formatter('export', opts)
|
|
|
with fm:
|
|
|
cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
|
|
|
switch_parent=opts.get('switch_parent'),
|
|
|
opts=patch.diffallopts(ui, opts))
|
|
|
|
|
|
@command('files',
|
|
|
[('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
|
|
|
('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
|
|
|
] + walkopts + formatteropts + subrepoopts,
|
|
|
_('[OPTION]... [FILE]...'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
intents={INTENT_READONLY})
|
|
|
def files(ui, repo, *pats, **opts):
|
|
|
"""list tracked files
|
|
|
|
|
|
Print files under Mercurial control in the working directory or
|
|
|
specified revision for given files (excluding removed files).
|
|
|
Files can be specified as filenames or filesets.
|
|
|
|
|
|
If no files are given to match, this command prints the names
|
|
|
of all files under Mercurial control.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions. See also :hg:`help templates`.
|
|
|
|
|
|
:flags: String. Character denoting file's symlink and executable bits.
|
|
|
:path: String. Repository-absolute path of the file.
|
|
|
:size: Integer. Size of the file in bytes.
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- list all files under the current directory::
|
|
|
|
|
|
hg files .
|
|
|
|
|
|
- shows sizes and flags for current revision::
|
|
|
|
|
|
hg files -vr .
|
|
|
|
|
|
- list all files named README::
|
|
|
|
|
|
hg files -I "**/README"
|
|
|
|
|
|
- list all binary files::
|
|
|
|
|
|
hg files "set:binary()"
|
|
|
|
|
|
- find files containing a regular expression::
|
|
|
|
|
|
hg files "set:grep('bob')"
|
|
|
|
|
|
- search tracked file contents with xargs and grep::
|
|
|
|
|
|
hg files -0 | xargs -0 grep foo
|
|
|
|
|
|
See :hg:`help patterns` and :hg:`help filesets` for more information
|
|
|
on specifying file patterns.
|
|
|
|
|
|
Returns 0 if a match is found, 1 otherwise.
|
|
|
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
rev = opts.get('rev')
|
|
|
if rev:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
ctx = scmutil.revsingle(repo, rev, None)
|
|
|
|
|
|
end = '\n'
|
|
|
if opts.get('print0'):
|
|
|
end = '\0'
|
|
|
fmt = '%s' + end
|
|
|
|
|
|
m = scmutil.match(ctx, pats, opts)
|
|
|
ui.pager('files')
|
|
|
with ui.formatter('files', opts) as fm:
|
|
|
return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
|
|
|
|
|
|
@command(
|
|
|
'forget',
|
|
|
[('i', 'interactive', None, _('use interactive mode')),
|
|
|
] + walkopts + dryrunopts,
|
|
|
_('[OPTION]... FILE...'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
helpbasic=True, inferrepo=True)
|
|
|
def forget(ui, repo, *pats, **opts):
|
|
|
"""forget the specified files on the next commit
|
|
|
|
|
|
Mark the specified files so they will no longer be tracked
|
|
|
after the next commit.
|
|
|
|
|
|
This only removes files from the current branch, not from the
|
|
|
entire project history, and it does not delete them from the
|
|
|
working directory.
|
|
|
|
|
|
To delete the file from the working directory, see :hg:`remove`.
|
|
|
|
|
|
To undo a forget before the next commit, see :hg:`add`.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- forget newly-added binary files::
|
|
|
|
|
|
hg forget "set:added() and binary()"
|
|
|
|
|
|
- forget files that would be excluded by .hgignore::
|
|
|
|
|
|
hg forget "set:hgignore()"
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if not pats:
|
|
|
raise error.Abort(_('no files specified'))
|
|
|
|
|
|
m = scmutil.match(repo[None], pats, opts)
|
|
|
dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
|
|
|
rejected = cmdutil.forget(ui, repo, m, prefix="",
|
|
|
explicitonly=False, dryrun=dryrun,
|
|
|
interactive=interactive)[0]
|
|
|
return rejected and 1 or 0
|
|
|
|
|
|
@command(
|
|
|
'graft',
|
|
|
[('r', 'rev', [], _('revisions to graft'), _('REV')),
|
|
|
('', 'base', '',
|
|
|
_('base revision when doing the graft merge (ADVANCED)'), _('REV')),
|
|
|
('c', 'continue', False, _('resume interrupted graft')),
|
|
|
('', 'stop', False, _('stop interrupted graft')),
|
|
|
('', 'abort', False, _('abort interrupted graft')),
|
|
|
('e', 'edit', False, _('invoke editor on commit messages')),
|
|
|
('', 'log', None, _('append graft info to log message')),
|
|
|
('', 'no-commit', None,
|
|
|
_("don't commit, just apply the changes in working directory")),
|
|
|
('f', 'force', False, _('force graft')),
|
|
|
('D', 'currentdate', False,
|
|
|
_('record the current date as commit date')),
|
|
|
('U', 'currentuser', False,
|
|
|
_('record the current user as committer'))]
|
|
|
+ commitopts2 + mergetoolopts + dryrunopts,
|
|
|
_('[OPTION]... [-r REV]... REV...'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
|
|
|
def graft(ui, repo, *revs, **opts):
|
|
|
'''copy changes from other branches onto the current branch
|
|
|
|
|
|
This command uses Mercurial's merge logic to copy individual
|
|
|
changes from other branches without merging branches in the
|
|
|
history graph. This is sometimes known as 'backporting' or
|
|
|
'cherry-picking'. By default, graft will copy user, date, and
|
|
|
description from the source changesets.
|
|
|
|
|
|
Changesets that are ancestors of the current revision, that have
|
|
|
already been grafted, or that are merges will be skipped.
|
|
|
|
|
|
If --log is specified, log messages will have a comment appended
|
|
|
of the form::
|
|
|
|
|
|
(grafted from CHANGESETHASH)
|
|
|
|
|
|
If --force is specified, revisions will be grafted even if they
|
|
|
are already ancestors of, or have been grafted to, the destination.
|
|
|
This is useful when the revisions have since been backed out.
|
|
|
|
|
|
If a graft merge results in conflicts, the graft process is
|
|
|
interrupted so that the current merge can be manually resolved.
|
|
|
Once all conflicts are addressed, the graft process can be
|
|
|
continued with the -c/--continue option.
|
|
|
|
|
|
The -c/--continue option reapplies all the earlier options.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
The --base option exposes more of how graft internally uses merge with a
|
|
|
custom base revision. --base can be used to specify another ancestor than
|
|
|
the first and only parent.
|
|
|
|
|
|
The command::
|
|
|
|
|
|
hg graft -r 345 --base 234
|
|
|
|
|
|
is thus pretty much the same as::
|
|
|
|
|
|
hg diff -r 234 -r 345 | hg import
|
|
|
|
|
|
but using merge to resolve conflicts and track moved files.
|
|
|
|
|
|
The result of a merge can thus be backported as a single commit by
|
|
|
specifying one of the merge parents as base, and thus effectively
|
|
|
grafting the changes from the other side.
|
|
|
|
|
|
It is also possible to collapse multiple changesets and clean up history
|
|
|
by specifying another ancestor as base, much like rebase --collapse
|
|
|
--keep.
|
|
|
|
|
|
The commit message can be tweaked after the fact using commit --amend .
|
|
|
|
|
|
For using non-ancestors as the base to backout changes, see the backout
|
|
|
command and the hidden --parent option.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- copy a single change to the stable branch and edit its description::
|
|
|
|
|
|
hg update stable
|
|
|
hg graft --edit 9393
|
|
|
|
|
|
- graft a range of changesets with one exception, updating dates::
|
|
|
|
|
|
hg graft -D "2085::2093 and not 2091"
|
|
|
|
|
|
- continue a graft after resolving conflicts::
|
|
|
|
|
|
hg graft -c
|
|
|
|
|
|
- show the source of a grafted changeset::
|
|
|
|
|
|
hg log --debug -r .
|
|
|
|
|
|
- show revisions sorted by date::
|
|
|
|
|
|
hg log -r "sort(all(), date)"
|
|
|
|
|
|
- backport the result of a merge as a single commit::
|
|
|
|
|
|
hg graft -r 123 --base 123^
|
|
|
|
|
|
- land a feature branch as one changeset::
|
|
|
|
|
|
hg up -cr default
|
|
|
hg graft -r featureX --base "ancestor('featureX', 'default')"
|
|
|
|
|
|
See :hg:`help revisions` for more about specifying revisions.
|
|
|
|
|
|
Returns 0 on successful completion.
|
|
|
'''
|
|
|
with repo.wlock():
|
|
|
return _dograft(ui, repo, *revs, **opts)
|
|
|
|
|
|
def _dograft(ui, repo, *revs, **opts):
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if revs and opts.get('rev'):
|
|
|
ui.warn(_('warning: inconsistent use of --rev might give unexpected '
|
|
|
'revision ordering!\n'))
|
|
|
|
|
|
revs = list(revs)
|
|
|
revs.extend(opts.get('rev'))
|
|
|
basectx = None
|
|
|
if opts.get('base'):
|
|
|
basectx = scmutil.revsingle(repo, opts['base'], None)
|
|
|
# a dict of data to be stored in state file
|
|
|
statedata = {}
|
|
|
# list of new nodes created by ongoing graft
|
|
|
statedata['newnodes'] = []
|
|
|
|
|
|
if not opts.get('user') and opts.get('currentuser'):
|
|
|
opts['user'] = ui.username()
|
|
|
if not opts.get('date') and opts.get('currentdate'):
|
|
|
opts['date'] = "%d %d" % dateutil.makedate()
|
|
|
|
|
|
editor = cmdutil.getcommiteditor(editform='graft',
|
|
|
**pycompat.strkwargs(opts))
|
|
|
|
|
|
cont = False
|
|
|
if opts.get('no_commit'):
|
|
|
if opts.get('edit'):
|
|
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
|
"--edit together"))
|
|
|
if opts.get('currentuser'):
|
|
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
|
"--currentuser together"))
|
|
|
if opts.get('currentdate'):
|
|
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
|
"--currentdate together"))
|
|
|
if opts.get('log'):
|
|
|
raise error.Abort(_("cannot specify --no-commit and "
|
|
|
"--log together"))
|
|
|
|
|
|
graftstate = statemod.cmdstate(repo, 'graftstate')
|
|
|
|
|
|
if opts.get('stop'):
|
|
|
if opts.get('continue'):
|
|
|
raise error.Abort(_("cannot use '--continue' and "
|
|
|
"'--stop' together"))
|
|
|
if opts.get('abort'):
|
|
|
raise error.Abort(_("cannot use '--abort' and '--stop' together"))
|
|
|
|
|
|
if any((opts.get('edit'), opts.get('log'), opts.get('user'),
|
|
|
opts.get('date'), opts.get('currentdate'),
|
|
|
opts.get('currentuser'), opts.get('rev'))):
|
|
|
raise error.Abort(_("cannot specify any other flag with '--stop'"))
|
|
|
return _stopgraft(ui, repo, graftstate)
|
|
|
elif opts.get('abort'):
|
|
|
if opts.get('continue'):
|
|
|
raise error.Abort(_("cannot use '--continue' and "
|
|
|
"'--abort' together"))
|
|
|
if any((opts.get('edit'), opts.get('log'), opts.get('user'),
|
|
|
opts.get('date'), opts.get('currentdate'),
|
|
|
opts.get('currentuser'), opts.get('rev'))):
|
|
|
raise error.Abort(_("cannot specify any other flag with '--abort'"))
|
|
|
|
|
|
return _abortgraft(ui, repo, graftstate)
|
|
|
elif opts.get('continue'):
|
|
|
cont = True
|
|
|
if revs:
|
|
|
raise error.Abort(_("can't specify --continue and revisions"))
|
|
|
# read in unfinished revisions
|
|
|
if graftstate.exists():
|
|
|
statedata = _readgraftstate(repo, graftstate)
|
|
|
if statedata.get('date'):
|
|
|
opts['date'] = statedata['date']
|
|
|
if statedata.get('user'):
|
|
|
opts['user'] = statedata['user']
|
|
|
if statedata.get('log'):
|
|
|
opts['log'] = True
|
|
|
if statedata.get('no_commit'):
|
|
|
opts['no_commit'] = statedata.get('no_commit')
|
|
|
nodes = statedata['nodes']
|
|
|
revs = [repo[node].rev() for node in nodes]
|
|
|
else:
|
|
|
cmdutil.wrongtooltocontinue(repo, _('graft'))
|
|
|
else:
|
|
|
if not revs:
|
|
|
raise error.Abort(_('no revisions specified'))
|
|
|
cmdutil.checkunfinished(repo)
|
|
|
cmdutil.bailifchanged(repo)
|
|
|
revs = scmutil.revrange(repo, revs)
|
|
|
|
|
|
skipped = set()
|
|
|
if basectx is None:
|
|
|
# check for merges
|
|
|
for rev in repo.revs('%ld and merge()', revs):
|
|
|
ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
|
|
|
skipped.add(rev)
|
|
|
revs = [r for r in revs if r not in skipped]
|
|
|
if not revs:
|
|
|
return -1
|
|
|
if basectx is not None and len(revs) != 1:
|
|
|
raise error.Abort(_('only one revision allowed with --base '))
|
|
|
|
|
|
# Don't check in the --continue case, in effect retaining --force across
|
|
|
# --continues. That's because without --force, any revisions we decided to
|
|
|
# skip would have been filtered out here, so they wouldn't have made their
|
|
|
# way to the graftstate. With --force, any revisions we would have otherwise
|
|
|
# skipped would not have been filtered out, and if they hadn't been applied
|
|
|
# already, they'd have been in the graftstate.
|
|
|
if not (cont or opts.get('force')) and basectx is None:
|
|
|
# check for ancestors of dest branch
|
|
|
crev = repo['.'].rev()
|
|
|
ancestors = repo.changelog.ancestors([crev], inclusive=True)
|
|
|
# XXX make this lazy in the future
|
|
|
# don't mutate while iterating, create a copy
|
|
|
for rev in list(revs):
|
|
|
if rev in ancestors:
|
|
|
ui.warn(_('skipping ancestor revision %d:%s\n') %
|
|
|
(rev, repo[rev]))
|
|
|
# XXX remove on list is slow
|
|
|
revs.remove(rev)
|
|
|
if not revs:
|
|
|
return -1
|
|
|
|
|
|
# analyze revs for earlier grafts
|
|
|
ids = {}
|
|
|
for ctx in repo.set("%ld", revs):
|
|
|
ids[ctx.hex()] = ctx.rev()
|
|
|
n = ctx.extra().get('source')
|
|
|
if n:
|
|
|
ids[n] = ctx.rev()
|
|
|
|
|
|
# check ancestors for earlier grafts
|
|
|
ui.debug('scanning for duplicate grafts\n')
|
|
|
|
|
|
# The only changesets we can be sure doesn't contain grafts of any
|
|
|
# revs, are the ones that are common ancestors of *all* revs:
|
|
|
for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
|
|
|
ctx = repo[rev]
|
|
|
n = ctx.extra().get('source')
|
|
|
if n in ids:
|
|
|
try:
|
|
|
r = repo[n].rev()
|
|
|
except error.RepoLookupError:
|
|
|
r = None
|
|
|
if r in revs:
|
|
|
ui.warn(_('skipping revision %d:%s '
|
|
|
'(already grafted to %d:%s)\n')
|
|
|
% (r, repo[r], rev, ctx))
|
|
|
revs.remove(r)
|
|
|
elif ids[n] in revs:
|
|
|
if r is None:
|
|
|
ui.warn(_('skipping already grafted revision %d:%s '
|
|
|
'(%d:%s also has unknown origin %s)\n')
|
|
|
% (ids[n], repo[ids[n]], rev, ctx, n[:12]))
|
|
|
else:
|
|
|
ui.warn(_('skipping already grafted revision %d:%s '
|
|
|
'(%d:%s also has origin %d:%s)\n')
|
|
|
% (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
|
|
|
revs.remove(ids[n])
|
|
|
elif ctx.hex() in ids:
|
|
|
r = ids[ctx.hex()]
|
|
|
if r in revs:
|
|
|
ui.warn(_('skipping already grafted revision %d:%s '
|
|
|
'(was grafted from %d:%s)\n') %
|
|
|
(r, repo[r], rev, ctx))
|
|
|
revs.remove(r)
|
|
|
if not revs:
|
|
|
return -1
|
|
|
|
|
|
if opts.get('no_commit'):
|
|
|
statedata['no_commit'] = True
|
|
|
for pos, ctx in enumerate(repo.set("%ld", revs)):
|
|
|
desc = '%d:%s "%s"' % (ctx.rev(), ctx,
|
|
|
ctx.description().split('\n', 1)[0])
|
|
|
names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
|
|
|
if names:
|
|
|
desc += ' (%s)' % ' '.join(names)
|
|
|
ui.status(_('grafting %s\n') % desc)
|
|
|
if opts.get('dry_run'):
|
|
|
continue
|
|
|
|
|
|
source = ctx.extra().get('source')
|
|
|
extra = {}
|
|
|
if source:
|
|
|
extra['source'] = source
|
|
|
extra['intermediate-source'] = ctx.hex()
|
|
|
else:
|
|
|
extra['source'] = ctx.hex()
|
|
|
user = ctx.user()
|
|
|
if opts.get('user'):
|
|
|
user = opts['user']
|
|
|
statedata['user'] = user
|
|
|
date = ctx.date()
|
|
|
if opts.get('date'):
|
|
|
date = opts['date']
|
|
|
statedata['date'] = date
|
|
|
message = ctx.description()
|
|
|
if opts.get('log'):
|
|
|
message += '\n(grafted from %s)' % ctx.hex()
|
|
|
statedata['log'] = True
|
|
|
|
|
|
# we don't merge the first commit when continuing
|
|
|
if not cont:
|
|
|
# perform the graft merge with p1(rev) as 'ancestor'
|
|
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
base = ctx.p1() if basectx is None else basectx
|
|
|
with ui.configoverride(overrides, 'graft'):
|
|
|
stats = mergemod.graft(repo, ctx, base, ['local', 'graft'])
|
|
|
# report any conflicts
|
|
|
if stats.unresolvedcount > 0:
|
|
|
# write out state for --continue
|
|
|
nodes = [repo[rev].hex() for rev in revs[pos:]]
|
|
|
statedata['nodes'] = nodes
|
|
|
stateversion = 1
|
|
|
graftstate.save(stateversion, statedata)
|
|
|
hint = _("use 'hg resolve' and 'hg graft --continue'")
|
|
|
raise error.Abort(
|
|
|
_("unresolved conflicts, can't continue"),
|
|
|
hint=hint)
|
|
|
else:
|
|
|
cont = False
|
|
|
|
|
|
# commit if --no-commit is false
|
|
|
if not opts.get('no_commit'):
|
|
|
node = repo.commit(text=message, user=user, date=date, extra=extra,
|
|
|
editor=editor)
|
|
|
if node is None:
|
|
|
ui.warn(
|
|
|
_('note: graft of %d:%s created no changes to commit\n') %
|
|
|
(ctx.rev(), ctx))
|
|
|
# checking that newnodes exist because old state files won't have it
|
|
|
elif statedata.get('newnodes') is not None:
|
|
|
statedata['newnodes'].append(node)
|
|
|
|
|
|
# remove state when we complete successfully
|
|
|
if not opts.get('dry_run'):
|
|
|
graftstate.delete()
|
|
|
|
|
|
return 0
|
|
|
|
|
|
def _abortgraft(ui, repo, graftstate):
|
|
|
"""abort the interrupted graft and rollbacks to the state before interrupted
|
|
|
graft"""
|
|
|
if not graftstate.exists():
|
|
|
raise error.Abort(_("no interrupted graft to abort"))
|
|
|
statedata = _readgraftstate(repo, graftstate)
|
|
|
newnodes = statedata.get('newnodes')
|
|
|
if newnodes is None:
|
|
|
# and old graft state which does not have all the data required to abort
|
|
|
# the graft
|
|
|
raise error.Abort(_("cannot abort using an old graftstate"))
|
|
|
|
|
|
# changeset from which graft operation was started
|
|
|
startctx = None
|
|
|
if len(newnodes) > 0:
|
|
|
startctx = repo[newnodes[0]].p1()
|
|
|
else:
|
|
|
startctx = repo['.']
|
|
|
# whether to strip or not
|
|
|
cleanup = False
|
|
|
if newnodes:
|
|
|
newnodes = [repo[r].rev() for r in newnodes]
|
|
|
cleanup = True
|
|
|
# checking that none of the newnodes turned public or is public
|
|
|
immutable = [c for c in newnodes if not repo[c].mutable()]
|
|
|
if immutable:
|
|
|
repo.ui.warn(_("cannot clean up public changesets %s\n")
|
|
|
% ', '.join(bytes(repo[r]) for r in immutable),
|
|
|
hint=_("see 'hg help phases' for details"))
|
|
|
cleanup = False
|
|
|
|
|
|
# checking that no new nodes are created on top of grafted revs
|
|
|
desc = set(repo.changelog.descendants(newnodes))
|
|
|
if desc - set(newnodes):
|
|
|
repo.ui.warn(_("new changesets detected on destination "
|
|
|
"branch, can't strip\n"))
|
|
|
cleanup = False
|
|
|
|
|
|
if cleanup:
|
|
|
with repo.wlock(), repo.lock():
|
|
|
hg.updaterepo(repo, startctx.node(), overwrite=True)
|
|
|
# stripping the new nodes created
|
|
|
strippoints = [c.node() for c in repo.set("roots(%ld)",
|
|
|
newnodes)]
|
|
|
repair.strip(repo.ui, repo, strippoints, backup=False)
|
|
|
|
|
|
if not cleanup:
|
|
|
# we don't update to the startnode if we can't strip
|
|
|
startctx = repo['.']
|
|
|
hg.updaterepo(repo, startctx.node(), overwrite=True)
|
|
|
|
|
|
ui.status(_("graft aborted\n"))
|
|
|
ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
|
|
|
graftstate.delete()
|
|
|
return 0
|
|
|
|
|
|
def _readgraftstate(repo, graftstate):
|
|
|
"""read the graft state file and return a dict of the data stored in it"""
|
|
|
try:
|
|
|
return graftstate.read()
|
|
|
except error.CorruptedState:
|
|
|
nodes = repo.vfs.read('graftstate').splitlines()
|
|
|
return {'nodes': nodes}
|
|
|
|
|
|
def _stopgraft(ui, repo, graftstate):
|
|
|
"""stop the interrupted graft"""
|
|
|
if not graftstate.exists():
|
|
|
raise error.Abort(_("no interrupted graft found"))
|
|
|
pctx = repo['.']
|
|
|
hg.updaterepo(repo, pctx.node(), overwrite=True)
|
|
|
graftstate.delete()
|
|
|
ui.status(_("stopped the interrupted graft\n"))
|
|
|
ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
|
|
|
return 0
|
|
|
|
|
|
@command('grep',
|
|
|
[('0', 'print0', None, _('end fields with NUL')),
|
|
|
('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
|
|
|
('', 'diff', None, _('print all revisions when the term was introduced '
|
|
|
'or removed')),
|
|
|
('a', 'text', None, _('treat all files as text')),
|
|
|
('f', 'follow', None,
|
|
|
_('follow changeset history,'
|
|
|
' or file history across copies and renames')),
|
|
|
('i', 'ignore-case', None, _('ignore case when matching')),
|
|
|
('l', 'files-with-matches', None,
|
|
|
_('print only filenames and revisions that match')),
|
|
|
('n', 'line-number', None, _('print matching line numbers')),
|
|
|
('r', 'rev', [],
|
|
|
_('only search files changed within revision range'), _('REV')),
|
|
|
('', 'all-files', None,
|
|
|
_('include all files in the changeset while grepping (EXPERIMENTAL)')),
|
|
|
('u', 'user', None, _('list the author (long with -v)')),
|
|
|
('d', 'date', None, _('list the date (short with -q)')),
|
|
|
] + formatteropts + walkopts,
|
|
|
_('[OPTION]... PATTERN [FILE]...'),
|
|
|
helpcategory=command.CATEGORY_FILE_CONTENTS,
|
|
|
inferrepo=True,
|
|
|
intents={INTENT_READONLY})
|
|
|
def grep(ui, repo, pattern, *pats, **opts):
|
|
|
"""search revision history for a pattern in specified files
|
|
|
|
|
|
Search revision history for a regular expression in the specified
|
|
|
files or the entire project.
|
|
|
|
|
|
By default, grep prints the most recent revision number for each
|
|
|
file in which it finds a match. To get it to print every revision
|
|
|
that contains a change in match status ("-" for a match that becomes
|
|
|
a non-match, or "+" for a non-match that becomes a match), use the
|
|
|
--diff flag.
|
|
|
|
|
|
PATTERN can be any Python (roughly Perl-compatible) regular
|
|
|
expression.
|
|
|
|
|
|
If no FILEs are specified (and -f/--follow isn't set), all files in
|
|
|
the repository are searched, including those that don't exist in the
|
|
|
current branch or have been deleted in a prior changeset.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions. See also :hg:`help templates`.
|
|
|
|
|
|
:change: String. Character denoting insertion ``+`` or removal ``-``.
|
|
|
Available if ``--diff`` is specified.
|
|
|
:lineno: Integer. Line number of the match.
|
|
|
:path: String. Repository-absolute path of the file.
|
|
|
:texts: List of text chunks.
|
|
|
|
|
|
And each entry of ``{texts}`` provides the following sub-keywords.
|
|
|
|
|
|
:matched: Boolean. True if the chunk matches the specified pattern.
|
|
|
:text: String. Chunk content.
|
|
|
|
|
|
See :hg:`help templates.operators` for the list expansion syntax.
|
|
|
|
|
|
Returns 0 if a match is found, 1 otherwise.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
diff = opts.get('all') or opts.get('diff')
|
|
|
all_files = opts.get('all_files')
|
|
|
if diff and opts.get('all_files'):
|
|
|
raise error.Abort(_('--diff and --all-files are mutually exclusive'))
|
|
|
# TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working
|
|
|
if opts.get('all_files') is None and not opts.get('rev') and not diff:
|
|
|
# experimental config: commands.grep.all-files
|
|
|
opts['all_files'] = ui.configbool('commands', 'grep.all-files')
|
|
|
plaingrep = opts.get('all_files') and not opts.get('rev')
|
|
|
if plaingrep:
|
|
|
opts['rev'] = ['wdir()']
|
|
|
|
|
|
reflags = re.M
|
|
|
if opts.get('ignore_case'):
|
|
|
reflags |= re.I
|
|
|
try:
|
|
|
regexp = util.re.compile(pattern, reflags)
|
|
|
except re.error as inst:
|
|
|
ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
|
|
|
return 1
|
|
|
sep, eol = ':', '\n'
|
|
|
if opts.get('print0'):
|
|
|
sep = eol = '\0'
|
|
|
|
|
|
getfile = util.lrucachefunc(repo.file)
|
|
|
|
|
|
def matchlines(body):
|
|
|
begin = 0
|
|
|
linenum = 0
|
|
|
while begin < len(body):
|
|
|
match = regexp.search(body, begin)
|
|
|
if not match:
|
|
|
break
|
|
|
mstart, mend = match.span()
|
|
|
linenum += body.count('\n', begin, mstart) + 1
|
|
|
lstart = body.rfind('\n', begin, mstart) + 1 or begin
|
|
|
begin = body.find('\n', mend) + 1 or len(body) + 1
|
|
|
lend = begin - 1
|
|
|
yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
|
|
|
|
|
|
class linestate(object):
|
|
|
def __init__(self, line, linenum, colstart, colend):
|
|
|
self.line = line
|
|
|
self.linenum = linenum
|
|
|
self.colstart = colstart
|
|
|
self.colend = colend
|
|
|
|
|
|
def __hash__(self):
|
|
|
return hash((self.linenum, self.line))
|
|
|
|
|
|
def __eq__(self, other):
|
|
|
return self.line == other.line
|
|
|
|
|
|
def findpos(self):
|
|
|
"""Iterate all (start, end) indices of matches"""
|
|
|
yield self.colstart, self.colend
|
|
|
p = self.colend
|
|
|
while p < len(self.line):
|
|
|
m = regexp.search(self.line, p)
|
|
|
if not m:
|
|
|
break
|
|
|
yield m.span()
|
|
|
p = m.end()
|
|
|
|
|
|
matches = {}
|
|
|
copies = {}
|
|
|
def grepbody(fn, rev, body):
|
|
|
matches[rev].setdefault(fn, [])
|
|
|
m = matches[rev][fn]
|
|
|
for lnum, cstart, cend, line in matchlines(body):
|
|
|
s = linestate(line, lnum, cstart, cend)
|
|
|
m.append(s)
|
|
|
|
|
|
def difflinestates(a, b):
|
|
|
sm = difflib.SequenceMatcher(None, a, b)
|
|
|
for tag, alo, ahi, blo, bhi in sm.get_opcodes():
|
|
|
if tag == r'insert':
|
|
|
for i in pycompat.xrange(blo, bhi):
|
|
|
yield ('+', b[i])
|
|
|
elif tag == r'delete':
|
|
|
for i in pycompat.xrange(alo, ahi):
|
|
|
yield ('-', a[i])
|
|
|
elif tag == r'replace':
|
|
|
for i in pycompat.xrange(alo, ahi):
|
|
|
yield ('-', a[i])
|
|
|
for i in pycompat.xrange(blo, bhi):
|
|
|
yield ('+', b[i])
|
|
|
|
|
|
def display(fm, fn, ctx, pstates, states):
|
|
|
rev = scmutil.intrev(ctx)
|
|
|
if fm.isplain():
|
|
|
formatuser = ui.shortuser
|
|
|
else:
|
|
|
formatuser = pycompat.bytestr
|
|
|
if ui.quiet:
|
|
|
datefmt = '%Y-%m-%d'
|
|
|
else:
|
|
|
datefmt = '%a %b %d %H:%M:%S %Y %1%2'
|
|
|
found = False
|
|
|
@util.cachefunc
|
|
|
def binary():
|
|
|
flog = getfile(fn)
|
|
|
try:
|
|
|
return stringutil.binary(flog.read(ctx.filenode(fn)))
|
|
|
except error.WdirUnsupported:
|
|
|
return ctx[fn].isbinary()
|
|
|
|
|
|
fieldnamemap = {'filename': 'path', 'linenumber': 'lineno'}
|
|
|
if diff:
|
|
|
iter = difflinestates(pstates, states)
|
|
|
else:
|
|
|
iter = [('', l) for l in states]
|
|
|
for change, l in iter:
|
|
|
fm.startitem()
|
|
|
fm.context(ctx=ctx)
|
|
|
fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
|
|
|
|
|
|
cols = [
|
|
|
('filename', '%s', fn, True),
|
|
|
('rev', '%d', rev, not plaingrep),
|
|
|
('linenumber', '%d', l.linenum, opts.get('line_number')),
|
|
|
]
|
|
|
if diff:
|
|
|
cols.append(('change', '%s', change, True))
|
|
|
cols.extend([
|
|
|
('user', '%s', formatuser(ctx.user()), opts.get('user')),
|
|
|
('date', '%s', fm.formatdate(ctx.date(), datefmt),
|
|
|
opts.get('date')),
|
|
|
])
|
|
|
lastcol = next(
|
|
|
name for name, fmt, data, cond in reversed(cols) if cond)
|
|
|
for name, fmt, data, cond in cols:
|
|
|
field = fieldnamemap.get(name, name)
|
|
|
fm.condwrite(cond, field, fmt, data, label='grep.%s' % name)
|
|
|
if cond and name != lastcol:
|
|
|
fm.plain(sep, label='grep.sep')
|
|
|
if not opts.get('files_with_matches'):
|
|
|
fm.plain(sep, label='grep.sep')
|
|
|
if not opts.get('text') and binary():
|
|
|
fm.plain(_(" Binary file matches"))
|
|
|
else:
|
|
|
displaymatches(fm.nested('texts', tmpl='{text}'), l)
|
|
|
fm.plain(eol)
|
|
|
found = True
|
|
|
if opts.get('files_with_matches'):
|
|
|
break
|
|
|
return found
|
|
|
|
|
|
def displaymatches(fm, l):
|
|
|
p = 0
|
|
|
for s, e in l.findpos():
|
|
|
if p < s:
|
|
|
fm.startitem()
|
|
|
fm.write('text', '%s', l.line[p:s])
|
|
|
fm.data(matched=False)
|
|
|
fm.startitem()
|
|
|
fm.write('text', '%s', l.line[s:e], label='grep.match')
|
|
|
fm.data(matched=True)
|
|
|
p = e
|
|
|
if p < len(l.line):
|
|
|
fm.startitem()
|
|
|
fm.write('text', '%s', l.line[p:])
|
|
|
fm.data(matched=False)
|
|
|
fm.end()
|
|
|
|
|
|
skip = {}
|
|
|
revfiles = {}
|
|
|
match = scmutil.match(repo[None], pats, opts)
|
|
|
found = False
|
|
|
follow = opts.get('follow')
|
|
|
|
|
|
def prep(ctx, fns):
|
|
|
rev = ctx.rev()
|
|
|
pctx = ctx.p1()
|
|
|
parent = pctx.rev()
|
|
|
matches.setdefault(rev, {})
|
|
|
matches.setdefault(parent, {})
|
|
|
files = revfiles.setdefault(rev, [])
|
|
|
for fn in fns:
|
|
|
flog = getfile(fn)
|
|
|
try:
|
|
|
fnode = ctx.filenode(fn)
|
|
|
except error.LookupError:
|
|
|
continue
|
|
|
try:
|
|
|
copied = flog.renamed(fnode)
|
|
|
except error.WdirUnsupported:
|
|
|
copied = ctx[fn].renamed()
|
|
|
copy = follow and copied and copied[0]
|
|
|
if copy:
|
|
|
copies.setdefault(rev, {})[fn] = copy
|
|
|
if fn in skip:
|
|
|
if copy:
|
|
|
skip[copy] = True
|
|
|
continue
|
|
|
files.append(fn)
|
|
|
|
|
|
if fn not in matches[rev]:
|
|
|
try:
|
|
|
content = flog.read(fnode)
|
|
|
except error.WdirUnsupported:
|
|
|
content = ctx[fn].data()
|
|
|
grepbody(fn, rev, content)
|
|
|
|
|
|
pfn = copy or fn
|
|
|
if pfn not in matches[parent]:
|
|
|
try:
|
|
|
fnode = pctx.filenode(pfn)
|
|
|
grepbody(pfn, parent, flog.read(fnode))
|
|
|
except error.LookupError:
|
|
|
pass
|
|
|
|
|
|
ui.pager('grep')
|
|
|
fm = ui.formatter('grep', opts)
|
|
|
for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
|
|
|
rev = ctx.rev()
|
|
|
parent = ctx.p1().rev()
|
|
|
for fn in sorted(revfiles.get(rev, [])):
|
|
|
states = matches[rev][fn]
|
|
|
copy = copies.get(rev, {}).get(fn)
|
|
|
if fn in skip:
|
|
|
if copy:
|
|
|
skip[copy] = True
|
|
|
continue
|
|
|
pstates = matches.get(parent, {}).get(copy or fn, [])
|
|
|
if pstates or states:
|
|
|
r = display(fm, fn, ctx, pstates, states)
|
|
|
found = found or r
|
|
|
if r and not diff and not all_files:
|
|
|
skip[fn] = True
|
|
|
if copy:
|
|
|
skip[copy] = True
|
|
|
del revfiles[rev]
|
|
|
# We will keep the matches dict for the duration of the window
|
|
|
# clear the matches dict once the window is over
|
|
|
if not revfiles:
|
|
|
matches.clear()
|
|
|
fm.end()
|
|
|
|
|
|
return not found
|
|
|
|
|
|
@command('heads',
|
|
|
[('r', 'rev', '',
|
|
|
_('show only heads which are descendants of STARTREV'), _('STARTREV')),
|
|
|
('t', 'topo', False, _('show topological heads only')),
|
|
|
('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
|
|
|
('c', 'closed', False, _('show normal and closed branch heads')),
|
|
|
] + templateopts,
|
|
|
_('[-ct] [-r STARTREV] [REV]...'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
|
intents={INTENT_READONLY})
|
|
|
def heads(ui, repo, *branchrevs, **opts):
|
|
|
"""show branch heads
|
|
|
|
|
|
With no arguments, show all open branch heads in the repository.
|
|
|
Branch heads are changesets that have no descendants on the
|
|
|
same branch. They are where development generally takes place and
|
|
|
are the usual targets for update and merge operations.
|
|
|
|
|
|
If one or more REVs are given, only open branch heads on the
|
|
|
branches associated with the specified changesets are shown. This
|
|
|
means that you can use :hg:`heads .` to see the heads on the
|
|
|
currently checked-out branch.
|
|
|
|
|
|
If -c/--closed is specified, also show branch heads marked closed
|
|
|
(see :hg:`commit --close-branch`).
|
|
|
|
|
|
If STARTREV is specified, only those heads that are descendants of
|
|
|
STARTREV will be displayed.
|
|
|
|
|
|
If -t/--topo is specified, named branch mechanics will be ignored and only
|
|
|
topological heads (changesets with no children) will be shown.
|
|
|
|
|
|
Returns 0 if matching heads are found, 1 if not.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
start = None
|
|
|
rev = opts.get('rev')
|
|
|
if rev:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
start = scmutil.revsingle(repo, rev, None).node()
|
|
|
|
|
|
if opts.get('topo'):
|
|
|
heads = [repo[h] for h in repo.heads(start)]
|
|
|
else:
|
|
|
heads = []
|
|
|
for branch in repo.branchmap():
|
|
|
heads += repo.branchheads(branch, start, opts.get('closed'))
|
|
|
heads = [repo[h] for h in heads]
|
|
|
|
|
|
if branchrevs:
|
|
|
branches = set(repo[r].branch()
|
|
|
for r in scmutil.revrange(repo, branchrevs))
|
|
|
heads = [h for h in heads if h.branch() in branches]
|
|
|
|
|
|
if opts.get('active') and branchrevs:
|
|
|
dagheads = repo.heads(start)
|
|
|
heads = [h for h in heads if h.node() in dagheads]
|
|
|
|
|
|
if branchrevs:
|
|
|
haveheads = set(h.branch() for h in heads)
|
|
|
if branches - haveheads:
|
|
|
headless = ', '.join(b for b in branches - haveheads)
|
|
|
msg = _('no open branch heads found on branches %s')
|
|
|
if opts.get('rev'):
|
|
|
msg += _(' (started at %s)') % opts['rev']
|
|
|
ui.warn((msg + '\n') % headless)
|
|
|
|
|
|
if not heads:
|
|
|
return 1
|
|
|
|
|
|
ui.pager('heads')
|
|
|
heads = sorted(heads, key=lambda x: -x.rev())
|
|
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
|
for ctx in heads:
|
|
|
displayer.show(ctx)
|
|
|
displayer.close()
|
|
|
|
|
|
@command('help',
|
|
|
[('e', 'extension', None, _('show only help for extensions')),
|
|
|
('c', 'command', None, _('show only help for commands')),
|
|
|
('k', 'keyword', None, _('show topics matching keyword')),
|
|
|
('s', 'system', [],
|
|
|
_('show help for specific platform(s)'), _('PLATFORM')),
|
|
|
],
|
|
|
_('[-eck] [-s PLATFORM] [TOPIC]'),
|
|
|
helpcategory=command.CATEGORY_HELP,
|
|
|
norepo=True,
|
|
|
intents={INTENT_READONLY})
|
|
|
def help_(ui, name=None, **opts):
|
|
|
"""show help for a given topic or a help overview
|
|
|
|
|
|
With no arguments, print a list of commands with short help messages.
|
|
|
|
|
|
Given a topic, extension, or command name, print help for that
|
|
|
topic.
|
|
|
|
|
|
Returns 0 if successful.
|
|
|
"""
|
|
|
|
|
|
keep = opts.get(r'system') or []
|
|
|
if len(keep) == 0:
|
|
|
if pycompat.sysplatform.startswith('win'):
|
|
|
keep.append('windows')
|
|
|
elif pycompat.sysplatform == 'OpenVMS':
|
|
|
keep.append('vms')
|
|
|
elif pycompat.sysplatform == 'plan9':
|
|
|
keep.append('plan9')
|
|
|
else:
|
|
|
keep.append('unix')
|
|
|
keep.append(pycompat.sysplatform.lower())
|
|
|
if ui.verbose:
|
|
|
keep.append('verbose')
|
|
|
|
|
|
commands = sys.modules[__name__]
|
|
|
formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
|
|
|
ui.pager('help')
|
|
|
ui.write(formatted)
|
|
|
|
|
|
|
|
|
@command('identify|id',
|
|
|
[('r', 'rev', '',
|
|
|
_('identify the specified revision'), _('REV')),
|
|
|
('n', 'num', None, _('show local revision number')),
|
|
|
('i', 'id', None, _('show global revision id')),
|
|
|
('b', 'branch', None, _('show branch')),
|
|
|
('t', 'tags', None, _('show tags')),
|
|
|
('B', 'bookmarks', None, _('show bookmarks')),
|
|
|
] + remoteopts + formatteropts,
|
|
|
_('[-nibtB] [-r REV] [SOURCE]'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
|
optionalrepo=True,
|
|
|
intents={INTENT_READONLY})
|
|
|
def identify(ui, repo, source=None, rev=None,
|
|
|
num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
|
|
|
"""identify the working directory or specified revision
|
|
|
|
|
|
Print a summary identifying the repository state at REV using one or
|
|
|
two parent hash identifiers, followed by a "+" if the working
|
|
|
directory has uncommitted changes, the branch name (if not default),
|
|
|
a list of tags, and a list of bookmarks.
|
|
|
|
|
|
When REV is not given, print a summary of the current state of the
|
|
|
repository including the working directory. Specify -r. to get information
|
|
|
of the working directory parent without scanning uncommitted changes.
|
|
|
|
|
|
Specifying a path to a repository root or Mercurial bundle will
|
|
|
cause lookup to operate on that repository/bundle.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions. See also :hg:`help templates`.
|
|
|
|
|
|
:dirty: String. Character ``+`` denoting if the working directory has
|
|
|
uncommitted changes.
|
|
|
:id: String. One or two nodes, optionally followed by ``+``.
|
|
|
:parents: List of strings. Parent nodes of the changeset.
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- generate a build identifier for the working directory::
|
|
|
|
|
|
hg id --id > build-id.dat
|
|
|
|
|
|
- find the revision corresponding to a tag::
|
|
|
|
|
|
hg id -n -r 1.3
|
|
|
|
|
|
- check the most recent revision of a remote repository::
|
|
|
|
|
|
hg id -r tip https://www.mercurial-scm.org/repo/hg/
|
|
|
|
|
|
See :hg:`log` for generating more information about specific revisions,
|
|
|
including full hash identifiers.
|
|
|
|
|
|
Returns 0 if successful.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if not repo and not source:
|
|
|
raise error.Abort(_("there is no Mercurial repository here "
|
|
|
"(.hg not found)"))
|
|
|
|
|
|
default = not (num or id or branch or tags or bookmarks)
|
|
|
output = []
|
|
|
revs = []
|
|
|
|
|
|
if source:
|
|
|
source, branches = hg.parseurl(ui.expandpath(source))
|
|
|
peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
|
|
|
repo = peer.local()
|
|
|
revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
|
|
|
|
|
|
fm = ui.formatter('identify', opts)
|
|
|
fm.startitem()
|
|
|
|
|
|
if not repo:
|
|
|
if num or branch or tags:
|
|
|
raise error.Abort(
|
|
|
_("can't query remote revision number, branch, or tags"))
|
|
|
if not rev and revs:
|
|
|
rev = revs[0]
|
|
|
if not rev:
|
|
|
rev = "tip"
|
|
|
|
|
|
remoterev = peer.lookup(rev)
|
|
|
hexrev = fm.hexfunc(remoterev)
|
|
|
if default or id:
|
|
|
output = [hexrev]
|
|
|
fm.data(id=hexrev)
|
|
|
|
|
|
@util.cachefunc
|
|
|
def getbms():
|
|
|
bms = []
|
|
|
|
|
|
if 'bookmarks' in peer.listkeys('namespaces'):
|
|
|
hexremoterev = hex(remoterev)
|
|
|
bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
|
|
|
if bmr == hexremoterev]
|
|
|
|
|
|
return sorted(bms)
|
|
|
|
|
|
if fm.isplain():
|
|
|
if bookmarks:
|
|
|
output.extend(getbms())
|
|
|
elif default and not ui.quiet:
|
|
|
# multiple bookmarks for a single parent separated by '/'
|
|
|
bm = '/'.join(getbms())
|
|
|
if bm:
|
|
|
output.append(bm)
|
|
|
else:
|
|
|
fm.data(node=hex(remoterev))
|
|
|
if bookmarks or 'bookmarks' in fm.datahint():
|
|
|
fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
|
|
|
else:
|
|
|
if rev:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
ctx = scmutil.revsingle(repo, rev, None)
|
|
|
|
|
|
if ctx.rev() is None:
|
|
|
ctx = repo[None]
|
|
|
parents = ctx.parents()
|
|
|
taglist = []
|
|
|
for p in parents:
|
|
|
taglist.extend(p.tags())
|
|
|
|
|
|
dirty = ""
|
|
|
if ctx.dirty(missing=True, merge=False, branch=False):
|
|
|
dirty = '+'
|
|
|
fm.data(dirty=dirty)
|
|
|
|
|
|
hexoutput = [fm.hexfunc(p.node()) for p in parents]
|
|
|
if default or id:
|
|
|
output = ["%s%s" % ('+'.join(hexoutput), dirty)]
|
|
|
fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
|
|
|
|
|
|
if num:
|
|
|
numoutput = ["%d" % p.rev() for p in parents]
|
|
|
output.append("%s%s" % ('+'.join(numoutput), dirty))
|
|
|
|
|
|
fm.data(parents=fm.formatlist([fm.hexfunc(p.node())
|
|
|
for p in parents], name='node'))
|
|
|
else:
|
|
|
hexoutput = fm.hexfunc(ctx.node())
|
|
|
if default or id:
|
|
|
output = [hexoutput]
|
|
|
fm.data(id=hexoutput)
|
|
|
|
|
|
if num:
|
|
|
output.append(pycompat.bytestr(ctx.rev()))
|
|
|
taglist = ctx.tags()
|
|
|
|
|
|
if default and not ui.quiet:
|
|
|
b = ctx.branch()
|
|
|
if b != 'default':
|
|
|
output.append("(%s)" % b)
|
|
|
|
|
|
# multiple tags for a single parent separated by '/'
|
|
|
t = '/'.join(taglist)
|
|
|
if t:
|
|
|
output.append(t)
|
|
|
|
|
|
# multiple bookmarks for a single parent separated by '/'
|
|
|
bm = '/'.join(ctx.bookmarks())
|
|
|
if bm:
|
|
|
output.append(bm)
|
|
|
else:
|
|
|
if branch:
|
|
|
output.append(ctx.branch())
|
|
|
|
|
|
if tags:
|
|
|
output.extend(taglist)
|
|
|
|
|
|
if bookmarks:
|
|
|
output.extend(ctx.bookmarks())
|
|
|
|
|
|
fm.data(node=ctx.hex())
|
|
|
fm.data(branch=ctx.branch())
|
|
|
fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
|
|
|
fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
|
|
|
fm.context(ctx=ctx)
|
|
|
|
|
|
fm.plain("%s\n" % ' '.join(output))
|
|
|
fm.end()
|
|
|
|
|
|
@command('import|patch',
|
|
|
[('p', 'strip', 1,
|
|
|
_('directory strip option for patch. This has the same '
|
|
|
'meaning as the corresponding patch option'), _('NUM')),
|
|
|
('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
|
|
|
('e', 'edit', False, _('invoke editor on commit messages')),
|
|
|
('f', 'force', None,
|
|
|
_('skip check for outstanding uncommitted changes (DEPRECATED)')),
|
|
|
('', 'no-commit', None,
|
|
|
_("don't commit, just update the working directory")),
|
|
|
('', 'bypass', None,
|
|
|
_("apply patch without touching the working directory")),
|
|
|
('', 'partial', None,
|
|
|
_('commit even if some hunks fail')),
|
|
|
('', 'exact', None,
|
|
|
_('abort if patch would apply lossily')),
|
|
|
('', 'prefix', '',
|
|
|
_('apply patch to subdirectory'), _('DIR')),
|
|
|
('', 'import-branch', None,
|
|
|
_('use any branch information in patch (implied by --exact)'))] +
|
|
|
commitopts + commitopts2 + similarityopts,
|
|
|
_('[OPTION]... PATCH...'),
|
|
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
|
def import_(ui, repo, patch1=None, *patches, **opts):
|
|
|
"""import an ordered set of patches
|
|
|
|
|
|
Import a list of patches and commit them individually (unless
|
|
|
--no-commit is specified).
|
|
|
|
|
|
To read a patch from standard input (stdin), use "-" as the patch
|
|
|
name. If a URL is specified, the patch will be downloaded from
|
|
|
there.
|
|
|
|
|
|
Import first applies changes to the working directory (unless
|
|
|
--bypass is specified), import will abort if there are outstanding
|
|
|
changes.
|
|
|
|
|
|
Use --bypass to apply and commit patches directly to the
|
|
|
repository, without affecting the working directory. Without
|
|
|
--exact, patches will be applied on top of the working directory
|
|
|
parent revision.
|
|
|
|
|
|
You can import a patch straight from a mail message. Even patches
|
|
|
as attachments work (to use the body part, it must have type
|
|
|
text/plain or text/x-patch). From and Subject headers of email
|
|
|
message are used as default committer and commit message. All
|
|
|
text/plain body parts before first diff are added to the commit
|
|
|
message.
|
|
|
|
|
|
If the imported patch was generated by :hg:`export`, user and
|
|
|
description from patch override values from message headers and
|
|
|
body. Values given on command line with -m/--message and -u/--user
|
|
|
override these.
|
|
|
|
|
|
If --exact is specified, import will set the working directory to
|
|
|
the parent of each patch before applying it, and will abort if the
|
|
|
resulting changeset has a different ID than the one recorded in
|
|
|
the patch. This will guard against various ways that portable
|
|
|
patch formats and mail systems might fail to transfer Mercurial
|
|
|
data or metadata. See :hg:`bundle` for lossless transmission.
|
|
|
|
|
|
Use --partial to ensure a changeset will be created from the patch
|
|
|
even if some hunks fail to apply. Hunks that fail to apply will be
|
|
|
written to a <target-file>.rej file. Conflicts can then be resolved
|
|
|
by hand before :hg:`commit --amend` is run to update the created
|
|
|
changeset. This flag exists to let people import patches that
|
|
|
partially apply without losing the associated metadata (author,
|
|
|
date, description, ...).
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
When no hunks apply cleanly, :hg:`import --partial` will create
|
|
|
an empty changeset, importing only the patch metadata.
|
|
|
|
|
|
With -s/--similarity, hg will attempt to discover renames and
|
|
|
copies in the patch in the same way as :hg:`addremove`.
|
|
|
|
|
|
It is possible to use external patch programs to perform the patch
|
|
|
by setting the ``ui.patch`` configuration option. For the default
|
|
|
internal tool, the fuzz can also be configured via ``patch.fuzz``.
|
|
|
See :hg:`help config` for more information about configuration
|
|
|
files and how to use these options.
|
|
|
|
|
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- import a traditional patch from a website and detect renames::
|
|
|
|
|
|
hg import -s 80 http://example.com/bugfix.patch
|
|
|
|
|
|
- import a changeset from an hgweb server::
|
|
|
|
|
|
hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
|
|
|
|
|
|
- import all the patches in an Unix-style mbox::
|
|
|
|
|
|
hg import incoming-patches.mbox
|
|
|
|
|
|
- import patches from stdin::
|
|
|
|
|
|
hg import -
|
|
|
|
|
|
- attempt to exactly restore an exported changeset (not always
|
|
|
possible)::
|
|
|
|
|
|
hg import --exact proposed-fix.patch
|
|
|
|
|
|
- use an external tool to apply a patch which is too fuzzy for
|
|
|
the default internal tool.
|
|
|
|
|
|
hg import --config ui.patch="patch --merge" fuzzy.patch
|
|
|
|
|
|
- change the default fuzzing from 2 to a less strict 7
|
|
|
|
|
|
hg import --config ui.fuzz=7 fuzz.patch
|
|
|
|
|
|
Returns 0 on success, 1 on partial success (see --partial).
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if not patch1:
|
|
|
raise error.Abort(_('need at least one patch to import'))
|
|
|
|
|
|
patches = (patch1,) + patches
|
|
|
|
|
|
date = opts.get('date')
|
|
|
if date:
|
|
|
opts['date'] = dateutil.parsedate(date)
|
|
|
|
|
|
exact = opts.get('exact')
|
|
|
update = not opts.get('bypass')
|
|
|
if not update and opts.get('no_commit'):
|
|
|
raise error.Abort(_('cannot use --no-commit with --bypass'))
|
|
|
try:
|
|
|
sim = float(opts.get('similarity') or 0)
|
|
|
except ValueError:
|
|
|
raise error.Abort(_('similarity must be a number'))
|
|
|
if sim < 0 or sim > 100:
|
|
|
raise error.Abort(_('similarity must be between 0 and 100'))
|
|
|
if sim and not update:
|
|
|
raise error.Abort(_('cannot use --similarity with --bypass'))
|
|
|
if exact:
|
|
|
if opts.get('edit'):
|
|
|
raise error.Abort(_('cannot use --exact with --edit'))
|
|
|
if opts.get('prefix'):
|
|
|
raise error.Abort(_('cannot use --exact with --prefix'))
|
|
|
|
|
|
base = opts["base"]
|
|
|
msgs = []
|
|
|
ret = 0
|
|
|
|
|
|
with repo.wlock():
|
|
|
if update:
|
|
|
cmdutil.checkunfinished(repo)
|
|
|
if (exact or not opts.get('force')):
|
|
|
cmdutil.bailifchanged(repo)
|
|
|
|
|
|
if not opts.get('no_commit'):
|
|
|
lock = repo.lock
|
|
|
tr = lambda: repo.transaction('import')
|
|
|
dsguard = util.nullcontextmanager
|
|
|
else:
|
|
|
lock = util.nullcontextmanager
|
|
|
tr = util.nullcontextmanager
|
|
|
dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
|
|
|
with lock(), tr(), dsguard():
|
|
|
parents = repo[None].parents()
|
|
|
for patchurl in patches:
|
|
|
if patchurl == '-':
|
|
|
ui.status(_('applying patch from stdin\n'))
|
|
|
patchfile = ui.fin
|
|
|
patchurl = 'stdin' # for error message
|
|
|
else:
|
|
|
patchurl = os.path.join(base, patchurl)
|
|
|
ui.status(_('applying %s\n') % patchurl)
|
|
|
patchfile = hg.openpath(ui, patchurl)
|
|
|
|
|
|
haspatch = False
|
|
|
for hunk in patch.split(patchfile):
|
|
|
with patch.extract(ui, hunk) as patchdata:
|
|
|
msg, node, rej = cmdutil.tryimportone(ui, repo,
|
|
|
patchdata,
|
|
|
parents, opts,
|
|
|
msgs, hg.clean)
|
|
|
if msg:
|
|
|
haspatch = True
|
|
|
ui.note(msg + '\n')
|
|
|
if update or exact:
|
|
|
parents = repo[None].parents()
|
|
|
else:
|
|
|
parents = [repo[node]]
|
|
|
if rej:
|
|
|
ui.write_err(_("patch applied partially\n"))
|
|
|
ui.write_err(_("(fix the .rej files and run "
|
|
|
"`hg commit --amend`)\n"))
|
|
|
ret = 1
|
|
|
break
|
|
|
|
|
|
if not haspatch:
|
|
|
raise error.Abort(_('%s: no diffs found') % patchurl)
|
|
|
|
|
|
if msgs:
|
|
|
repo.savecommitmessage('\n* * *\n'.join(msgs))
|
|
|
return ret
|
|
|
|
|
|
@command('incoming|in',
|
|
|
[('f', 'force', None,
|
|
|
_('run even if remote repository is unrelated')),
|
|
|
('n', 'newest-first', None, _('show newest record first')),
|
|
|
('', 'bundle', '',
|
|
|
_('file to store the bundles into'), _('FILE')),
|
|
|
('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
|
|
|
('B', 'bookmarks', False, _("compare bookmarks")),
|
|
|
('b', 'branch', [],
|
|
|
_('a specific branch you would like to pull'), _('BRANCH')),
|
|
|
] + logopts + remoteopts + subrepoopts,
|
|
|
_('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
|
|
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
|
|
|
def incoming(ui, repo, source="default", **opts):
|
|
|
"""show new changesets found in source
|
|
|
|
|
|
Show new changesets found in the specified path/URL or the default
|
|
|
pull location. These are the changesets that would have been pulled
|
|
|
by :hg:`pull` at the time you issued this command.
|
|
|
|
|
|
See pull for valid source format details.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
With -B/--bookmarks, the result of bookmark comparison between
|
|
|
local and remote repositories is displayed. With -v/--verbose,
|
|
|
status is also displayed for each bookmark like below::
|
|
|
|
|
|
BM1 01234567890a added
|
|
|
BM2 1234567890ab advanced
|
|
|
BM3 234567890abc diverged
|
|
|
BM4 34567890abcd changed
|
|
|
|
|
|
The action taken locally when pulling depends on the
|
|
|
status of each bookmark:
|
|
|
|
|
|
:``added``: pull will create it
|
|
|
:``advanced``: pull will update it
|
|
|
:``diverged``: pull will create a divergent bookmark
|
|
|
:``changed``: result depends on remote changesets
|
|
|
|
|
|
From the point of view of pulling behavior, bookmark
|
|
|
existing only in the remote repository are treated as ``added``,
|
|
|
even if it is in fact locally deleted.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
For remote repository, using --bundle avoids downloading the
|
|
|
changesets twice if the incoming is followed by a pull.
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- show incoming changes with patches and full description::
|
|
|
|
|
|
hg incoming -vp
|
|
|
|
|
|
- show incoming changes excluding merges, store a bundle::
|
|
|
|
|
|
hg in -vpM --bundle incoming.hg
|
|
|
hg pull incoming.hg
|
|
|
|
|
|
- briefly list changes inside a bundle::
|
|
|
|
|
|
hg in changes.hg -T "{desc|firstline}\\n"
|
|
|
|
|
|
Returns 0 if there are incoming changes, 1 otherwise.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if opts.get('graph'):
|
|
|
logcmdutil.checkunsupportedgraphflags([], opts)
|
|
|
def display(other, chlist, displayer):
|
|
|
revdag = logcmdutil.graphrevs(other, chlist, opts)
|
|
|
logcmdutil.displaygraph(ui, repo, revdag, displayer,
|
|
|
graphmod.asciiedges)
|
|
|
|
|
|
hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
|
|
|
return 0
|
|
|
|
|
|
if opts.get('bundle') and opts.get('subrepos'):
|
|
|
raise error.Abort(_('cannot combine --bundle and --subrepos'))
|
|
|
|
|
|
if opts.get('bookmarks'):
|
|
|
source, branches = hg.parseurl(ui.expandpath(source),
|
|
|
opts.get('branch'))
|
|
|
other = hg.peer(repo, opts, source)
|
|
|
if 'bookmarks' not in other.listkeys('namespaces'):
|
|
|
ui.warn(_("remote doesn't support bookmarks\n"))
|
|
|
return 0
|
|
|
ui.pager('incoming')
|
|
|
ui.status(_('comparing with %s\n') % util.hidepassword(source))
|
|
|
return bookmarks.incoming(ui, repo, other)
|
|
|
|
|
|
repo._subtoppath = ui.expandpath(source)
|
|
|
try:
|
|
|
return hg.incoming(ui, repo, source, opts)
|
|
|
finally:
|
|
|
del repo._subtoppath
|
|
|
|
|
|
|
|
|
@command('init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
|
|
|
helpcategory=command.CATEGORY_REPO_CREATION,
|
|
|
helpbasic=True, norepo=True)
|
|
|
def init(ui, dest=".", **opts):
|
|
|
"""create a new repository in the given directory
|
|
|
|
|
|
Initialize a new repository in the given directory. If the given
|
|
|
directory does not exist, it will be created.
|
|
|
|
|
|
If no directory is given, the current directory is used.
|
|
|
|
|
|
It is possible to specify an ``ssh://`` URL as the destination.
|
|
|
See :hg:`help urls` for more information.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
hg.peer(ui, opts, ui.expandpath(dest), create=True)
|
|
|
|
|
|
@command('locate',
|
|
|
[('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
|
|
|
('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
|
|
|
('f', 'fullpath', None, _('print complete paths from the filesystem root')),
|
|
|
] + walkopts,
|
|
|
_('[OPTION]... [PATTERN]...'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
|
def locate(ui, repo, *pats, **opts):
|
|
|
"""locate files matching specific patterns (DEPRECATED)
|
|
|
|
|
|
Print files under Mercurial control in the working directory whose
|
|
|
names match the given patterns.
|
|
|
|
|
|
By default, this command searches all directories in the working
|
|
|
directory. To search just the current directory and its
|
|
|
subdirectories, use "--include .".
|
|
|
|
|
|
If no patterns are given to match, this command prints the names
|
|
|
of all files under Mercurial control in the working directory.
|
|
|
|
|
|
If you want to feed the output of this command into the "xargs"
|
|
|
command, use the -0 option to both this command and "xargs". This
|
|
|
will avoid the problem of "xargs" treating single filenames that
|
|
|
contain whitespace as multiple filenames.
|
|
|
|
|
|
See :hg:`help files` for a more versatile command.
|
|
|
|
|
|
Returns 0 if a match is found, 1 otherwise.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if opts.get('print0'):
|
|
|
end = '\0'
|
|
|
else:
|
|
|
end = '\n'
|
|
|
ctx = scmutil.revsingle(repo, opts.get('rev'), None)
|
|
|
|
|
|
ret = 1
|
|
|
m = scmutil.match(ctx, pats, opts, default='relglob',
|
|
|
badfn=lambda x, y: False)
|
|
|
|
|
|
ui.pager('locate')
|
|
|
if ctx.rev() is None:
|
|
|
# When run on the working copy, "locate" includes removed files, so
|
|
|
# we get the list of files from the dirstate.
|
|
|
filesgen = sorted(repo.dirstate.matches(m))
|
|
|
else:
|
|
|
filesgen = ctx.matches(m)
|
|
|
for abs in filesgen:
|
|
|
if opts.get('fullpath'):
|
|
|
ui.write(repo.wjoin(abs), end)
|
|
|
else:
|
|
|
ui.write(((pats and m.rel(abs)) or abs), end)
|
|
|
ret = 0
|
|
|
|
|
|
return ret
|
|
|
|
|
|
@command('log|history',
|
|
|
[('f', 'follow', None,
|
|
|
_('follow changeset history, or file history across copies and renames')),
|
|
|
('', 'follow-first', None,
|
|
|
_('only follow the first parent of merge changesets (DEPRECATED)')),
|
|
|
('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
|
|
|
('C', 'copies', None, _('show copied files')),
|
|
|
('k', 'keyword', [],
|
|
|
_('do case-insensitive search for a given text'), _('TEXT')),
|
|
|
('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
|
|
|
('L', 'line-range', [],
|
|
|
_('follow line range of specified file (EXPERIMENTAL)'),
|
|
|
_('FILE,RANGE')),
|
|
|
('', 'removed', None, _('include revisions where files were removed')),
|
|
|
('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
|
|
|
('u', 'user', [], _('revisions committed by user'), _('USER')),
|
|
|
('', 'only-branch', [],
|
|
|
_('show only changesets within the given named branch (DEPRECATED)'),
|
|
|
_('BRANCH')),
|
|
|
('b', 'branch', [],
|
|
|
_('show changesets within the given named branch'), _('BRANCH')),
|
|
|
('P', 'prune', [],
|
|
|
_('do not display revision or any of its ancestors'), _('REV')),
|
|
|
] + logopts + walkopts,
|
|
|
_('[OPTION]... [FILE]'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
|
helpbasic=True, inferrepo=True,
|
|
|
intents={INTENT_READONLY})
|
|
|
def log(ui, repo, *pats, **opts):
|
|
|
"""show revision history of entire repository or files
|
|
|
|
|
|
Print the revision history of the specified files or the entire
|
|
|
project.
|
|
|
|
|
|
If no revision range is specified, the default is ``tip:0`` unless
|
|
|
--follow is set, in which case the working directory parent is
|
|
|
used as the starting revision.
|
|
|
|
|
|
File history is shown without following rename or copy history of
|
|
|
files. Use -f/--follow with a filename to follow history across
|
|
|
renames and copies. --follow without a filename will only show
|
|
|
ancestors of the starting revision.
|
|
|
|
|
|
By default this command prints revision number and changeset id,
|
|
|
tags, non-trivial parents, user, date and time, and a summary for
|
|
|
each commit. When the -v/--verbose switch is used, the list of
|
|
|
changed files and full commit message are shown.
|
|
|
|
|
|
With --graph the revisions are shown as an ASCII art DAG with the most
|
|
|
recent changeset at the top.
|
|
|
'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
|
|
|
'x' is obsolete, '*' is unstable, and '+' represents a fork where the
|
|
|
changeset from the lines below is a parent of the 'o' merge on the same
|
|
|
line.
|
|
|
Paths in the DAG are represented with '|', '/' and so forth. ':' in place
|
|
|
of a '|' indicates one or more revisions in a path are omitted.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Use -L/--line-range FILE,M:N options to follow the history of lines
|
|
|
from M to N in FILE. With -p/--patch only diff hunks affecting
|
|
|
specified line range will be shown. This option requires --follow;
|
|
|
it can be specified multiple times. Currently, this option is not
|
|
|
compatible with --graph. This option is experimental.
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
:hg:`log --patch` may generate unexpected diff output for merge
|
|
|
changesets, as it will only compare the merge changeset against
|
|
|
its first parent. Also, only files different from BOTH parents
|
|
|
will appear in files:.
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
For performance reasons, :hg:`log FILE` may omit duplicate changes
|
|
|
made on branches and will not show removals or mode changes. To
|
|
|
see all such changes, use the --removed switch.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
The history resulting from -L/--line-range options depends on diff
|
|
|
options; for instance if white-spaces are ignored, respective changes
|
|
|
with only white-spaces in specified line range will not be listed.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Some examples:
|
|
|
|
|
|
- changesets with full descriptions and file lists::
|
|
|
|
|
|
hg log -v
|
|
|
|
|
|
- changesets ancestral to the working directory::
|
|
|
|
|
|
hg log -f
|
|
|
|
|
|
- last 10 commits on the current branch::
|
|
|
|
|
|
hg log -l 10 -b .
|
|
|
|
|
|
- changesets showing all modifications of a file, including removals::
|
|
|
|
|
|
hg log --removed file.c
|
|
|
|
|
|
- all changesets that touch a directory, with diffs, excluding merges::
|
|
|
|
|
|
hg log -Mp lib/
|
|
|
|
|
|
- all revision numbers that match a keyword::
|
|
|
|
|
|
hg log -k bug --template "{rev}\\n"
|
|
|
|
|
|
- the full hash identifier of the working directory parent::
|
|
|
|
|
|
hg log -r . --template "{node}\\n"
|
|
|
|
|
|
- list available log templates::
|
|
|
|
|
|
hg log -T list
|
|
|
|
|
|
- check if a given changeset is included in a tagged release::
|
|
|
|
|
|
hg log -r "a21ccf and ancestor(1.9)"
|
|
|
|
|
|
- find all changesets by some user in a date range::
|
|
|
|
|
|
hg log -k alice -d "may 2008 to jul 2008"
|
|
|
|
|
|
- summary of all changesets after the last tag::
|
|
|
|
|
|
hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
|
|
|
|
|
|
- changesets touching lines 13 to 23 for file.c::
|
|
|
|
|
|
hg log -L file.c,13:23
|
|
|
|
|
|
- changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
|
|
|
main.c with patch::
|
|
|
|
|
|
hg log -L file.c,13:23 -L main.c,2:6 -p
|
|
|
|
|
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
|
|
|
See :hg:`help revisions` for more about specifying and ordering
|
|
|
revisions.
|
|
|
|
|
|
See :hg:`help templates` for more about pre-packaged styles and
|
|
|
specifying custom templates. The default template used by the log
|
|
|
command can be customized via the ``ui.logtemplate`` configuration
|
|
|
setting.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
linerange = opts.get('line_range')
|
|
|
|
|
|
if linerange and not opts.get('follow'):
|
|
|
raise error.Abort(_('--line-range requires --follow'))
|
|
|
|
|
|
if linerange and pats:
|
|
|
# TODO: take pats as patterns with no line-range filter
|
|
|
raise error.Abort(
|
|
|
_('FILE arguments are not compatible with --line-range option')
|
|
|
)
|
|
|
|
|
|
repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
|
|
|
revs, differ = logcmdutil.getrevs(repo, pats, opts)
|
|
|
if linerange:
|
|
|
# TODO: should follow file history from logcmdutil._initialrevs(),
|
|
|
# then filter the result by logcmdutil._makerevset() and --limit
|
|
|
revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
|
|
|
|
|
|
getrenamed = None
|
|
|
if opts.get('copies'):
|
|
|
endrev = None
|
|
|
if revs:
|
|
|
endrev = revs.max() + 1
|
|
|
getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
|
|
|
|
|
|
ui.pager('log')
|
|
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
|
|
|
buffered=True)
|
|
|
if opts.get('graph'):
|
|
|
displayfn = logcmdutil.displaygraphrevs
|
|
|
else:
|
|
|
displayfn = logcmdutil.displayrevs
|
|
|
displayfn(ui, repo, revs, displayer, getrenamed)
|
|
|
|
|
|
@command('manifest',
|
|
|
[('r', 'rev', '', _('revision to display'), _('REV')),
|
|
|
('', 'all', False, _("list files from all revisions"))]
|
|
|
+ formatteropts,
|
|
|
_('[-r REV]'),
|
|
|
helpcategory=command.CATEGORY_MAINTENANCE,
|
|
|
intents={INTENT_READONLY})
|
|
|
def manifest(ui, repo, node=None, rev=None, **opts):
|
|
|
"""output the current or given revision of the project manifest
|
|
|
|
|
|
Print a list of version controlled files for the given revision.
|
|
|
If no revision is given, the first parent of the working directory
|
|
|
is used, or the null revision if no revision is checked out.
|
|
|
|
|
|
With -v, print file permissions, symlink and executable bits.
|
|
|
With --debug, print file revision hashes.
|
|
|
|
|
|
If option --all is specified, the list of all files from all revisions
|
|
|
is printed. This includes deleted and renamed files.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
fm = ui.formatter('manifest', opts)
|
|
|
|
|
|
if opts.get('all'):
|
|
|
if rev or node:
|
|
|
raise error.Abort(_("can't specify a revision with --all"))
|
|
|
|
|
|
res = set()
|
|
|
for rev in repo:
|
|
|
ctx = repo[rev]
|
|
|
res |= set(ctx.files())
|
|
|
|
|
|
ui.pager('manifest')
|
|
|
for f in sorted(res):
|
|
|
fm.startitem()
|
|
|
fm.write("path", '%s\n', f)
|
|
|
fm.end()
|
|
|
return
|
|
|
|
|
|
if rev and node:
|
|
|
raise error.Abort(_("please specify just one revision"))
|
|
|
|
|
|
if not node:
|
|
|
node = rev
|
|
|
|
|
|
char = {'l': '@', 'x': '*', '': '', 't': 'd'}
|
|
|
mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
|
|
|
if node:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
|
|
|
ctx = scmutil.revsingle(repo, node)
|
|
|
mf = ctx.manifest()
|
|
|
ui.pager('manifest')
|
|
|
for f in ctx:
|
|
|
fm.startitem()
|
|
|
fm.context(ctx=ctx)
|
|
|
fl = ctx[f].flags()
|
|
|
fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
|
|
|
fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
|
|
|
fm.write('path', '%s\n', f)
|
|
|
fm.end()
|
|
|
|
|
|
@command('merge',
|
|
|
[('f', 'force', None,
|
|
|
_('force a merge including outstanding changes (DEPRECATED)')),
|
|
|
('r', 'rev', '', _('revision to merge'), _('REV')),
|
|
|
('P', 'preview', None,
|
|
|
_('review revisions to merge (no merge is performed)')),
|
|
|
('', 'abort', None, _('abort the ongoing merge')),
|
|
|
] + mergetoolopts,
|
|
|
_('[-P] [[-r] REV]'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True)
|
|
|
def merge(ui, repo, node=None, **opts):
|
|
|
"""merge another revision into working directory
|
|
|
|
|
|
The current working directory is updated with all changes made in
|
|
|
the requested revision since the last common predecessor revision.
|
|
|
|
|
|
Files that changed between either parent are marked as changed for
|
|
|
the next commit and a commit must be performed before any further
|
|
|
updates to the repository are allowed. The next commit will have
|
|
|
two parents.
|
|
|
|
|
|
``--tool`` can be used to specify the merge tool used for file
|
|
|
merges. It overrides the HGMERGE environment variable and your
|
|
|
configuration files. See :hg:`help merge-tools` for options.
|
|
|
|
|
|
If no revision is specified, the working directory's parent is a
|
|
|
head revision, and the current branch contains exactly one other
|
|
|
head, the other head is merged with by default. Otherwise, an
|
|
|
explicit revision with which to merge with must be provided.
|
|
|
|
|
|
See :hg:`help resolve` for information on handling file conflicts.
|
|
|
|
|
|
To undo an uncommitted merge, use :hg:`merge --abort` which
|
|
|
will check out a clean copy of the original merge parent, losing
|
|
|
all changes.
|
|
|
|
|
|
Returns 0 on success, 1 if there are unresolved files.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
abort = opts.get('abort')
|
|
|
if abort and repo.dirstate.p2() == nullid:
|
|
|
cmdutil.wrongtooltocontinue(repo, _('merge'))
|
|
|
if abort:
|
|
|
if node:
|
|
|
raise error.Abort(_("cannot specify a node with --abort"))
|
|
|
if opts.get('rev'):
|
|
|
raise error.Abort(_("cannot specify both --rev and --abort"))
|
|
|
if opts.get('preview'):
|
|
|
raise error.Abort(_("cannot specify --preview with --abort"))
|
|
|
if opts.get('rev') and node:
|
|
|
raise error.Abort(_("please specify just one revision"))
|
|
|
if not node:
|
|
|
node = opts.get('rev')
|
|
|
|
|
|
if node:
|
|
|
node = scmutil.revsingle(repo, node).node()
|
|
|
|
|
|
if not node and not abort:
|
|
|
node = repo[destutil.destmerge(repo)].node()
|
|
|
|
|
|
if opts.get('preview'):
|
|
|
# find nodes that are ancestors of p2 but not of p1
|
|
|
p1 = repo.lookup('.')
|
|
|
p2 = node
|
|
|
nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
|
|
|
|
|
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
|
for node in nodes:
|
|
|
displayer.show(repo[node])
|
|
|
displayer.close()
|
|
|
return 0
|
|
|
|
|
|
# ui.forcemerge is an internal variable, do not document
|
|
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
with ui.configoverride(overrides, 'merge'):
|
|
|
force = opts.get('force')
|
|
|
labels = ['working copy', 'merge rev']
|
|
|
return hg.merge(repo, node, force=force, mergeforce=force,
|
|
|
labels=labels, abort=abort)
|
|
|
|
|
|
@command('outgoing|out',
|
|
|
[('f', 'force', None, _('run even when the destination is unrelated')),
|
|
|
('r', 'rev', [],
|
|
|
_('a changeset intended to be included in the destination'), _('REV')),
|
|
|
('n', 'newest-first', None, _('show newest record first')),
|
|
|
('B', 'bookmarks', False, _('compare bookmarks')),
|
|
|
('b', 'branch', [], _('a specific branch you would like to push'),
|
|
|
_('BRANCH')),
|
|
|
] + logopts + remoteopts + subrepoopts,
|
|
|
_('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
|
|
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
|
|
|
def outgoing(ui, repo, dest=None, **opts):
|
|
|
"""show changesets not found in the destination
|
|
|
|
|
|
Show changesets not found in the specified destination repository
|
|
|
or the default push location. These are the changesets that would
|
|
|
be pushed if a push was requested.
|
|
|
|
|
|
See pull for details of valid destination formats.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
With -B/--bookmarks, the result of bookmark comparison between
|
|
|
local and remote repositories is displayed. With -v/--verbose,
|
|
|
status is also displayed for each bookmark like below::
|
|
|
|
|
|
BM1 01234567890a added
|
|
|
BM2 deleted
|
|
|
BM3 234567890abc advanced
|
|
|
BM4 34567890abcd diverged
|
|
|
BM5 4567890abcde changed
|
|
|
|
|
|
The action taken when pushing depends on the
|
|
|
status of each bookmark:
|
|
|
|
|
|
:``added``: push with ``-B`` will create it
|
|
|
:``deleted``: push with ``-B`` will delete it
|
|
|
:``advanced``: push will update it
|
|
|
:``diverged``: push with ``-B`` will update it
|
|
|
:``changed``: push with ``-B`` will update it
|
|
|
|
|
|
From the point of view of pushing behavior, bookmarks
|
|
|
existing only in the remote repository are treated as
|
|
|
``deleted``, even if it is in fact added remotely.
|
|
|
|
|
|
Returns 0 if there are outgoing changes, 1 otherwise.
|
|
|
"""
|
|
|
# hg._outgoing() needs to re-resolve the path in order to handle #branch
|
|
|
# style URLs, so don't overwrite dest.
|
|
|
path = ui.paths.getpath(dest, default=('default-push', 'default'))
|
|
|
if not path:
|
|
|
raise error.Abort(_('default repository not configured!'),
|
|
|
hint=_("see 'hg help config.paths'"))
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if opts.get('graph'):
|
|
|
logcmdutil.checkunsupportedgraphflags([], opts)
|
|
|
o, other = hg._outgoing(ui, repo, dest, opts)
|
|
|
if not o:
|
|
|
cmdutil.outgoinghooks(ui, repo, other, opts, o)
|
|
|
return
|
|
|
|
|
|
revdag = logcmdutil.graphrevs(repo, o, opts)
|
|
|
ui.pager('outgoing')
|
|
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
|
|
|
logcmdutil.displaygraph(ui, repo, revdag, displayer,
|
|
|
graphmod.asciiedges)
|
|
|
cmdutil.outgoinghooks(ui, repo, other, opts, o)
|
|
|
return 0
|
|
|
|
|
|
if opts.get('bookmarks'):
|
|
|
dest = path.pushloc or path.loc
|
|
|
other = hg.peer(repo, opts, dest)
|
|
|
if 'bookmarks' not in other.listkeys('namespaces'):
|
|
|
ui.warn(_("remote doesn't support bookmarks\n"))
|
|
|
return 0
|
|
|
ui.status(_('comparing with %s\n') % util.hidepassword(dest))
|
|
|
ui.pager('outgoing')
|
|
|
return bookmarks.outgoing(ui, repo, other)
|
|
|
|
|
|
repo._subtoppath = path.pushloc or path.loc
|
|
|
try:
|
|
|
return hg.outgoing(ui, repo, dest, opts)
|
|
|
finally:
|
|
|
del repo._subtoppath
|
|
|
|
|
|
@command('parents',
|
|
|
[('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
|
|
|
] + templateopts,
|
|
|
_('[-r REV] [FILE]'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
|
|
|
inferrepo=True)
|
|
|
def parents(ui, repo, file_=None, **opts):
|
|
|
"""show the parents of the working directory or revision (DEPRECATED)
|
|
|
|
|
|
Print the working directory's parent revisions. If a revision is
|
|
|
given via -r/--rev, the parent of that revision will be printed.
|
|
|
If a file argument is given, the revision in which the file was
|
|
|
last changed (before the working directory revision or the
|
|
|
argument to --rev if given) is printed.
|
|
|
|
|
|
This command is equivalent to::
|
|
|
|
|
|
hg log -r "p1()+p2()" or
|
|
|
hg log -r "p1(REV)+p2(REV)" or
|
|
|
hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
|
|
|
hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
|
|
|
|
|
|
See :hg:`summary` and :hg:`help revsets` for related information.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
rev = opts.get('rev')
|
|
|
if rev:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
ctx = scmutil.revsingle(repo, rev, None)
|
|
|
|
|
|
if file_:
|
|
|
m = scmutil.match(ctx, (file_,), opts)
|
|
|
if m.anypats() or len(m.files()) != 1:
|
|
|
raise error.Abort(_('can only specify an explicit filename'))
|
|
|
file_ = m.files()[0]
|
|
|
filenodes = []
|
|
|
for cp in ctx.parents():
|
|
|
if not cp:
|
|
|
continue
|
|
|
try:
|
|
|
filenodes.append(cp.filenode(file_))
|
|
|
except error.LookupError:
|
|
|
pass
|
|
|
if not filenodes:
|
|
|
raise error.Abort(_("'%s' not found in manifest!") % file_)
|
|
|
p = []
|
|
|
for fn in filenodes:
|
|
|
fctx = repo.filectx(file_, fileid=fn)
|
|
|
p.append(fctx.node())
|
|
|
else:
|
|
|
p = [cp.node() for cp in ctx.parents()]
|
|
|
|
|
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
|
for n in p:
|
|
|
if n != nullid:
|
|
|
displayer.show(repo[n])
|
|
|
displayer.close()
|
|
|
|
|
|
@command('paths', formatteropts, _('[NAME]'),
|
|
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
|
optionalrepo=True, intents={INTENT_READONLY})
|
|
|
def paths(ui, repo, search=None, **opts):
|
|
|
"""show aliases for remote repositories
|
|
|
|
|
|
Show definition of symbolic path name NAME. If no name is given,
|
|
|
show definition of all available names.
|
|
|
|
|
|
Option -q/--quiet suppresses all output when searching for NAME
|
|
|
and shows only the path names when listing all definitions.
|
|
|
|
|
|
Path names are defined in the [paths] section of your
|
|
|
configuration file and in ``/etc/mercurial/hgrc``. If run inside a
|
|
|
repository, ``.hg/hgrc`` is used, too.
|
|
|
|
|
|
The path names ``default`` and ``default-push`` have a special
|
|
|
meaning. When performing a push or pull operation, they are used
|
|
|
as fallbacks if no location is specified on the command-line.
|
|
|
When ``default-push`` is set, it will be used for push and
|
|
|
``default`` will be used for pull; otherwise ``default`` is used
|
|
|
as the fallback for both. When cloning a repository, the clone
|
|
|
source is written as ``default`` in ``.hg/hgrc``.
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
``default`` and ``default-push`` apply to all inbound (e.g.
|
|
|
:hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
|
|
|
and :hg:`bundle`) operations.
|
|
|
|
|
|
See :hg:`help urls` for more information.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported. See also :hg:`help templates`.
|
|
|
|
|
|
:name: String. Symbolic name of the path alias.
|
|
|
:pushurl: String. URL for push operations.
|
|
|
:url: String. URL or directory path for the other operations.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
ui.pager('paths')
|
|
|
if search:
|
|
|
pathitems = [(name, path) for name, path in ui.paths.iteritems()
|
|
|
if name == search]
|
|
|
else:
|
|
|
pathitems = sorted(ui.paths.iteritems())
|
|
|
|
|
|
fm = ui.formatter('paths', opts)
|
|
|
if fm.isplain():
|
|
|
hidepassword = util.hidepassword
|
|
|
else:
|
|
|
hidepassword = bytes
|
|
|
if ui.quiet:
|
|
|
namefmt = '%s\n'
|
|
|
else:
|
|
|
namefmt = '%s = '
|
|
|
showsubopts = not search and not ui.quiet
|
|
|
|
|
|
for name, path in pathitems:
|
|
|
fm.startitem()
|
|
|
fm.condwrite(not search, 'name', namefmt, name)
|
|
|
fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
|
|
|
for subopt, value in sorted(path.suboptions.items()):
|
|
|
assert subopt not in ('name', 'url')
|
|
|
if showsubopts:
|
|
|
fm.plain('%s:%s = ' % (name, subopt))
|
|
|
fm.condwrite(showsubopts, subopt, '%s\n', value)
|
|
|
|
|
|
fm.end()
|
|
|
|
|
|
if search and not pathitems:
|
|
|
if not ui.quiet:
|
|
|
ui.warn(_("not found!\n"))
|
|
|
return 1
|
|
|
else:
|
|
|
return 0
|
|
|
|
|
|
@command('phase',
|
|
|
[('p', 'public', False, _('set changeset phase to public')),
|
|
|
('d', 'draft', False, _('set changeset phase to draft')),
|
|
|
('s', 'secret', False, _('set changeset phase to secret')),
|
|
|
('f', 'force', False, _('allow to move boundary backward')),
|
|
|
('r', 'rev', [], _('target revision'), _('REV')),
|
|
|
],
|
|
|
_('[-p|-d|-s] [-f] [-r] [REV...]'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
|
def phase(ui, repo, *revs, **opts):
|
|
|
"""set or show the current phase name
|
|
|
|
|
|
With no argument, show the phase name of the current revision(s).
|
|
|
|
|
|
With one of -p/--public, -d/--draft or -s/--secret, change the
|
|
|
phase value of the specified revisions.
|
|
|
|
|
|
Unless -f/--force is specified, :hg:`phase` won't move changesets from a
|
|
|
lower phase to a higher phase. Phases are ordered as follows::
|
|
|
|
|
|
public < draft < secret
|
|
|
|
|
|
Returns 0 on success, 1 if some phases could not be changed.
|
|
|
|
|
|
(For more information about the phases concept, see :hg:`help phases`.)
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
# search for a unique phase argument
|
|
|
targetphase = None
|
|
|
for idx, name in enumerate(phases.cmdphasenames):
|
|
|
if opts[name]:
|
|
|
if targetphase is not None:
|
|
|
raise error.Abort(_('only one phase can be specified'))
|
|
|
targetphase = idx
|
|
|
|
|
|
# look for specified revision
|
|
|
revs = list(revs)
|
|
|
revs.extend(opts['rev'])
|
|
|
if not revs:
|
|
|
# display both parents as the second parent phase can influence
|
|
|
# the phase of a merge commit
|
|
|
revs = [c.rev() for c in repo[None].parents()]
|
|
|
|
|
|
revs = scmutil.revrange(repo, revs)
|
|
|
|
|
|
ret = 0
|
|
|
if targetphase is None:
|
|
|
# display
|
|
|
for r in revs:
|
|
|
ctx = repo[r]
|
|
|
ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
|
|
|
else:
|
|
|
with repo.lock(), repo.transaction("phase") as tr:
|
|
|
# set phase
|
|
|
if not revs:
|
|
|
raise error.Abort(_('empty revision set'))
|
|
|
nodes = [repo[r].node() for r in revs]
|
|
|
# moving revision from public to draft may hide them
|
|
|
# We have to check result on an unfiltered repository
|
|
|
unfi = repo.unfiltered()
|
|
|
getphase = unfi._phasecache.phase
|
|
|
olddata = [getphase(unfi, r) for r in unfi]
|
|
|
phases.advanceboundary(repo, tr, targetphase, nodes)
|
|
|
if opts['force']:
|
|
|
phases.retractboundary(repo, tr, targetphase, nodes)
|
|
|
getphase = unfi._phasecache.phase
|
|
|
newdata = [getphase(unfi, r) for r in unfi]
|
|
|
changes = sum(newdata[r] != olddata[r] for r in unfi)
|
|
|
cl = unfi.changelog
|
|
|
rejected = [n for n in nodes
|
|
|
if newdata[cl.rev(n)] < targetphase]
|
|
|
if rejected:
|
|
|
ui.warn(_('cannot move %i changesets to a higher '
|
|
|
'phase, use --force\n') % len(rejected))
|
|
|
ret = 1
|
|
|
if changes:
|
|
|
msg = _('phase changed for %i changesets\n') % changes
|
|
|
if ret:
|
|
|
ui.status(msg)
|
|
|
else:
|
|
|
ui.note(msg)
|
|
|
else:
|
|
|
ui.warn(_('no phases changed\n'))
|
|
|
return ret
|
|
|
|
|
|
def postincoming(ui, repo, modheads, optupdate, checkout, brev):
|
|
|
"""Run after a changegroup has been added via pull/unbundle
|
|
|
|
|
|
This takes arguments below:
|
|
|
|
|
|
:modheads: change of heads by pull/unbundle
|
|
|
:optupdate: updating working directory is needed or not
|
|
|
:checkout: update destination revision (or None to default destination)
|
|
|
:brev: a name, which might be a bookmark to be activated after updating
|
|
|
"""
|
|
|
if modheads == 0:
|
|
|
return
|
|
|
if optupdate:
|
|
|
try:
|
|
|
return hg.updatetotally(ui, repo, checkout, brev)
|
|
|
except error.UpdateAbort as inst:
|
|
|
msg = _("not updating: %s") % stringutil.forcebytestr(inst)
|
|
|
hint = inst.hint
|
|
|
raise error.UpdateAbort(msg, hint=hint)
|
|
|
if modheads > 1:
|
|
|
currentbranchheads = len(repo.branchheads())
|
|
|
if currentbranchheads == modheads:
|
|
|
ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
|
|
|
elif currentbranchheads > 1:
|
|
|
ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
|
|
|
"merge)\n"))
|
|
|
else:
|
|
|
ui.status(_("(run 'hg heads' to see heads)\n"))
|
|
|
elif not ui.configbool('commands', 'update.requiredest'):
|
|
|
ui.status(_("(run 'hg update' to get a working copy)\n"))
|
|
|
|
|
|
@command('pull',
|
|
|
[('u', 'update', None,
|
|
|
_('update to new branch head if new descendants were pulled')),
|
|
|
('f', 'force', None, _('run even when remote repository is unrelated')),
|
|
|
('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
|
|
|
('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
|
|
|
('b', 'branch', [], _('a specific branch you would like to pull'),
|
|
|
_('BRANCH')),
|
|
|
] + remoteopts,
|
|
|
_('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
|
|
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
|
helpbasic=True)
|
|
|
def pull(ui, repo, source="default", **opts):
|
|
|
"""pull changes from the specified source
|
|
|
|
|
|
Pull changes from a remote repository to a local one.
|
|
|
|
|
|
This finds all changes from the repository at the specified path
|
|
|
or URL and adds them to a local repository (the current one unless
|
|
|
-R is specified). By default, this does not update the copy of the
|
|
|
project in the working directory.
|
|
|
|
|
|
When cloning from servers that support it, Mercurial may fetch
|
|
|
pre-generated data. When this is done, hooks operating on incoming
|
|
|
changesets and changegroups may fire more than once, once for each
|
|
|
pre-generated bundle and as well as for any additional remaining
|
|
|
data. See :hg:`help -e clonebundles` for more.
|
|
|
|
|
|
Use :hg:`incoming` if you want to see what would have been added
|
|
|
by a pull at the time you issued this command. If you then decide
|
|
|
to add those changes to the repository, you should use :hg:`pull
|
|
|
-r X` where ``X`` is the last changeset listed by :hg:`incoming`.
|
|
|
|
|
|
If SOURCE is omitted, the 'default' path will be used.
|
|
|
See :hg:`help urls` for more information.
|
|
|
|
|
|
Specifying bookmark as ``.`` is equivalent to specifying the active
|
|
|
bookmark's name.
|
|
|
|
|
|
Returns 0 on success, 1 if an update had unresolved files.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
|
|
|
msg = _('update destination required by configuration')
|
|
|
hint = _('use hg pull followed by hg update DEST')
|
|
|
raise error.Abort(msg, hint=hint)
|
|
|
|
|
|
source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
|
|
|
ui.status(_('pulling from %s\n') % util.hidepassword(source))
|
|
|
other = hg.peer(repo, opts, source)
|
|
|
try:
|
|
|
revs, checkout = hg.addbranchrevs(repo, other, branches,
|
|
|
opts.get('rev'))
|
|
|
|
|
|
|
|
|
pullopargs = {}
|
|
|
if opts.get('bookmark'):
|
|
|
if not revs:
|
|
|
revs = []
|
|
|
# The list of bookmark used here is not the one used to actually
|
|
|
# update the bookmark name. This can result in the revision pulled
|
|
|
# not ending up with the name of the bookmark because of a race
|
|
|
# condition on the server. (See issue 4689 for details)
|
|
|
remotebookmarks = other.listkeys('bookmarks')
|
|
|
remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
|
|
|
pullopargs['remotebookmarks'] = remotebookmarks
|
|
|
for b in opts['bookmark']:
|
|
|
b = repo._bookmarks.expandname(b)
|
|
|
if b not in remotebookmarks:
|
|
|
raise error.Abort(_('remote bookmark %s not found!') % b)
|
|
|
revs.append(hex(remotebookmarks[b]))
|
|
|
|
|
|
if revs:
|
|
|
try:
|
|
|
# When 'rev' is a bookmark name, we cannot guarantee that it
|
|
|
# will be updated with that name because of a race condition
|
|
|
# server side. (See issue 4689 for details)
|
|
|
oldrevs = revs
|
|
|
revs = [] # actually, nodes
|
|
|
for r in oldrevs:
|
|
|
with other.commandexecutor() as e:
|
|
|
node = e.callcommand('lookup', {'key': r}).result()
|
|
|
|
|
|
revs.append(node)
|
|
|
if r == checkout:
|
|
|
checkout = node
|
|
|
except error.CapabilityError:
|
|
|
err = _("other repository doesn't support revision lookup, "
|
|
|
"so a rev cannot be specified.")
|
|
|
raise error.Abort(err)
|
|
|
|
|
|
wlock = util.nullcontextmanager()
|
|
|
if opts.get('update'):
|
|
|
wlock = repo.wlock()
|
|
|
with wlock:
|
|
|
pullopargs.update(opts.get('opargs', {}))
|
|
|
modheads = exchange.pull(repo, other, heads=revs,
|
|
|
force=opts.get('force'),
|
|
|
bookmarks=opts.get('bookmark', ()),
|
|
|
opargs=pullopargs).cgresult
|
|
|
|
|
|
# brev is a name, which might be a bookmark to be activated at
|
|
|
# the end of the update. In other words, it is an explicit
|
|
|
# destination of the update
|
|
|
brev = None
|
|
|
|
|
|
if checkout:
|
|
|
checkout = repo.changelog.rev(checkout)
|
|
|
|
|
|
# order below depends on implementation of
|
|
|
# hg.addbranchrevs(). opts['bookmark'] is ignored,
|
|
|
# because 'checkout' is determined without it.
|
|
|
if opts.get('rev'):
|
|
|
brev = opts['rev'][0]
|
|
|
elif opts.get('branch'):
|
|
|
brev = opts['branch'][0]
|
|
|
else:
|
|
|
brev = branches[0]
|
|
|
repo._subtoppath = source
|
|
|
try:
|
|
|
ret = postincoming(ui, repo, modheads, opts.get('update'),
|
|
|
checkout, brev)
|
|
|
|
|
|
finally:
|
|
|
del repo._subtoppath
|
|
|
|
|
|
finally:
|
|
|
other.close()
|
|
|
return ret
|
|
|
|
|
|
@command('push',
|
|
|
[('f', 'force', None, _('force push')),
|
|
|
('r', 'rev', [],
|
|
|
_('a changeset intended to be included in the destination'),
|
|
|
_('REV')),
|
|
|
('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
|
|
|
('b', 'branch', [],
|
|
|
_('a specific branch you would like to push'), _('BRANCH')),
|
|
|
('', 'new-branch', False, _('allow pushing a new branch')),
|
|
|
('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
|
|
|
('', 'publish', False, _('push the changeset as public (EXPERIMENTAL)')),
|
|
|
] + remoteopts,
|
|
|
_('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
|
|
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
|
helpbasic=True)
|
|
|
def push(ui, repo, dest=None, **opts):
|
|
|
"""push changes to the specified destination
|
|
|
|
|
|
Push changesets from the local repository to the specified
|
|
|
destination.
|
|
|
|
|
|
This operation is symmetrical to pull: it is identical to a pull
|
|
|
in the destination repository from the current one.
|
|
|
|
|
|
By default, push will not allow creation of new heads at the
|
|
|
destination, since multiple heads would make it unclear which head
|
|
|
to use. In this situation, it is recommended to pull and merge
|
|
|
before pushing.
|
|
|
|
|
|
Use --new-branch if you want to allow push to create a new named
|
|
|
branch that is not present at the destination. This allows you to
|
|
|
only create a new branch without forcing other changes.
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
Extra care should be taken with the -f/--force option,
|
|
|
which will push all new heads on all branches, an action which will
|
|
|
almost always cause confusion for collaborators.
|
|
|
|
|
|
If -r/--rev is used, the specified revision and all its ancestors
|
|
|
will be pushed to the remote repository.
|
|
|
|
|
|
If -B/--bookmark is used, the specified bookmarked revision, its
|
|
|
ancestors, and the bookmark will be pushed to the remote
|
|
|
repository. Specifying ``.`` is equivalent to specifying the active
|
|
|
bookmark's name.
|
|
|
|
|
|
Please see :hg:`help urls` for important details about ``ssh://``
|
|
|
URLs. If DESTINATION is omitted, a default path will be used.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
The --pushvars option sends strings to the server that become
|
|
|
environment variables prepended with ``HG_USERVAR_``. For example,
|
|
|
``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
|
|
|
``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
|
|
|
|
|
|
pushvars can provide for user-overridable hooks as well as set debug
|
|
|
levels. One example is having a hook that blocks commits containing
|
|
|
conflict markers, but enables the user to override the hook if the file
|
|
|
is using conflict markers for testing purposes or the file format has
|
|
|
strings that look like conflict markers.
|
|
|
|
|
|
By default, servers will ignore `--pushvars`. To enable it add the
|
|
|
following to your configuration file::
|
|
|
|
|
|
[push]
|
|
|
pushvars.server = true
|
|
|
|
|
|
Returns 0 if push was successful, 1 if nothing to push.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if opts.get('bookmark'):
|
|
|
ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
|
|
|
for b in opts['bookmark']:
|
|
|
# translate -B options to -r so changesets get pushed
|
|
|
b = repo._bookmarks.expandname(b)
|
|
|
if b in repo._bookmarks:
|
|
|
opts.setdefault('rev', []).append(b)
|
|
|
else:
|
|
|
# if we try to push a deleted bookmark, translate it to null
|
|
|
# this lets simultaneous -r, -b options continue working
|
|
|
opts.setdefault('rev', []).append("null")
|
|
|
|
|
|
path = ui.paths.getpath(dest, default=('default-push', 'default'))
|
|
|
if not path:
|
|
|
raise error.Abort(_('default repository not configured!'),
|
|
|
hint=_("see 'hg help config.paths'"))
|
|
|
dest = path.pushloc or path.loc
|
|
|
branches = (path.branch, opts.get('branch') or [])
|
|
|
ui.status(_('pushing to %s\n') % util.hidepassword(dest))
|
|
|
revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
|
|
|
other = hg.peer(repo, opts, dest)
|
|
|
|
|
|
if revs:
|
|
|
revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
|
|
|
if not revs:
|
|
|
raise error.Abort(_("specified revisions evaluate to an empty set"),
|
|
|
hint=_("use different revision arguments"))
|
|
|
elif path.pushrev:
|
|
|
# It doesn't make any sense to specify ancestor revisions. So limit
|
|
|
# to DAG heads to make discovery simpler.
|
|
|
expr = revsetlang.formatspec('heads(%r)', path.pushrev)
|
|
|
revs = scmutil.revrange(repo, [expr])
|
|
|
revs = [repo[rev].node() for rev in revs]
|
|
|
if not revs:
|
|
|
raise error.Abort(_('default push revset for path evaluates to an '
|
|
|
'empty set'))
|
|
|
|
|
|
repo._subtoppath = dest
|
|
|
try:
|
|
|
# push subrepos depth-first for coherent ordering
|
|
|
c = repo['.']
|
|
|
subs = c.substate # only repos that are committed
|
|
|
for s in sorted(subs):
|
|
|
result = c.sub(s).push(opts)
|
|
|
if result == 0:
|
|
|
return not result
|
|
|
finally:
|
|
|
del repo._subtoppath
|
|
|
|
|
|
opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
|
|
|
opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
|
|
|
|
|
|
pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
|
|
|
newbranch=opts.get('new_branch'),
|
|
|
bookmarks=opts.get('bookmark', ()),
|
|
|
publish=opts.get('publish'),
|
|
|
opargs=opargs)
|
|
|
|
|
|
result = not pushop.cgresult
|
|
|
|
|
|
if pushop.bkresult is not None:
|
|
|
if pushop.bkresult == 2:
|
|
|
result = 2
|
|
|
elif not result and pushop.bkresult:
|
|
|
result = 2
|
|
|
|
|
|
return result
|
|
|
|
|
|
@command('recover', [], helpcategory=command.CATEGORY_MAINTENANCE)
|
|
|
def recover(ui, repo):
|
|
|
"""roll back an interrupted transaction
|
|
|
|
|
|
Recover from an interrupted commit or pull.
|
|
|
|
|
|
This command tries to fix the repository status after an
|
|
|
interrupted operation. It should only be necessary when Mercurial
|
|
|
suggests it.
|
|
|
|
|
|
Returns 0 if successful, 1 if nothing to recover or verify fails.
|
|
|
"""
|
|
|
if repo.recover():
|
|
|
return hg.verify(repo)
|
|
|
return 1
|
|
|
|
|
|
@command('remove|rm',
|
|
|
[('A', 'after', None, _('record delete for missing files')),
|
|
|
('f', 'force', None,
|
|
|
_('forget added files, delete modified files')),
|
|
|
] + subrepoopts + walkopts + dryrunopts,
|
|
|
_('[OPTION]... FILE...'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
helpbasic=True, inferrepo=True)
|
|
|
def remove(ui, repo, *pats, **opts):
|
|
|
"""remove the specified files on the next commit
|
|
|
|
|
|
Schedule the indicated files for removal from the current branch.
|
|
|
|
|
|
This command schedules the files to be removed at the next commit.
|
|
|
To undo a remove before that, see :hg:`revert`. To undo added
|
|
|
files, see :hg:`forget`.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
-A/--after can be used to remove only files that have already
|
|
|
been deleted, -f/--force can be used to force deletion, and -Af
|
|
|
can be used to remove files from the next revision without
|
|
|
deleting them from the working directory.
|
|
|
|
|
|
The following table details the behavior of remove for different
|
|
|
file states (columns) and option combinations (rows). The file
|
|
|
states are Added [A], Clean [C], Modified [M] and Missing [!]
|
|
|
(as reported by :hg:`status`). The actions are Warn, Remove
|
|
|
(from branch) and Delete (from disk):
|
|
|
|
|
|
========= == == == ==
|
|
|
opt/state A C M !
|
|
|
========= == == == ==
|
|
|
none W RD W R
|
|
|
-f R RD RD R
|
|
|
-A W W W R
|
|
|
-Af R R R R
|
|
|
========= == == == ==
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
:hg:`remove` never deletes files in Added [A] state from the
|
|
|
working directory, not even if ``--force`` is specified.
|
|
|
|
|
|
Returns 0 on success, 1 if any warnings encountered.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
after, force = opts.get('after'), opts.get('force')
|
|
|
dryrun = opts.get('dry_run')
|
|
|
if not pats and not after:
|
|
|
raise error.Abort(_('no files specified'))
|
|
|
|
|
|
m = scmutil.match(repo[None], pats, opts)
|
|
|
subrepos = opts.get('subrepos')
|
|
|
return cmdutil.remove(ui, repo, m, "", after, force, subrepos,
|
|
|
dryrun=dryrun)
|
|
|
|
|
|
@command('rename|move|mv',
|
|
|
[('A', 'after', None, _('record a rename that has already occurred')),
|
|
|
('f', 'force', None, _('forcibly copy over an existing managed file')),
|
|
|
] + walkopts + dryrunopts,
|
|
|
_('[OPTION]... SOURCE... DEST'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
|
def rename(ui, repo, *pats, **opts):
|
|
|
"""rename files; equivalent of copy + remove
|
|
|
|
|
|
Mark dest as copies of sources; mark sources for deletion. If dest
|
|
|
is a directory, copies are put in that directory. If dest is a
|
|
|
file, there can only be one source.
|
|
|
|
|
|
By default, this command copies the contents of files as they
|
|
|
exist in the working directory. If invoked with -A/--after, the
|
|
|
operation is recorded, but no copying is performed.
|
|
|
|
|
|
This command takes effect at the next commit. To undo a rename
|
|
|
before that, see :hg:`revert`.
|
|
|
|
|
|
Returns 0 on success, 1 if errors are encountered.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
with repo.wlock(False):
|
|
|
return cmdutil.copy(ui, repo, pats, opts, rename=True)
|
|
|
|
|
|
@command('resolve',
|
|
|
[('a', 'all', None, _('select all unresolved files')),
|
|
|
('l', 'list', None, _('list state of files needing merge')),
|
|
|
('m', 'mark', None, _('mark files as resolved')),
|
|
|
('u', 'unmark', None, _('mark files as unresolved')),
|
|
|
('n', 'no-status', None, _('hide status prefix')),
|
|
|
('', 're-merge', None, _('re-merge files'))]
|
|
|
+ mergetoolopts + walkopts + formatteropts,
|
|
|
_('[OPTION]... [FILE]...'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
inferrepo=True)
|
|
|
def resolve(ui, repo, *pats, **opts):
|
|
|
"""redo merges or set/view the merge status of files
|
|
|
|
|
|
Merges with unresolved conflicts are often the result of
|
|
|
non-interactive merging using the ``internal:merge`` configuration
|
|
|
setting, or a command-line merge tool like ``diff3``. The resolve
|
|
|
command is used to manage the files involved in a merge, after
|
|
|
:hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
|
|
|
working directory must have two parents). See :hg:`help
|
|
|
merge-tools` for information on configuring merge tools.
|
|
|
|
|
|
The resolve command can be used in the following ways:
|
|
|
|
|
|
- :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
|
|
|
the specified files, discarding any previous merge attempts. Re-merging
|
|
|
is not performed for files already marked as resolved. Use ``--all/-a``
|
|
|
to select all unresolved files. ``--tool`` can be used to specify
|
|
|
the merge tool used for the given files. It overrides the HGMERGE
|
|
|
environment variable and your configuration files. Previous file
|
|
|
contents are saved with a ``.orig`` suffix.
|
|
|
|
|
|
- :hg:`resolve -m [FILE]`: mark a file as having been resolved
|
|
|
(e.g. after having manually fixed-up the files). The default is
|
|
|
to mark all unresolved files.
|
|
|
|
|
|
- :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
|
|
|
default is to mark all resolved files.
|
|
|
|
|
|
- :hg:`resolve -l`: list files which had or still have conflicts.
|
|
|
In the printed list, ``U`` = unresolved and ``R`` = resolved.
|
|
|
You can use ``set:unresolved()`` or ``set:resolved()`` to filter
|
|
|
the list. See :hg:`help filesets` for details.
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
Mercurial will not let you commit files with unresolved merge
|
|
|
conflicts. You must use :hg:`resolve -m ...` before you can
|
|
|
commit after a conflicting merge.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions. See also :hg:`help templates`.
|
|
|
|
|
|
:mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
|
|
|
:path: String. Repository-absolute path of the file.
|
|
|
|
|
|
Returns 0 on success, 1 if any files fail a resolve attempt.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
confirm = ui.configbool('commands', 'resolve.confirm')
|
|
|
flaglist = 'all mark unmark list no_status re_merge'.split()
|
|
|
all, mark, unmark, show, nostatus, remerge = \
|
|
|
[opts.get(o) for o in flaglist]
|
|
|
|
|
|
actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
|
|
|
if actioncount > 1:
|
|
|
raise error.Abort(_("too many actions specified"))
|
|
|
elif (actioncount == 0
|
|
|
and ui.configbool('commands', 'resolve.explicit-re-merge')):
|
|
|
hint = _('use --mark, --unmark, --list or --re-merge')
|
|
|
raise error.Abort(_('no action specified'), hint=hint)
|
|
|
if pats and all:
|
|
|
raise error.Abort(_("can't specify --all and patterns"))
|
|
|
if not (all or pats or show or mark or unmark):
|
|
|
raise error.Abort(_('no files or directories specified'),
|
|
|
hint=('use --all to re-merge all unresolved files'))
|
|
|
|
|
|
if confirm:
|
|
|
if all:
|
|
|
if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
|
|
|
b'$$ &Yes $$ &No')):
|
|
|
raise error.Abort(_('user quit'))
|
|
|
if mark and not pats:
|
|
|
if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
|
|
|
b'$$ &Yes $$ &No')):
|
|
|
raise error.Abort(_('user quit'))
|
|
|
if unmark and not pats:
|
|
|
if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
|
|
|
b'$$ &Yes $$ &No')):
|
|
|
raise error.Abort(_('user quit'))
|
|
|
|
|
|
if show:
|
|
|
ui.pager('resolve')
|
|
|
fm = ui.formatter('resolve', opts)
|
|
|
ms = mergemod.mergestate.read(repo)
|
|
|
wctx = repo[None]
|
|
|
m = scmutil.match(wctx, pats, opts)
|
|
|
|
|
|
# Labels and keys based on merge state. Unresolved path conflicts show
|
|
|
# as 'P'. Resolved path conflicts show as 'R', the same as normal
|
|
|
# resolved conflicts.
|
|
|
mergestateinfo = {
|
|
|
mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
|
|
|
mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
|
|
|
mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
|
|
|
mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
|
|
|
mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
|
|
|
'D'),
|
|
|
}
|
|
|
|
|
|
for f in ms:
|
|
|
if not m(f):
|
|
|
continue
|
|
|
|
|
|
label, key = mergestateinfo[ms[f]]
|
|
|
fm.startitem()
|
|
|
fm.context(ctx=wctx)
|
|
|
fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
|
|
|
fm.write('path', '%s\n', f, label=label)
|
|
|
fm.end()
|
|
|
return 0
|
|
|
|
|
|
with repo.wlock():
|
|
|
ms = mergemod.mergestate.read(repo)
|
|
|
|
|
|
if not (ms.active() or repo.dirstate.p2() != nullid):
|
|
|
raise error.Abort(
|
|
|
_('resolve command not applicable when not merging'))
|
|
|
|
|
|
wctx = repo[None]
|
|
|
|
|
|
if (ms.mergedriver
|
|
|
and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
|
|
|
proceed = mergemod.driverpreprocess(repo, ms, wctx)
|
|
|
ms.commit()
|
|
|
# allow mark and unmark to go through
|
|
|
if not mark and not unmark and not proceed:
|
|
|
return 1
|
|
|
|
|
|
m = scmutil.match(wctx, pats, opts)
|
|
|
ret = 0
|
|
|
didwork = False
|
|
|
runconclude = False
|
|
|
|
|
|
tocomplete = []
|
|
|
hasconflictmarkers = []
|
|
|
if mark:
|
|
|
markcheck = ui.config('commands', 'resolve.mark-check')
|
|
|
if markcheck not in ['warn', 'abort']:
|
|
|
# Treat all invalid / unrecognized values as 'none'.
|
|
|
markcheck = False
|
|
|
for f in ms:
|
|
|
if not m(f):
|
|
|
continue
|
|
|
|
|
|
didwork = True
|
|
|
|
|
|
# don't let driver-resolved files be marked, and run the conclude
|
|
|
# step if asked to resolve
|
|
|
if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
|
|
|
exact = m.exact(f)
|
|
|
if mark:
|
|
|
if exact:
|
|
|
ui.warn(_('not marking %s as it is driver-resolved\n')
|
|
|
% f)
|
|
|
elif unmark:
|
|
|
if exact:
|
|
|
ui.warn(_('not unmarking %s as it is driver-resolved\n')
|
|
|
% f)
|
|
|
else:
|
|
|
runconclude = True
|
|
|
continue
|
|
|
|
|
|
# path conflicts must be resolved manually
|
|
|
if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
|
|
|
mergemod.MERGE_RECORD_RESOLVED_PATH):
|
|
|
if mark:
|
|
|
ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
|
|
|
elif unmark:
|
|
|
ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
|
|
|
elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
|
|
|
ui.warn(_('%s: path conflict must be resolved manually\n')
|
|
|
% f)
|
|
|
continue
|
|
|
|
|
|
if mark:
|
|
|
if markcheck:
|
|
|
with repo.wvfs(f) as fobj:
|
|
|
fdata = fobj.read()
|
|
|
if filemerge.hasconflictmarkers(fdata) and \
|
|
|
ms[f] != mergemod.MERGE_RECORD_RESOLVED:
|
|
|
hasconflictmarkers.append(f)
|
|
|
ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
|
|
|
elif unmark:
|
|
|
ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
|
|
|
else:
|
|
|
# backup pre-resolve (merge uses .orig for its own purposes)
|
|
|
a = repo.wjoin(f)
|
|
|
try:
|
|
|
util.copyfile(a, a + ".resolve")
|
|
|
except (IOError, OSError) as inst:
|
|
|
if inst.errno != errno.ENOENT:
|
|
|
raise
|
|
|
|
|
|
try:
|
|
|
# preresolve file
|
|
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
with ui.configoverride(overrides, 'resolve'):
|
|
|
complete, r = ms.preresolve(f, wctx)
|
|
|
if not complete:
|
|
|
tocomplete.append(f)
|
|
|
elif r:
|
|
|
ret = 1
|
|
|
finally:
|
|
|
ms.commit()
|
|
|
|
|
|
# replace filemerge's .orig file with our resolve file, but only
|
|
|
# for merges that are complete
|
|
|
if complete:
|
|
|
try:
|
|
|
util.rename(a + ".resolve",
|
|
|
scmutil.origpath(ui, repo, a))
|
|
|
except OSError as inst:
|
|
|
if inst.errno != errno.ENOENT:
|
|
|
raise
|
|
|
|
|
|
if hasconflictmarkers:
|
|
|
ui.warn(_('warning: the following files still have conflict '
|
|
|
'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
|
|
|
if markcheck == 'abort' and not all and not pats:
|
|
|
raise error.Abort(_('conflict markers detected'),
|
|
|
hint=_('use --all to mark anyway'))
|
|
|
|
|
|
for f in tocomplete:
|
|
|
try:
|
|
|
# resolve file
|
|
|
overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
|
|
|
with ui.configoverride(overrides, 'resolve'):
|
|
|
r = ms.resolve(f, wctx)
|
|
|
if r:
|
|
|
ret = 1
|
|
|
finally:
|
|
|
ms.commit()
|
|
|
|
|
|
# replace filemerge's .orig file with our resolve file
|
|
|
a = repo.wjoin(f)
|
|
|
try:
|
|
|
util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
|
|
|
except OSError as inst:
|
|
|
if inst.errno != errno.ENOENT:
|
|
|
raise
|
|
|
|
|
|
ms.commit()
|
|
|
ms.recordactions()
|
|
|
|
|
|
if not didwork and pats:
|
|
|
hint = None
|
|
|
if not any([p for p in pats if p.find(':') >= 0]):
|
|
|
pats = ['path:%s' % p for p in pats]
|
|
|
m = scmutil.match(wctx, pats, opts)
|
|
|
for f in ms:
|
|
|
if not m(f):
|
|
|
continue
|
|
|
def flag(o):
|
|
|
if o == 're_merge':
|
|
|
return '--re-merge '
|
|
|
return '-%s ' % o[0:1]
|
|
|
flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
|
|
|
hint = _("(try: hg resolve %s%s)\n") % (
|
|
|
flags,
|
|
|
' '.join(pats))
|
|
|
break
|
|
|
ui.warn(_("arguments do not match paths that need resolving\n"))
|
|
|
if hint:
|
|
|
ui.warn(hint)
|
|
|
elif ms.mergedriver and ms.mdstate() != 's':
|
|
|
# run conclude step when either a driver-resolved file is requested
|
|
|
# or there are no driver-resolved files
|
|
|
# we can't use 'ret' to determine whether any files are unresolved
|
|
|
# because we might not have tried to resolve some
|
|
|
if ((runconclude or not list(ms.driverresolved()))
|
|
|
and not list(ms.unresolved())):
|
|
|
proceed = mergemod.driverconclude(repo, ms, wctx)
|
|
|
ms.commit()
|
|
|
if not proceed:
|
|
|
return 1
|
|
|
|
|
|
# Nudge users into finishing an unfinished operation
|
|
|
unresolvedf = list(ms.unresolved())
|
|
|
driverresolvedf = list(ms.driverresolved())
|
|
|
if not unresolvedf and not driverresolvedf:
|
|
|
ui.status(_('(no more unresolved files)\n'))
|
|
|
cmdutil.checkafterresolved(repo)
|
|
|
elif not unresolvedf:
|
|
|
ui.status(_('(no more unresolved files -- '
|
|
|
'run "hg resolve --all" to conclude)\n'))
|
|
|
|
|
|
return ret
|
|
|
|
|
|
@command('revert',
|
|
|
[('a', 'all', None, _('revert all changes when no arguments given')),
|
|
|
('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
|
|
|
('r', 'rev', '', _('revert to the specified revision'), _('REV')),
|
|
|
('C', 'no-backup', None, _('do not save backup copies of files')),
|
|
|
('i', 'interactive', None, _('interactively select the changes')),
|
|
|
] + walkopts + dryrunopts,
|
|
|
_('[OPTION]... [-r REV] [NAME]...'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
|
def revert(ui, repo, *pats, **opts):
|
|
|
"""restore files to their checkout state
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
To check out earlier revisions, you should use :hg:`update REV`.
|
|
|
To cancel an uncommitted merge (and lose your changes),
|
|
|
use :hg:`merge --abort`.
|
|
|
|
|
|
With no revision specified, revert the specified files or directories
|
|
|
to the contents they had in the parent of the working directory.
|
|
|
This restores the contents of files to an unmodified
|
|
|
state and unschedules adds, removes, copies, and renames. If the
|
|
|
working directory has two parents, you must explicitly specify a
|
|
|
revision.
|
|
|
|
|
|
Using the -r/--rev or -d/--date options, revert the given files or
|
|
|
directories to their states as of a specific revision. Because
|
|
|
revert does not change the working directory parents, this will
|
|
|
cause these files to appear modified. This can be helpful to "back
|
|
|
out" some or all of an earlier change. See :hg:`backout` for a
|
|
|
related method.
|
|
|
|
|
|
Modified files are saved with a .orig suffix before reverting.
|
|
|
To disable these backups, use --no-backup. It is possible to store
|
|
|
the backup files in a custom directory relative to the root of the
|
|
|
repository by setting the ``ui.origbackuppath`` configuration
|
|
|
option.
|
|
|
|
|
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
|
|
|
See :hg:`help backout` for a way to reverse the effect of an
|
|
|
earlier changeset.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if opts.get("date"):
|
|
|
if opts.get("rev"):
|
|
|
raise error.Abort(_("you can't specify a revision and a date"))
|
|
|
opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
|
|
|
|
|
|
parent, p2 = repo.dirstate.parents()
|
|
|
if not opts.get('rev') and p2 != nullid:
|
|
|
# revert after merge is a trap for new users (issue2915)
|
|
|
raise error.Abort(_('uncommitted merge with no revision specified'),
|
|
|
hint=_("use 'hg update' or see 'hg help revert'"))
|
|
|
|
|
|
rev = opts.get('rev')
|
|
|
if rev:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
ctx = scmutil.revsingle(repo, rev)
|
|
|
|
|
|
if (not (pats or opts.get('include') or opts.get('exclude') or
|
|
|
opts.get('all') or opts.get('interactive'))):
|
|
|
msg = _("no files or directories specified")
|
|
|
if p2 != nullid:
|
|
|
hint = _("uncommitted merge, use --all to discard all changes,"
|
|
|
" or 'hg update -C .' to abort the merge")
|
|
|
raise error.Abort(msg, hint=hint)
|
|
|
dirty = any(repo.status())
|
|
|
node = ctx.node()
|
|
|
if node != parent:
|
|
|
if dirty:
|
|
|
hint = _("uncommitted changes, use --all to discard all"
|
|
|
" changes, or 'hg update %d' to update") % ctx.rev()
|
|
|
else:
|
|
|
hint = _("use --all to revert all files,"
|
|
|
" or 'hg update %d' to update") % ctx.rev()
|
|
|
elif dirty:
|
|
|
hint = _("uncommitted changes, use --all to discard all changes")
|
|
|
else:
|
|
|
hint = _("use --all to revert all files")
|
|
|
raise error.Abort(msg, hint=hint)
|
|
|
|
|
|
return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
|
|
|
**pycompat.strkwargs(opts))
|
|
|
|
|
|
@command(
|
|
|
'rollback',
|
|
|
dryrunopts + [('f', 'force', False, _('ignore safety measures'))],
|
|
|
helpcategory=command.CATEGORY_MAINTENANCE)
|
|
|
def rollback(ui, repo, **opts):
|
|
|
"""roll back the last transaction (DANGEROUS) (DEPRECATED)
|
|
|
|
|
|
Please use :hg:`commit --amend` instead of rollback to correct
|
|
|
mistakes in the last commit.
|
|
|
|
|
|
This command should be used with care. There is only one level of
|
|
|
rollback, and there is no way to undo a rollback. It will also
|
|
|
restore the dirstate at the time of the last transaction, losing
|
|
|
any dirstate changes since that time. This command does not alter
|
|
|
the working directory.
|
|
|
|
|
|
Transactions are used to encapsulate the effects of all commands
|
|
|
that create new changesets or propagate existing changesets into a
|
|
|
repository.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
For example, the following commands are transactional, and their
|
|
|
effects can be rolled back:
|
|
|
|
|
|
- commit
|
|
|
- import
|
|
|
- pull
|
|
|
- push (with this repository as the destination)
|
|
|
- unbundle
|
|
|
|
|
|
To avoid permanent data loss, rollback will refuse to rollback a
|
|
|
commit transaction if it isn't checked out. Use --force to
|
|
|
override this protection.
|
|
|
|
|
|
The rollback command can be entirely disabled by setting the
|
|
|
``ui.rollback`` configuration setting to false. If you're here
|
|
|
because you want to use rollback and it's disabled, you can
|
|
|
re-enable the command by setting ``ui.rollback`` to true.
|
|
|
|
|
|
This command is not intended for use on public repositories. Once
|
|
|
changes are visible for pull by other users, rolling a transaction
|
|
|
back locally is ineffective (someone else may already have pulled
|
|
|
the changes). Furthermore, a race is possible with readers of the
|
|
|
repository; for example an in-progress pull from the repository
|
|
|
may fail if a rollback is performed.
|
|
|
|
|
|
Returns 0 on success, 1 if no rollback data is available.
|
|
|
"""
|
|
|
if not ui.configbool('ui', 'rollback'):
|
|
|
raise error.Abort(_('rollback is disabled because it is unsafe'),
|
|
|
hint=('see `hg help -v rollback` for information'))
|
|
|
return repo.rollback(dryrun=opts.get(r'dry_run'),
|
|
|
force=opts.get(r'force'))
|
|
|
|
|
|
@command(
|
|
|
'root', [], intents={INTENT_READONLY},
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY)
|
|
|
def root(ui, repo):
|
|
|
"""print the root (top) of the current working directory
|
|
|
|
|
|
Print the root directory of the current repository.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
ui.write(repo.root + "\n")
|
|
|
|
|
|
@command('serve',
|
|
|
[('A', 'accesslog', '', _('name of access log file to write to'),
|
|
|
_('FILE')),
|
|
|
('d', 'daemon', None, _('run server in background')),
|
|
|
('', 'daemon-postexec', [], _('used internally by daemon mode')),
|
|
|
('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
|
|
|
# use string type, then we can check if something was passed
|
|
|
('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
|
|
|
('a', 'address', '', _('address to listen on (default: all interfaces)'),
|
|
|
_('ADDR')),
|
|
|
('', 'prefix', '', _('prefix path to serve from (default: server root)'),
|
|
|
_('PREFIX')),
|
|
|
('n', 'name', '',
|
|
|
_('name to show in web pages (default: working directory)'), _('NAME')),
|
|
|
('', 'web-conf', '',
|
|
|
_("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
|
|
|
('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
|
|
|
_('FILE')),
|
|
|
('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
|
|
|
('', 'stdio', None, _('for remote clients (ADVANCED)')),
|
|
|
('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
|
|
|
('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
|
|
|
('', 'style', '', _('template style to use'), _('STYLE')),
|
|
|
('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
|
|
|
('', 'certificate', '', _('SSL certificate file'), _('FILE')),
|
|
|
('', 'print-url', None, _('start and print only the URL'))]
|
|
|
+ subrepoopts,
|
|
|
_('[OPTION]...'),
|
|
|
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
|
|
|
helpbasic=True, optionalrepo=True)
|
|
|
def serve(ui, repo, **opts):
|
|
|
"""start stand-alone webserver
|
|
|
|
|
|
Start a local HTTP repository browser and pull server. You can use
|
|
|
this for ad-hoc sharing and browsing of repositories. It is
|
|
|
recommended to use a real web server to serve a repository for
|
|
|
longer periods of time.
|
|
|
|
|
|
Please note that the server does not implement access control.
|
|
|
This means that, by default, anybody can read from the server and
|
|
|
nobody can write to it by default. Set the ``web.allow-push``
|
|
|
option to ``*`` to allow everybody to push to the server. You
|
|
|
should use a real web server if you need to authenticate users.
|
|
|
|
|
|
By default, the server logs accesses to stdout and errors to
|
|
|
stderr. Use the -A/--accesslog and -E/--errorlog options to log to
|
|
|
files.
|
|
|
|
|
|
To have the server choose a free port number to listen on, specify
|
|
|
a port number of 0; in this case, the server will print the port
|
|
|
number it uses.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if opts["stdio"] and opts["cmdserver"]:
|
|
|
raise error.Abort(_("cannot use --stdio with --cmdserver"))
|
|
|
if opts["print_url"] and ui.verbose:
|
|
|
raise error.Abort(_("cannot use --print-url with --verbose"))
|
|
|
|
|
|
if opts["stdio"]:
|
|
|
if repo is None:
|
|
|
raise error.RepoError(_("there is no Mercurial repository here"
|
|
|
" (.hg not found)"))
|
|
|
s = wireprotoserver.sshserver(ui, repo)
|
|
|
s.serve_forever()
|
|
|
|
|
|
service = server.createservice(ui, repo, opts)
|
|
|
return server.runservice(opts, initfn=service.init, runfn=service.run)
|
|
|
|
|
|
_NOTTERSE = 'nothing'
|
|
|
|
|
|
@command('status|st',
|
|
|
[('A', 'all', None, _('show status of all files')),
|
|
|
('m', 'modified', None, _('show only modified files')),
|
|
|
('a', 'added', None, _('show only added files')),
|
|
|
('r', 'removed', None, _('show only removed files')),
|
|
|
('d', 'deleted', None, _('show only deleted (but tracked) files')),
|
|
|
('c', 'clean', None, _('show only files without changes')),
|
|
|
('u', 'unknown', None, _('show only unknown (not tracked) files')),
|
|
|
('i', 'ignored', None, _('show only ignored files')),
|
|
|
('n', 'no-status', None, _('hide status prefix')),
|
|
|
('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
|
|
|
('C', 'copies', None, _('show source of copied files')),
|
|
|
('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
|
|
|
('', 'rev', [], _('show difference from revision'), _('REV')),
|
|
|
('', 'change', '', _('list the changed files of a revision'), _('REV')),
|
|
|
] + walkopts + subrepoopts + formatteropts,
|
|
|
_('[OPTION]... [FILE]...'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
helpbasic=True, inferrepo=True,
|
|
|
intents={INTENT_READONLY})
|
|
|
def status(ui, repo, *pats, **opts):
|
|
|
"""show changed files in the working directory
|
|
|
|
|
|
Show status of files in the repository. If names are given, only
|
|
|
files that match are shown. Files that are clean or ignored or
|
|
|
the source of a copy/move operation, are not listed unless
|
|
|
-c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
|
|
|
Unless options described with "show only ..." are given, the
|
|
|
options -mardu are used.
|
|
|
|
|
|
Option -q/--quiet hides untracked (unknown and ignored) files
|
|
|
unless explicitly requested with -u/--unknown or -i/--ignored.
|
|
|
|
|
|
.. note::
|
|
|
|
|
|
:hg:`status` may appear to disagree with diff if permissions have
|
|
|
changed or a merge has occurred. The standard diff format does
|
|
|
not report permission changes and diff only reports changes
|
|
|
relative to one merge parent.
|
|
|
|
|
|
If one revision is given, it is used as the base revision.
|
|
|
If two revisions are given, the differences between them are
|
|
|
shown. The --change option can also be used as a shortcut to list
|
|
|
the changed files of a revision from its first parent.
|
|
|
|
|
|
The codes used to show the status of files are::
|
|
|
|
|
|
M = modified
|
|
|
A = added
|
|
|
R = removed
|
|
|
C = clean
|
|
|
! = missing (deleted by non-hg command, but still tracked)
|
|
|
? = not tracked
|
|
|
I = ignored
|
|
|
= origin of the previous file (with --copies)
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
The -t/--terse option abbreviates the output by showing only the directory
|
|
|
name if all the files in it share the same status. The option takes an
|
|
|
argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
|
|
|
for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
|
|
|
for 'ignored' and 'c' for clean.
|
|
|
|
|
|
It abbreviates only those statuses which are passed. Note that clean and
|
|
|
ignored files are not displayed with '--terse ic' unless the -c/--clean
|
|
|
and -i/--ignored options are also used.
|
|
|
|
|
|
The -v/--verbose option shows information when the repository is in an
|
|
|
unfinished merge, shelve, rebase state etc. You can have this behavior
|
|
|
turned on by default by enabling the ``commands.status.verbose`` option.
|
|
|
|
|
|
You can skip displaying some of these states by setting
|
|
|
``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
|
|
|
'histedit', 'merge', 'rebase', or 'unshelve'.
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions. See also :hg:`help templates`.
|
|
|
|
|
|
:path: String. Repository-absolute path of the file.
|
|
|
:source: String. Repository-absolute path of the file originated from.
|
|
|
Available if ``--copies`` is specified.
|
|
|
:status: String. Character denoting file's status.
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
- show changes in the working directory relative to a
|
|
|
changeset::
|
|
|
|
|
|
hg status --rev 9353
|
|
|
|
|
|
- show changes in the working directory relative to the
|
|
|
current directory (see :hg:`help patterns` for more information)::
|
|
|
|
|
|
hg status re:
|
|
|
|
|
|
- show all changes including copies in an existing changeset::
|
|
|
|
|
|
hg status --copies --change 9353
|
|
|
|
|
|
- get a NUL separated list of added files, suitable for xargs::
|
|
|
|
|
|
hg status -an0
|
|
|
|
|
|
- show more information about the repository status, abbreviating
|
|
|
added, removed, modified, deleted, and untracked paths::
|
|
|
|
|
|
hg status -v -t mardu
|
|
|
|
|
|
Returns 0 on success.
|
|
|
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
revs = opts.get('rev')
|
|
|
change = opts.get('change')
|
|
|
terse = opts.get('terse')
|
|
|
if terse is _NOTTERSE:
|
|
|
if revs:
|
|
|
terse = ''
|
|
|
else:
|
|
|
terse = ui.config('commands', 'status.terse')
|
|
|
|
|
|
if revs and change:
|
|
|
msg = _('cannot specify --rev and --change at the same time')
|
|
|
raise error.Abort(msg)
|
|
|
elif revs and terse:
|
|
|
msg = _('cannot use --terse with --rev')
|
|
|
raise error.Abort(msg)
|
|
|
elif change:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
|
|
|
ctx2 = scmutil.revsingle(repo, change, None)
|
|
|
ctx1 = ctx2.p1()
|
|
|
else:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
|
|
|
ctx1, ctx2 = scmutil.revpair(repo, revs)
|
|
|
|
|
|
if pats or ui.configbool('commands', 'status.relative'):
|
|
|
cwd = repo.getcwd()
|
|
|
else:
|
|
|
cwd = ''
|
|
|
|
|
|
if opts.get('print0'):
|
|
|
end = '\0'
|
|
|
else:
|
|
|
end = '\n'
|
|
|
copy = {}
|
|
|
states = 'modified added removed deleted unknown ignored clean'.split()
|
|
|
show = [k for k in states if opts.get(k)]
|
|
|
if opts.get('all'):
|
|
|
show += ui.quiet and (states[:4] + ['clean']) or states
|
|
|
|
|
|
if not show:
|
|
|
if ui.quiet:
|
|
|
show = states[:4]
|
|
|
else:
|
|
|
show = states[:5]
|
|
|
|
|
|
m = scmutil.match(ctx2, pats, opts)
|
|
|
if terse:
|
|
|
# we need to compute clean and unknown to terse
|
|
|
stat = repo.status(ctx1.node(), ctx2.node(), m,
|
|
|
'ignored' in show or 'i' in terse,
|
|
|
clean=True, unknown=True,
|
|
|
listsubrepos=opts.get('subrepos'))
|
|
|
|
|
|
stat = cmdutil.tersedir(stat, terse)
|
|
|
else:
|
|
|
stat = repo.status(ctx1.node(), ctx2.node(), m,
|
|
|
'ignored' in show, 'clean' in show,
|
|
|
'unknown' in show, opts.get('subrepos'))
|
|
|
|
|
|
changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
|
|
|
|
|
|
if (opts.get('all') or opts.get('copies')
|
|
|
or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
|
|
|
copy = copies.pathcopies(ctx1, ctx2, m)
|
|
|
|
|
|
ui.pager('status')
|
|
|
fm = ui.formatter('status', opts)
|
|
|
fmt = '%s' + end
|
|
|
showchar = not opts.get('no_status')
|
|
|
|
|
|
for state, char, files in changestates:
|
|
|
if state in show:
|
|
|
label = 'status.' + state
|
|
|
for f in files:
|
|
|
fm.startitem()
|
|
|
fm.context(ctx=ctx2)
|
|
|
fm.data(path=f)
|
|
|
fm.condwrite(showchar, 'status', '%s ', char, label=label)
|
|
|
fm.plain(fmt % repo.pathto(f, cwd), label=label)
|
|
|
if f in copy:
|
|
|
fm.data(source=copy[f])
|
|
|
fm.plain((' %s' + end) % repo.pathto(copy[f], cwd),
|
|
|
label='status.copied')
|
|
|
|
|
|
if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
|
|
|
and not ui.plain()):
|
|
|
cmdutil.morestatus(repo, fm)
|
|
|
fm.end()
|
|
|
|
|
|
@command('summary|sum',
|
|
|
[('', 'remote', None, _('check for push and pull'))],
|
|
|
'[--remote]',
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
helpbasic=True,
|
|
|
intents={INTENT_READONLY})
|
|
|
def summary(ui, repo, **opts):
|
|
|
"""summarize working directory state
|
|
|
|
|
|
This generates a brief summary of the working directory state,
|
|
|
including parents, branch, commit status, phase and available updates.
|
|
|
|
|
|
With the --remote option, this will check the default paths for
|
|
|
incoming and outgoing changes. This can be time-consuming.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
ui.pager('summary')
|
|
|
ctx = repo[None]
|
|
|
parents = ctx.parents()
|
|
|
pnode = parents[0].node()
|
|
|
marks = []
|
|
|
|
|
|
ms = None
|
|
|
try:
|
|
|
ms = mergemod.mergestate.read(repo)
|
|
|
except error.UnsupportedMergeRecords as e:
|
|
|
s = ' '.join(e.recordtypes)
|
|
|
ui.warn(
|
|
|
_('warning: merge state has unsupported record types: %s\n') % s)
|
|
|
unresolved = []
|
|
|
else:
|
|
|
unresolved = list(ms.unresolved())
|
|
|
|
|
|
for p in parents:
|
|
|
# label with log.changeset (instead of log.parent) since this
|
|
|
# shows a working directory parent *changeset*:
|
|
|
# i18n: column positioning for "hg summary"
|
|
|
ui.write(_('parent: %d:%s ') % (p.rev(), p),
|
|
|
label=logcmdutil.changesetlabels(p))
|
|
|
ui.write(' '.join(p.tags()), label='log.tag')
|
|
|
if p.bookmarks():
|
|
|
marks.extend(p.bookmarks())
|
|
|
if p.rev() == -1:
|
|
|
if not len(repo):
|
|
|
ui.write(_(' (empty repository)'))
|
|
|
else:
|
|
|
ui.write(_(' (no revision checked out)'))
|
|
|
if p.obsolete():
|
|
|
ui.write(_(' (obsolete)'))
|
|
|
if p.isunstable():
|
|
|
instabilities = (ui.label(instability, 'trouble.%s' % instability)
|
|
|
for instability in p.instabilities())
|
|
|
ui.write(' ('
|
|
|
+ ', '.join(instabilities)
|
|
|
+ ')')
|
|
|
ui.write('\n')
|
|
|
if p.description():
|
|
|
ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
|
|
|
label='log.summary')
|
|
|
|
|
|
branch = ctx.branch()
|
|
|
bheads = repo.branchheads(branch)
|
|
|
# i18n: column positioning for "hg summary"
|
|
|
m = _('branch: %s\n') % branch
|
|
|
if branch != 'default':
|
|
|
ui.write(m, label='log.branch')
|
|
|
else:
|
|
|
ui.status(m, label='log.branch')
|
|
|
|
|
|
if marks:
|
|
|
active = repo._activebookmark
|
|
|
# i18n: column positioning for "hg summary"
|
|
|
ui.write(_('bookmarks:'), label='log.bookmark')
|
|
|
if active is not None:
|
|
|
if active in marks:
|
|
|
ui.write(' *' + active, label=bookmarks.activebookmarklabel)
|
|
|
marks.remove(active)
|
|
|
else:
|
|
|
ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
|
|
|
for m in marks:
|
|
|
ui.write(' ' + m, label='log.bookmark')
|
|
|
ui.write('\n', label='log.bookmark')
|
|
|
|
|
|
status = repo.status(unknown=True)
|
|
|
|
|
|
c = repo.dirstate.copies()
|
|
|
copied, renamed = [], []
|
|
|
for d, s in c.iteritems():
|
|
|
if s in status.removed:
|
|
|
status.removed.remove(s)
|
|
|
renamed.append(d)
|
|
|
else:
|
|
|
copied.append(d)
|
|
|
if d in status.added:
|
|
|
status.added.remove(d)
|
|
|
|
|
|
subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
|
|
|
|
|
|
labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
|
|
|
(ui.label(_('%d added'), 'status.added'), status.added),
|
|
|
(ui.label(_('%d removed'), 'status.removed'), status.removed),
|
|
|
(ui.label(_('%d renamed'), 'status.copied'), renamed),
|
|
|
(ui.label(_('%d copied'), 'status.copied'), copied),
|
|
|
(ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
|
|
|
(ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
|
|
|
(ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
|
|
|
(ui.label(_('%d subrepos'), 'status.modified'), subs)]
|
|
|
t = []
|
|
|
for l, s in labels:
|
|
|
if s:
|
|
|
t.append(l % len(s))
|
|
|
|
|
|
t = ', '.join(t)
|
|
|
cleanworkdir = False
|
|
|
|
|
|
if repo.vfs.exists('graftstate'):
|
|
|
t += _(' (graft in progress)')
|
|
|
if repo.vfs.exists('updatestate'):
|
|
|
t += _(' (interrupted update)')
|
|
|
elif len(parents) > 1:
|
|
|
t += _(' (merge)')
|
|
|
elif branch != parents[0].branch():
|
|
|
t += _(' (new branch)')
|
|
|
elif (parents[0].closesbranch() and
|
|
|
pnode in repo.branchheads(branch, closed=True)):
|
|
|
t += _(' (head closed)')
|
|
|
elif not (status.modified or status.added or status.removed or renamed or
|
|
|
copied or subs):
|
|
|
t += _(' (clean)')
|
|
|
cleanworkdir = True
|
|
|
elif pnode not in bheads:
|
|
|
t += _(' (new branch head)')
|
|
|
|
|
|
if parents:
|
|
|
pendingphase = max(p.phase() for p in parents)
|
|
|
else:
|
|
|
pendingphase = phases.public
|
|
|
|
|
|
if pendingphase > phases.newcommitphase(ui):
|
|
|
t += ' (%s)' % phases.phasenames[pendingphase]
|
|
|
|
|
|
if cleanworkdir:
|
|
|
# i18n: column positioning for "hg summary"
|
|
|
ui.status(_('commit: %s\n') % t.strip())
|
|
|
else:
|
|
|
# i18n: column positioning for "hg summary"
|
|
|
ui.write(_('commit: %s\n') % t.strip())
|
|
|
|
|
|
# all ancestors of branch heads - all ancestors of parent = new csets
|
|
|
new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
|
|
|
bheads))
|
|
|
|
|
|
if new == 0:
|
|
|
# i18n: column positioning for "hg summary"
|
|
|
ui.status(_('update: (current)\n'))
|
|
|
elif pnode not in bheads:
|
|
|
# i18n: column positioning for "hg summary"
|
|
|
ui.write(_('update: %d new changesets (update)\n') % new)
|
|
|
else:
|
|
|
# i18n: column positioning for "hg summary"
|
|
|
ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
|
|
|
(new, len(bheads)))
|
|
|
|
|
|
t = []
|
|
|
draft = len(repo.revs('draft()'))
|
|
|
if draft:
|
|
|
t.append(_('%d draft') % draft)
|
|
|
secret = len(repo.revs('secret()'))
|
|
|
if secret:
|
|
|
t.append(_('%d secret') % secret)
|
|
|
|
|
|
if draft or secret:
|
|
|
ui.status(_('phases: %s\n') % ', '.join(t))
|
|
|
|
|
|
if obsolete.isenabled(repo, obsolete.createmarkersopt):
|
|
|
for trouble in ("orphan", "contentdivergent", "phasedivergent"):
|
|
|
numtrouble = len(repo.revs(trouble + "()"))
|
|
|
# We write all the possibilities to ease translation
|
|
|
troublemsg = {
|
|
|
"orphan": _("orphan: %d changesets"),
|
|
|
"contentdivergent": _("content-divergent: %d changesets"),
|
|
|
"phasedivergent": _("phase-divergent: %d changesets"),
|
|
|
}
|
|
|
if numtrouble > 0:
|
|
|
ui.status(troublemsg[trouble] % numtrouble + "\n")
|
|
|
|
|
|
cmdutil.summaryhooks(ui, repo)
|
|
|
|
|
|
if opts.get('remote'):
|
|
|
needsincoming, needsoutgoing = True, True
|
|
|
else:
|
|
|
needsincoming, needsoutgoing = False, False
|
|
|
for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
|
|
|
if i:
|
|
|
needsincoming = True
|
|
|
if o:
|
|
|
needsoutgoing = True
|
|
|
if not needsincoming and not needsoutgoing:
|
|
|
return
|
|
|
|
|
|
def getincoming():
|
|
|
source, branches = hg.parseurl(ui.expandpath('default'))
|
|
|
sbranch = branches[0]
|
|
|
try:
|
|
|
other = hg.peer(repo, {}, source)
|
|
|
except error.RepoError:
|
|
|
if opts.get('remote'):
|
|
|
raise
|
|
|
return source, sbranch, None, None, None
|
|
|
revs, checkout = hg.addbranchrevs(repo, other, branches, None)
|
|
|
if revs:
|
|
|
revs = [other.lookup(rev) for rev in revs]
|
|
|
ui.debug('comparing with %s\n' % util.hidepassword(source))
|
|
|
repo.ui.pushbuffer()
|
|
|
commoninc = discovery.findcommonincoming(repo, other, heads=revs)
|
|
|
repo.ui.popbuffer()
|
|
|
return source, sbranch, other, commoninc, commoninc[1]
|
|
|
|
|
|
if needsincoming:
|
|
|
source, sbranch, sother, commoninc, incoming = getincoming()
|
|
|
else:
|
|
|
source = sbranch = sother = commoninc = incoming = None
|
|
|
|
|
|
def getoutgoing():
|
|
|
dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
|
|
|
dbranch = branches[0]
|
|
|
revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
|
|
|
if source != dest:
|
|
|
try:
|
|
|
dother = hg.peer(repo, {}, dest)
|
|
|
except error.RepoError:
|
|
|
if opts.get('remote'):
|
|
|
raise
|
|
|
return dest, dbranch, None, None
|
|
|
ui.debug('comparing with %s\n' % util.hidepassword(dest))
|
|
|
elif sother is None:
|
|
|
# there is no explicit destination peer, but source one is invalid
|
|
|
return dest, dbranch, None, None
|
|
|
else:
|
|
|
dother = sother
|
|
|
if (source != dest or (sbranch is not None and sbranch != dbranch)):
|
|
|
common = None
|
|
|
else:
|
|
|
common = commoninc
|
|
|
if revs:
|
|
|
revs = [repo.lookup(rev) for rev in revs]
|
|
|
repo.ui.pushbuffer()
|
|
|
outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
|
|
|
commoninc=common)
|
|
|
repo.ui.popbuffer()
|
|
|
return dest, dbranch, dother, outgoing
|
|
|
|
|
|
if needsoutgoing:
|
|
|
dest, dbranch, dother, outgoing = getoutgoing()
|
|
|
else:
|
|
|
dest = dbranch = dother = outgoing = None
|
|
|
|
|
|
if opts.get('remote'):
|
|
|
t = []
|
|
|
if incoming:
|
|
|
t.append(_('1 or more incoming'))
|
|
|
o = outgoing.missing
|
|
|
if o:
|
|
|
t.append(_('%d outgoing') % len(o))
|
|
|
other = dother or sother
|
|
|
if 'bookmarks' in other.listkeys('namespaces'):
|
|
|
counts = bookmarks.summary(repo, other)
|
|
|
if counts[0] > 0:
|
|
|
t.append(_('%d incoming bookmarks') % counts[0])
|
|
|
if counts[1] > 0:
|
|
|
t.append(_('%d outgoing bookmarks') % counts[1])
|
|
|
|
|
|
if t:
|
|
|
# i18n: column positioning for "hg summary"
|
|
|
ui.write(_('remote: %s\n') % (', '.join(t)))
|
|
|
else:
|
|
|
# i18n: column positioning for "hg summary"
|
|
|
ui.status(_('remote: (synced)\n'))
|
|
|
|
|
|
cmdutil.summaryremotehooks(ui, repo, opts,
|
|
|
((source, sbranch, sother, commoninc),
|
|
|
(dest, dbranch, dother, outgoing)))
|
|
|
|
|
|
@command('tag',
|
|
|
[('f', 'force', None, _('force tag')),
|
|
|
('l', 'local', None, _('make the tag local')),
|
|
|
('r', 'rev', '', _('revision to tag'), _('REV')),
|
|
|
('', 'remove', None, _('remove a tag')),
|
|
|
# -l/--local is already there, commitopts cannot be used
|
|
|
('e', 'edit', None, _('invoke editor on commit messages')),
|
|
|
('m', 'message', '', _('use text as commit message'), _('TEXT')),
|
|
|
] + commitopts2,
|
|
|
_('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
|
|
|
def tag(ui, repo, name1, *names, **opts):
|
|
|
"""add one or more tags for the current or given revision
|
|
|
|
|
|
Name a particular revision using <name>.
|
|
|
|
|
|
Tags are used to name particular revisions of the repository and are
|
|
|
very useful to compare different revisions, to go back to significant
|
|
|
earlier versions or to mark branch points as releases, etc. Changing
|
|
|
an existing tag is normally disallowed; use -f/--force to override.
|
|
|
|
|
|
If no revision is given, the parent of the working directory is
|
|
|
used.
|
|
|
|
|
|
To facilitate version control, distribution, and merging of tags,
|
|
|
they are stored as a file named ".hgtags" which is managed similarly
|
|
|
to other project files and can be hand-edited if necessary. This
|
|
|
also means that tagging creates a new commit. The file
|
|
|
".hg/localtags" is used for local tags (not shared among
|
|
|
repositories).
|
|
|
|
|
|
Tag commits are usually made at the head of a branch. If the parent
|
|
|
of the working directory is not a branch head, :hg:`tag` aborts; use
|
|
|
-f/--force to force the tag commit to be based on a non-head
|
|
|
changeset.
|
|
|
|
|
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
|
|
|
Since tag names have priority over branch names during revision
|
|
|
lookup, using an existing branch name as a tag name is discouraged.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
with repo.wlock(), repo.lock():
|
|
|
rev_ = "."
|
|
|
names = [t.strip() for t in (name1,) + names]
|
|
|
if len(names) != len(set(names)):
|
|
|
raise error.Abort(_('tag names must be unique'))
|
|
|
for n in names:
|
|
|
scmutil.checknewlabel(repo, n, 'tag')
|
|
|
if not n:
|
|
|
raise error.Abort(_('tag names cannot consist entirely of '
|
|
|
'whitespace'))
|
|
|
if opts.get('rev') and opts.get('remove'):
|
|
|
raise error.Abort(_("--rev and --remove are incompatible"))
|
|
|
if opts.get('rev'):
|
|
|
rev_ = opts['rev']
|
|
|
message = opts.get('message')
|
|
|
if opts.get('remove'):
|
|
|
if opts.get('local'):
|
|
|
expectedtype = 'local'
|
|
|
else:
|
|
|
expectedtype = 'global'
|
|
|
|
|
|
for n in names:
|
|
|
if not repo.tagtype(n):
|
|
|
raise error.Abort(_("tag '%s' does not exist") % n)
|
|
|
if repo.tagtype(n) != expectedtype:
|
|
|
if expectedtype == 'global':
|
|
|
raise error.Abort(_("tag '%s' is not a global tag") % n)
|
|
|
else:
|
|
|
raise error.Abort(_("tag '%s' is not a local tag") % n)
|
|
|
rev_ = 'null'
|
|
|
if not message:
|
|
|
# we don't translate commit messages
|
|
|
message = 'Removed tag %s' % ', '.join(names)
|
|
|
elif not opts.get('force'):
|
|
|
for n in names:
|
|
|
if n in repo.tags():
|
|
|
raise error.Abort(_("tag '%s' already exists "
|
|
|
"(use -f to force)") % n)
|
|
|
if not opts.get('local'):
|
|
|
p1, p2 = repo.dirstate.parents()
|
|
|
if p2 != nullid:
|
|
|
raise error.Abort(_('uncommitted merge'))
|
|
|
bheads = repo.branchheads()
|
|
|
if not opts.get('force') and bheads and p1 not in bheads:
|
|
|
raise error.Abort(_('working directory is not at a branch head '
|
|
|
'(use -f to force)'))
|
|
|
node = scmutil.revsingle(repo, rev_).node()
|
|
|
|
|
|
if not message:
|
|
|
# we don't translate commit messages
|
|
|
message = ('Added tag %s for changeset %s' %
|
|
|
(', '.join(names), short(node)))
|
|
|
|
|
|
date = opts.get('date')
|
|
|
if date:
|
|
|
date = dateutil.parsedate(date)
|
|
|
|
|
|
if opts.get('remove'):
|
|
|
editform = 'tag.remove'
|
|
|
else:
|
|
|
editform = 'tag.add'
|
|
|
editor = cmdutil.getcommiteditor(editform=editform,
|
|
|
**pycompat.strkwargs(opts))
|
|
|
|
|
|
# don't allow tagging the null rev
|
|
|
if (not opts.get('remove') and
|
|
|
scmutil.revsingle(repo, rev_).rev() == nullrev):
|
|
|
raise error.Abort(_("cannot tag null revision"))
|
|
|
|
|
|
tagsmod.tag(repo, names, node, message, opts.get('local'),
|
|
|
opts.get('user'), date, editor=editor)
|
|
|
|
|
|
@command(
|
|
|
'tags', formatteropts, '',
|
|
|
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
|
|
|
intents={INTENT_READONLY})
|
|
|
def tags(ui, repo, **opts):
|
|
|
"""list repository tags
|
|
|
|
|
|
This lists both regular and local tags. When the -v/--verbose
|
|
|
switch is used, a third column "local" is printed for local tags.
|
|
|
When the -q/--quiet switch is used, only the tag name is printed.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported in addition to the common template
|
|
|
keywords and functions such as ``{tag}``. See also
|
|
|
:hg:`help templates`.
|
|
|
|
|
|
:type: String. ``local`` for local tags.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
ui.pager('tags')
|
|
|
fm = ui.formatter('tags', opts)
|
|
|
hexfunc = fm.hexfunc
|
|
|
tagtype = ""
|
|
|
|
|
|
for t, n in reversed(repo.tagslist()):
|
|
|
hn = hexfunc(n)
|
|
|
label = 'tags.normal'
|
|
|
tagtype = ''
|
|
|
if repo.tagtype(t) == 'local':
|
|
|
label = 'tags.local'
|
|
|
tagtype = 'local'
|
|
|
|
|
|
fm.startitem()
|
|
|
fm.context(repo=repo)
|
|
|
fm.write('tag', '%s', t, label=label)
|
|
|
fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
|
|
|
fm.condwrite(not ui.quiet, 'rev node', fmt,
|
|
|
repo.changelog.rev(n), hn, label=label)
|
|
|
fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
|
|
|
tagtype, label=label)
|
|
|
fm.plain('\n')
|
|
|
fm.end()
|
|
|
|
|
|
@command('tip',
|
|
|
[('p', 'patch', None, _('show patch')),
|
|
|
('g', 'git', None, _('use git extended diff format')),
|
|
|
] + templateopts,
|
|
|
_('[-p] [-g]'),
|
|
|
helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
|
|
|
def tip(ui, repo, **opts):
|
|
|
"""show the tip revision (DEPRECATED)
|
|
|
|
|
|
The tip revision (usually just called the tip) is the changeset
|
|
|
most recently added to the repository (and therefore the most
|
|
|
recently changed head).
|
|
|
|
|
|
If you have just made a commit, that commit will be the tip. If
|
|
|
you have just pulled changes from another repository, the tip of
|
|
|
that repository becomes the current tip. The "tip" tag is special
|
|
|
and cannot be renamed or assigned to a different changeset.
|
|
|
|
|
|
This command is deprecated, please use :hg:`heads` instead.
|
|
|
|
|
|
Returns 0 on success.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
|
|
|
displayer.show(repo['tip'])
|
|
|
displayer.close()
|
|
|
|
|
|
@command('unbundle',
|
|
|
[('u', 'update', None,
|
|
|
_('update to new branch head if changesets were unbundled'))],
|
|
|
_('[-u] FILE...'),
|
|
|
helpcategory=command.CATEGORY_IMPORT_EXPORT)
|
|
|
def unbundle(ui, repo, fname1, *fnames, **opts):
|
|
|
"""apply one or more bundle files
|
|
|
|
|
|
Apply one or more bundle files generated by :hg:`bundle`.
|
|
|
|
|
|
Returns 0 on success, 1 if an update has unresolved files.
|
|
|
"""
|
|
|
fnames = (fname1,) + fnames
|
|
|
|
|
|
with repo.lock():
|
|
|
for fname in fnames:
|
|
|
f = hg.openpath(ui, fname)
|
|
|
gen = exchange.readbundle(ui, f, fname)
|
|
|
if isinstance(gen, streamclone.streamcloneapplier):
|
|
|
raise error.Abort(
|
|
|
_('packed bundles cannot be applied with '
|
|
|
'"hg unbundle"'),
|
|
|
hint=_('use "hg debugapplystreamclonebundle"'))
|
|
|
url = 'bundle:' + fname
|
|
|
try:
|
|
|
txnname = 'unbundle'
|
|
|
if not isinstance(gen, bundle2.unbundle20):
|
|
|
txnname = 'unbundle\n%s' % util.hidepassword(url)
|
|
|
with repo.transaction(txnname) as tr:
|
|
|
op = bundle2.applybundle(repo, gen, tr, source='unbundle',
|
|
|
url=url)
|
|
|
except error.BundleUnknownFeatureError as exc:
|
|
|
raise error.Abort(
|
|
|
_('%s: unknown bundle feature, %s') % (fname, exc),
|
|
|
hint=_("see https://mercurial-scm.org/"
|
|
|
"wiki/BundleFeature for more "
|
|
|
"information"))
|
|
|
modheads = bundle2.combinechangegroupresults(op)
|
|
|
|
|
|
return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
|
|
|
|
|
|
@command('update|up|checkout|co',
|
|
|
[('C', 'clean', None, _('discard uncommitted changes (no backup)')),
|
|
|
('c', 'check', None, _('require clean working directory')),
|
|
|
('m', 'merge', None, _('merge uncommitted changes')),
|
|
|
('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
|
|
|
('r', 'rev', '', _('revision'), _('REV'))
|
|
|
] + mergetoolopts,
|
|
|
_('[-C|-c|-m] [-d DATE] [[-r] REV]'),
|
|
|
helpcategory=command.CATEGORY_WORKING_DIRECTORY,
|
|
|
helpbasic=True)
|
|
|
def update(ui, repo, node=None, **opts):
|
|
|
"""update working directory (or switch revisions)
|
|
|
|
|
|
Update the repository's working directory to the specified
|
|
|
changeset. If no changeset is specified, update to the tip of the
|
|
|
current named branch and move the active bookmark (see :hg:`help
|
|
|
bookmarks`).
|
|
|
|
|
|
Update sets the working directory's parent revision to the specified
|
|
|
changeset (see :hg:`help parents`).
|
|
|
|
|
|
If the changeset is not a descendant or ancestor of the working
|
|
|
directory's parent and there are uncommitted changes, the update is
|
|
|
aborted. With the -c/--check option, the working directory is checked
|
|
|
for uncommitted changes; if none are found, the working directory is
|
|
|
updated to the specified changeset.
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
The -C/--clean, -c/--check, and -m/--merge options control what
|
|
|
happens if the working directory contains uncommitted changes.
|
|
|
At most of one of them can be specified.
|
|
|
|
|
|
1. If no option is specified, and if
|
|
|
the requested changeset is an ancestor or descendant of
|
|
|
the working directory's parent, the uncommitted changes
|
|
|
are merged into the requested changeset and the merged
|
|
|
result is left uncommitted. If the requested changeset is
|
|
|
not an ancestor or descendant (that is, it is on another
|
|
|
branch), the update is aborted and the uncommitted changes
|
|
|
are preserved.
|
|
|
|
|
|
2. With the -m/--merge option, the update is allowed even if the
|
|
|
requested changeset is not an ancestor or descendant of
|
|
|
the working directory's parent.
|
|
|
|
|
|
3. With the -c/--check option, the update is aborted and the
|
|
|
uncommitted changes are preserved.
|
|
|
|
|
|
4. With the -C/--clean option, uncommitted changes are discarded and
|
|
|
the working directory is updated to the requested changeset.
|
|
|
|
|
|
To cancel an uncommitted merge (and lose your changes), use
|
|
|
:hg:`merge --abort`.
|
|
|
|
|
|
Use null as the changeset to remove the working directory (like
|
|
|
:hg:`clone -U`).
|
|
|
|
|
|
If you want to revert just one file to an older revision, use
|
|
|
:hg:`revert [-r REV] NAME`.
|
|
|
|
|
|
See :hg:`help dates` for a list of formats valid for -d/--date.
|
|
|
|
|
|
Returns 0 on success, 1 if there are unresolved files.
|
|
|
"""
|
|
|
rev = opts.get(r'rev')
|
|
|
date = opts.get(r'date')
|
|
|
clean = opts.get(r'clean')
|
|
|
check = opts.get(r'check')
|
|
|
merge = opts.get(r'merge')
|
|
|
if rev and node:
|
|
|
raise error.Abort(_("please specify just one revision"))
|
|
|
|
|
|
if ui.configbool('commands', 'update.requiredest'):
|
|
|
if not node and not rev and not date:
|
|
|
raise error.Abort(_('you must specify a destination'),
|
|
|
hint=_('for example: hg update ".::"'))
|
|
|
|
|
|
if rev is None or rev == '':
|
|
|
rev = node
|
|
|
|
|
|
if date and rev is not None:
|
|
|
raise error.Abort(_("you can't specify a revision and a date"))
|
|
|
|
|
|
if len([x for x in (clean, check, merge) if x]) > 1:
|
|
|
raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
|
|
|
"or -m/--merge"))
|
|
|
|
|
|
updatecheck = None
|
|
|
if check:
|
|
|
updatecheck = 'abort'
|
|
|
elif merge:
|
|
|
updatecheck = 'none'
|
|
|
|
|
|
with repo.wlock():
|
|
|
cmdutil.clearunfinished(repo)
|
|
|
|
|
|
if date:
|
|
|
rev = cmdutil.finddate(ui, repo, date)
|
|
|
|
|
|
# if we defined a bookmark, we have to remember the original name
|
|
|
brev = rev
|
|
|
if rev:
|
|
|
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
|
|
|
ctx = scmutil.revsingle(repo, rev, rev)
|
|
|
rev = ctx.rev()
|
|
|
hidden = ctx.hidden()
|
|
|
overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
|
|
|
with ui.configoverride(overrides, 'update'):
|
|
|
ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
|
|
|
updatecheck=updatecheck)
|
|
|
if hidden:
|
|
|
ctxstr = ctx.hex()[:12]
|
|
|
ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
|
|
|
|
|
|
if ctx.obsolete():
|
|
|
obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
|
|
|
ui.warn("(%s)\n" % obsfatemsg)
|
|
|
return ret
|
|
|
|
|
|
@command('verify', [], helpcategory=command.CATEGORY_MAINTENANCE)
|
|
|
def verify(ui, repo):
|
|
|
"""verify the integrity of the repository
|
|
|
|
|
|
Verify the integrity of the current repository.
|
|
|
|
|
|
This will perform an extensive check of the repository's
|
|
|
integrity, validating the hashes and checksums of each entry in
|
|
|
the changelog, manifest, and tracked files, as well as the
|
|
|
integrity of their crosslinks and indices.
|
|
|
|
|
|
Please see https://mercurial-scm.org/wiki/RepositoryCorruption
|
|
|
for more information about recovery from corruption of the
|
|
|
repository.
|
|
|
|
|
|
Returns 0 on success, 1 if errors are encountered.
|
|
|
"""
|
|
|
return hg.verify(repo)
|
|
|
|
|
|
@command(
|
|
|
'version', [] + formatteropts, helpcategory=command.CATEGORY_HELP,
|
|
|
norepo=True, intents={INTENT_READONLY})
|
|
|
def version_(ui, **opts):
|
|
|
"""output version and copyright information
|
|
|
|
|
|
.. container:: verbose
|
|
|
|
|
|
Template:
|
|
|
|
|
|
The following keywords are supported. See also :hg:`help templates`.
|
|
|
|
|
|
:extensions: List of extensions.
|
|
|
:ver: String. Version number.
|
|
|
|
|
|
And each entry of ``{extensions}`` provides the following sub-keywords
|
|
|
in addition to ``{ver}``.
|
|
|
|
|
|
:bundled: Boolean. True if included in the release.
|
|
|
:name: String. Extension name.
|
|
|
"""
|
|
|
opts = pycompat.byteskwargs(opts)
|
|
|
if ui.verbose:
|
|
|
ui.pager('version')
|
|
|
fm = ui.formatter("version", opts)
|
|
|
fm.startitem()
|
|
|
fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
|
|
|
util.version())
|
|
|
license = _(
|
|
|
"(see https://mercurial-scm.org for more information)\n"
|
|
|
"\nCopyright (C) 2005-2018 Matt Mackall and others\n"
|
|
|
"This is free software; see the source for copying conditions. "
|
|
|
"There is NO\nwarranty; "
|
|
|
"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
|
|
|
)
|
|
|
if not ui.quiet:
|
|
|
fm.plain(license)
|
|
|
|
|
|
if ui.verbose:
|
|
|
fm.plain(_("\nEnabled extensions:\n\n"))
|
|
|
# format names and versions into columns
|
|
|
names = []
|
|
|
vers = []
|
|
|
isinternals = []
|
|
|
for name, module in extensions.extensions():
|
|
|
names.append(name)
|
|
|
vers.append(extensions.moduleversion(module) or None)
|
|
|
isinternals.append(extensions.ismoduleinternal(module))
|
|
|
fn = fm.nested("extensions", tmpl='{name}\n')
|
|
|
if names:
|
|
|
namefmt = " %%-%ds " % max(len(n) for n in names)
|
|
|
places = [_("external"), _("internal")]
|
|
|
for n, v, p in zip(names, vers, isinternals):
|
|
|
fn.startitem()
|
|
|
fn.condwrite(ui.verbose, "name", namefmt, n)
|
|
|
if ui.verbose:
|
|
|
fn.plain("%s " % places[p])
|
|
|
fn.data(bundled=p)
|
|
|
fn.condwrite(ui.verbose and v, "ver", "%s", v)
|
|
|
if ui.verbose:
|
|
|
fn.plain("\n")
|
|
|
fn.end()
|
|
|
fm.end()
|
|
|
|
|
|
def loadcmdtable(ui, name, cmdtable):
|
|
|
"""Load command functions from specified cmdtable
|
|
|
"""
|
|
|
cmdtable = cmdtable.copy()
|
|
|
for cmd in list(cmdtable):
|
|
|
if not cmd.startswith('^'):
|
|
|
continue
|
|
|
ui.deprecwarn("old-style command registration '%s' in extension '%s'"
|
|
|
% (cmd, name), '4.8')
|
|
|
entry = cmdtable.pop(cmd)
|
|
|
entry[0].helpbasic = True
|
|
|
cmdtable[cmd[1:]] = entry
|
|
|
|
|
|
overrides = [cmd for cmd in cmdtable if cmd in table]
|
|
|
if overrides:
|
|
|
ui.warn(_("extension '%s' overrides commands: %s\n")
|
|
|
% (name, " ".join(overrides)))
|
|
|
table.update(cmdtable)
|
|
|
|