##// END OF EJS Templates
store: only add new entries to the fncache file...
store: only add new entries to the fncache file Newly added fncache entries were not added to the in-memory cache, making it possible for 'hg convert' to cause duplicates in .hg/store/fncache. Duplicates in the fncache file are harmless, but excessive numbers of duplicates from large converted repositories may slow down execution speed considerably.

File last commit:

r10564:6ded6243 stable
r10577:d5bd1bef stable
Show More
commands.py
3840 lines | 139.1 KiB | text/x-python | PythonLexer
mpm@selenic.com
import and startup cleanups...
r249 # commands.py - command processing for mercurial
#
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
mpm@selenic.com
import and startup cleanups...
r249 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
mpm@selenic.com
import and startup cleanups...
r249
Joel Rosdahl
Expand import * to allow Pyflakes to find problems
r6211 from node import hex, nullid, nullrev, short
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 from lock import release
Martin Geisler
i18n: mark help strings for translation...
r7013 from i18n import _, gettext
Benoit Boissinot
remove unused imports
r9678 import os, re, sys, difflib, time, tempfile
import hg, util, revlog, bundlerepo, extensions, copies, error
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 import patch, help, mdiff, url, encoding, templatekw
Simon Heimberg
separate import lines from mercurial and general python modules
r8312 import archival, changegroup, cmdutil, sshserver, hbisect
from hgweb import server
Matt Mackall
resolve: new command...
r6518 import merge as merge_
Martin Geisler
commands: use minirst parser when displaying help
r9157 import minirst
Matt Mackall
Kill ui.setconfig_remoteopts...
r2731
mpm@selenic.com
hg help: use docstrings only...
r255 # Commands start here, listed alphabetically
mpm@selenic.com
Beginning of new command parsing interface...
r209
Bryan O'Sullivan
Get add and locate to use new repo and dirstate walk code....
r724 def add(ui, repo, *pats, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """add the specified files on the next commit
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 Schedule files to be version controlled and added to the
repository.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Matt Mackall
Add doc notes about revert and hg status vs diff
r3829 The files will be added to the repository at the next commit. To
Steve Losh
Add a forget command for easily untracking files....
r8902 undo an add before that, see hg forget.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
timeless
help: miscellaneous language fixes
r7807 If no names are given, add all files to the repository.
Martin Geisler
commands: add verbose example to help text for add
r10446
.. container:: verbose
An example showing how new (unknown) files are added
automatically by ``hg add``::
$ ls
foo.c
$ hg status
? foo.c
$ hg add
adding foo.c
$ hg status
Martin Geisler
commands: correct example in add help text
r10448 A foo.c
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Matt Mackall
add: use match.bad callback more effectively
r8679 bad = []
Bryan O'Sullivan
Get add and locate to use new repo and dirstate walk code....
r724 names = []
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 m = cmdutil.match(repo, pats, opts)
Matt Mackall
add: use match.bad callback more effectively
r8679 oldbad = m.bad
Matt Mackall
many, many trivial check-code fixups
r10282 m.bad = lambda x, y: bad.append(x) or oldbad(x, y)
Matt Mackall
add: use match.bad callback more effectively
r8679
for f in repo.walk(m):
exact = m.exact(f)
if exact or f not in repo.dirstate:
names.append(f)
if ui.verbose or not exact:
ui.status(_('adding %s\n') % m.rel(f))
Thomas Arendsen Hein
Don't require opts['dry_run'] to be set to fix external tools like tailor.
r2503 if not opts.get('dry_run'):
Matt Mackall
add: use match.bad callback more effectively
r8679 bad += [f for f in repo.add(names) if f in m.files()]
return bad and 1 or 0
mpm@selenic.com
commands: migrate status and branch...
r213
Bryan O'Sullivan
Get addremove to use new walk code....
r766 def addremove(ui, repo, *pats, **opts):
Thomas Arendsen Hein
Documentation fixes for addremove....
r3181 """add all new files, delete all missing files
Vadim Gelfer
deprecate addremove command.
r2181
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 Add all new files and remove all missing files from the
repository.
New files are ignored if they match any of the patterns in
.hgignore. As with add, these changes take effect at the next
commit.
Vadim Gelfer
addremove: add -s/--similarity option...
r2958
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 Use the -s/--similarity option to detect renamed files. With a
Martin Geisler
commands: wrap docstrings at 70 characters...
r9249 parameter greater than 0, this compares every removed file with
every added file and records those similar enough as renames. This
option takes a percentage between 0 (disabled) and 100 (files must
be identical) as its parameter. Detecting renamed files this way
can be expensive.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Bryan O'Sullivan
addremove: print meaningful error message if --similar not numeric
r4966 try:
sim = float(opts.get('similarity') or 0)
except ValueError:
raise util.Abort(_('similarity must be a number'))
Vadim Gelfer
addremove: add -s/--similarity option...
r2958 if sim < 0 or sim > 100:
raise util.Abort(_('similarity must be between 0 and 100'))
Matt Mackall
many, many trivial check-code fixups
r10282 return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
mpm@selenic.com
hg checkout: refuse to checkout if there are outstanding changes...
r219
Bryan O'Sullivan
Convert annotate over to walk interface....
r733 def annotate(ui, repo, *pats, **opts):
timeless
Improve English for help text of many core hg commands....
r8779 """show changeset information by line for each file
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 List changes in files, showing the revision id responsible for
each line
timeless
Improve English for help text of many core hg commands....
r8779 This command is useful for discovering when a change was made and
by whom.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 Without the -a/--text option, annotate will avoid processing files
timeless
Improve English for help text of many core hg commands....
r8779 it detects as binary. With -a, annotate will annotate the file
anyway, although the results will probably be neither useful
nor desirable.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Thomas Arendsen Hein
Make annotae/grep print short dates with -q/--quiet....
r6134 datefunc = ui.quiet and util.shortdate or util.datestr
getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
lupus@debian.org
Added --date option to annotate.
r1522
mpm@selenic.com
Handle empty file list for annotate
r744 if not pats:
timeless
Generally replace "file name" with "filename" in help and comments.
r8761 raise util.Abort(_('at least one filename or pattern is required'))
mpm@selenic.com
Handle empty file list for annotate
r744
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
('number', lambda x: str(x[0].rev())),
('changeset', lambda x: short(x[0].node())),
('date', getdate),
Dirkjan Ochtman
commands: annotate follows by default, separate -f/--file option
r10369 ('file', lambda x: x[0].path()),
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 ]
Matt Mackall
many, many trivial check-code fixups
r10282 if (not opts.get('user') and not opts.get('changeset')
Dirkjan Ochtman
commands: annotate follows by default, separate -f/--file option
r10369 and not opts.get('date') and not opts.get('file')):
Thomas Arendsen Hein
Some cleanups in commands.annotate()....
r714 opts['number'] = 1
mpm@selenic.com
Beginning of new command parsing interface...
r209
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 linenumber = opts.get('line_number') is not None
Benoit Boissinot
fix coding style (reported by pylint)
r10394 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 raise util.Abort(_('at least one of -n/-c is required for -l'))
funcmap = [func for op, func in opmap if opts.get(op)]
if linenumber:
lastfunc = funcmap[-1]
funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
Alexander Solovyov
commands: optional options where possible...
r7131 ctx = repo[opts.get('rev')]
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 m = cmdutil.match(repo, pats, opts)
Dirkjan Ochtman
commands: annotate follows by default, separate -f/--file option
r10369 follow = not opts.get('no_follow')
Matt Mackall
context: add walk method
r6764 for abs in ctx.walk(m):
fctx = ctx[abs]
Alexander Solovyov
commands: optional options where possible...
r7131 if not opts.get('text') and util.binary(fctx.data()):
Matt Mackall
walk: remove rel and exact returns
r6584 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
mpm@selenic.com
Teach annotate about binary files
r1016 continue
Dirkjan Ochtman
commands: annotate follows by default, separate -f/--file option
r10369 lines = fctx.annotate(follow=follow, linenumber=linenumber)
mpm@selenic.com
Beginning of new command parsing interface...
r209 pieces = []
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 for f in funcmap:
l = [f(n) for n, dummy in lines]
if l:
Matt Mackall
annotate: fix bug when annotating multiple files
r7094 ml = max(map(len, l))
pieces.append(["%*s" % (ml, x) for x in l])
mpm@selenic.com
Beginning of new command parsing interface...
r209
mpm@selenic.com
Fixes for annotate...
r771 if pieces:
for p, l in zip(zip(*pieces), lines):
ui.write("%s: %s" % (" ".join(p), l[1]))
mpm@selenic.com
Beginning of new command parsing interface...
r209
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 def archive(ui, repo, dest, **opts):
timeless
Improve English for help text of many core hg commands....
r8779 '''create an unversioned archive of a repository revision
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
By default, the revision used is the parent of the working
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 directory; use -r/--rev to specify a different revision.
To specify the type of archive to create, use -t/--type. Valid
Martin Geisler
commands: use field lists instead of literal blocks in docstrings...
r9892 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
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
The exact name of the destination archive or directory is given
Martin Geisler
commands: use single-quotes for 'hg help ...' hints
r7974 using a format string; see 'hg help export' for details.
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
Each member added to an archive file has a directory prefix
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 prepended. Use -p/--prefix to specify a format string for the
prefix. The default is the basename of the archive, with suffixes
removed.
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 '''
Alexander Solovyov
commands: optional options where possible...
r7131 ctx = repo[opts.get('rev')]
Brendan Cully
archive: abort on empty repository. Fixes #624.
r5061 if not ctx:
Matt Mackall
archive: fix bogus error message with no working directory
r7528 raise util.Abort(_('no working directory: please specify a revision'))
Brendan Cully
archive: abort on empty repository. Fixes #624.
r5061 node = ctx.node()
Vadim Gelfer
refactor text diff/patch code....
r2874 dest = cmdutil.make_filename(repo, dest, node)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 if os.path.realpath(dest) == repo.root:
raise util.Abort(_('repository root cannot be destination'))
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 matchfn = cmdutil.match(repo, [], opts)
Vadim Gelfer
archive: make "hg archive -t XXX -" to write to stdout
r2476 kind = opts.get('type') or 'files'
Alexander Solovyov
commands: optional options where possible...
r7131 prefix = opts.get('prefix')
Vadim Gelfer
archive: make "hg archive -t XXX -" to write to stdout
r2476 if dest == '-':
if kind == 'files':
raise util.Abort(_('cannot archive plain files to stdout'))
dest = sys.stdout
Matt Mackall
many, many trivial check-code fixups
r10282 if not prefix:
prefix = os.path.basename(repo.root) + '-%h'
Vadim Gelfer
refactor text diff/patch code....
r2874 prefix = cmdutil.make_filename(repo, prefix, node)
Alexander Solovyov
commands: optional options where possible...
r7131 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
Vadim Gelfer
archive: make "hg archive -t XXX -" to write to stdout
r2476 matchfn, prefix)
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112
Daniel Holth
accept -r REV in more places...
r4450 def backout(ui, repo, node=None, rev=None, **opts):
Vadim Gelfer
add backout command....
r2158 '''reverse effect of earlier changeset
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 Commit the backed out changes as a new changeset. The new
Vadim Gelfer
backout command: better help.
r2254 changeset is a child of the backed out changeset.
Vadim Gelfer
add backout command....
r2158
timeless
Improve English for help text of many core hg commands....
r8779 If you backout a changeset other than the tip, a new head is
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 created. This head will be the new tip and you should merge this
timeless
Improve English for help text of many core hg commands....
r8779 backout changeset with another head.
Vadim Gelfer
backout command: better help.
r2254
The --merge option remembers the parent of the working directory
before starting the backout, then merges the new head with that
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 changeset afterwards. This saves you from doing the merge by hand.
The result of this merge is not committed, as with a normal merge.
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163
Martin Geisler
commands: remove unnecessary quotes in backout help
r8540 See 'hg help dates' for a list of formats valid for -d/--date.
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163 '''
Daniel Holth
accept -r REV in more places...
r4450 if rev and node:
raise util.Abort(_("please specify just one revision"))
if not rev:
rev = node
Vadim Gelfer
add backout command....
r2158
Thomas Arendsen Hein
Fix and test 'hg backout' without or with too many revisions.
r4726 if not rev:
raise util.Abort(_("please specify a revision to backout"))
Thomas Arendsen Hein
Fix bad behaviour when specifying an invalid date (issue700)...
r6139 date = opts.get('date')
if date:
opts['date'] = util.parsedate(date)
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549 cmdutil.bail_if_changed(repo)
Matt Mackall
cmdutil: make bail_if_changed bail on uncommitted merge
r5716 node = repo.lookup(rev)
Vadim Gelfer
add backout command....
r2158 op1, op2 = repo.dirstate.parents()
Matt Mackall
backout: disallow across branches (issue655)
r5568 a = repo.changelog.ancestor(op1, node)
if a != node:
timeless
Improve English for help text of many core hg commands....
r8779 raise util.Abort(_('cannot backout change on a different branch'))
Matt Mackall
backout: disallow across branches (issue655)
r5568
Vadim Gelfer
backout: allow backout of merge changeset with --parent option....
r2614 p1, p2 = repo.changelog.parents(node)
if p1 == nullid:
timeless
Improve English for help text of many core hg commands....
r8779 raise util.Abort(_('cannot backout a change with no parents'))
Vadim Gelfer
add backout command....
r2158 if p2 != nullid:
Alexander Solovyov
commands: optional options where possible...
r7131 if not opts.get('parent'):
timeless
Improve English for help text of many core hg commands....
r8779 raise util.Abort(_('cannot backout a merge changeset without '
Vadim Gelfer
backout: allow backout of merge changeset with --parent option....
r2614 '--parent'))
p = repo.lookup(opts['parent'])
if p not in (p1, p2):
Marcos Chaves
fix warnings generated by pygettext.py.
r3679 raise util.Abort(_('%s is not a parent of %s') %
Thomas Arendsen Hein
Indentation cleanups for 2956948b81f3.
r3680 (short(p), short(node)))
Vadim Gelfer
backout: allow backout of merge changeset with --parent option....
r2614 parent = p
else:
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('parent'):
Vadim Gelfer
backout: allow backout of merge changeset with --parent option....
r2614 raise util.Abort(_('cannot use --parent on non-merge changeset'))
parent = p1
Matt Mackall
backout: disallow across branches (issue655)
r5568
Matt Mackall
backout: reverse changeset belongs on current branch...
r6423 # the backout should appear on the same branch
branch = repo.dirstate.branch()
Matt Mackall
Introduce update helper functions: update, merge, clean, and revert
r2808 hg.clean(repo, node, show_stats=False)
Matt Mackall
backout: reverse changeset belongs on current branch...
r6423 repo.dirstate.setbranch(branch)
Vadim Gelfer
add backout command....
r2158 revert_opts = opts.copy()
Matt Mackall
Add --date support to update and revert...
r3814 revert_opts['date'] = None
Vadim Gelfer
revert: require --all to revert all files.
r2982 revert_opts['all'] = True
Vadim Gelfer
add backout command....
r2158 revert_opts['rev'] = hex(parent)
Alexis S. L. Carvalho
revert: don't assume ignored files will be returned in the unknown list...
r6031 revert_opts['no_backup'] = None
Vadim Gelfer
add backout command....
r2158 revert(ui, repo, **revert_opts)
commit_opts = opts.copy()
commit_opts['addremove'] = False
Thomas Arendsen Hein
Small cleanups to backout command:...
r2159 if not commit_opts['message'] and not commit_opts['logfile']:
Martin Geisler
do not translate commit messages...
r9183 # we don't translate commit messages
Martin Geisler
commands: remove ineffective parenthesis
r9197 commit_opts['message'] = "Backed out changeset %s" % short(node)
Vadim Gelfer
fix coding style of backout editor change.
r2268 commit_opts['force_editor'] = True
Vadim Gelfer
add backout command....
r2158 commit(ui, repo, **commit_opts)
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)))
Vadim Gelfer
print message after backout that tells that backout adds new head.
r2493 if op1 != node:
Gilles Moris
Reverse the way backout is doing the merge...
r6161 hg.clean(repo, op1, show_stats=False)
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('merge'):
Matt Mackall
many, many trivial check-code fixups
r10282 ui.status(_('merging with changeset %s\n')
% nice(repo.changelog.tip()))
Gilles Moris
Reverse the way backout is doing the merge...
r6161 hg.merge(repo, hex(repo.changelog.tip()))
Vadim Gelfer
print message after backout that tells that backout adds new head.
r2493 else:
ui.status(_('the backout changeset is a new head - '
'do not forget to merge\n'))
Christian Ebert
fix hg backup option recommendation for auto-merge
r2761 ui.status(_('(use "backout --merge" '
'if you want to auto-merge)\n'))
Vadim Gelfer
add backout command....
r2158
Alexander Solovyov
bisect: ability to check revision with command
r7227 def bisect(ui, repo, rev=None, extra=None, command=None,
Matt Mackall
bisect: make bisect a built-in command
r5775 reset=None, good=None, bad=None, skip=None, noupdate=None):
"""subdivision search of changesets
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 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
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 for testing (unless the -U/--noupdate option is specified). Once
timeless
Improve English for help text of many core hg commands....
r8779 you have performed tests, mark the working directory as good or
bad, and bisect will either update to another candidate changeset
Dirkjan Ochtman
bisect: expand help text to explain REV argument and --noupdate
r6928 or announce that it has found the bad revision.
Dirkjan Ochtman
clean up trailing spaces
r7184
Dirkjan Ochtman
bisect: expand help text to explain REV argument and --noupdate
r6928 As a shortcut, you can also use the revision argument to mark a
revision as good or bad without checking it out first.
Alexander Solovyov
bisect: ability to check revision with command
r7227
timeless
Improve English for help text of many core hg commands....
r8779 If you supply a command, it will be used for automatic bisection.
Its exit status 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.
Matt Mackall
bisect: make bisect a built-in command
r5775 """
Alexander Solovyov
bisect: ability to check revision with command
r7227 def print_result(nodes, good):
Matt Mackall
bisect: make bisect a built-in command
r5775 displayer = cmdutil.show_changeset(ui, repo, {})
Bernhard Leiner
Add support for multiple possible bisect results (issue1228, issue1182)...
r6858 if len(nodes) == 1:
# narrowed it down to a single revision
Wagner Bruna
commands, i18n: avoid untranslated strings as message parameters
r8088 if good:
ui.write(_("The first good revision is:\n"))
else:
ui.write(_("The first bad revision is:\n"))
Dirkjan Ochtman
cmdutil: use change contexts for cset-printer and cset-templater
r7369 displayer.show(repo[nodes[0]])
Bernhard Leiner
Add support for multiple possible bisect results (issue1228, issue1182)...
r6858 else:
# multiple possible revisions
Wagner Bruna
commands, i18n: avoid untranslated strings as message parameters
r8088 if good:
ui.write(_("Due to skipped revisions, the first "
"good revision could be any of:\n"))
else:
ui.write(_("Due to skipped revisions, the first "
"bad revision could be any of:\n"))
Bernhard Leiner
Add support for multiple possible bisect results (issue1228, issue1182)...
r6858 for n in nodes:
Dirkjan Ochtman
cmdutil: use change contexts for cset-printer and cset-templater
r7369 displayer.show(repo[n])
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 displayer.close()
Alexander Solovyov
bisect: ability to check revision with command
r7227
def check_state(state, interactive=True):
if not state['good'] or not state['bad']:
if (good or bad or skip or reset) and interactive:
return
if not state['good']:
raise util.Abort(_('cannot bisect (no known good revisions)'))
else:
raise util.Abort(_('cannot bisect (no known bad revisions)'))
return True
# 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 or good + bad + skip + reset + bool(command) > 1:
raise util.Abort(_('incompatible arguments'))
if reset:
p = repo.join("bisect.state")
if os.path.exists(p):
os.unlink(p)
return
state = hbisect.load_state(repo)
if command:
changesets = 1
Benoit Boissinot
bisect: improve hg bisect -c (relative paths, error handling)...
r7590 try:
while changesets:
# update state
Matt Mackall
bisect: use util.system and fix good/bad when using -c...
r9584 status = util.system(command)
Benoit Boissinot
bisect: improve hg bisect -c (relative paths, error handling)...
r7590 if status == 125:
transition = "skip"
elif status == 0:
transition = "good"
# status < 0 means process was killed
elif status == 127:
raise util.Abort(_("failed to execute %s") % command)
elif status < 0:
raise util.Abort(_("%s killed") % command)
else:
transition = "bad"
Patrick Mezard
bisect: improve --command output...
r8805 ctx = repo[rev or '.']
state[transition].append(ctx.node())
ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
Benoit Boissinot
bisect: improve hg bisect -c (relative paths, error handling)...
r7590 check_state(state, interactive=False)
# bisect
nodes, changesets, good = hbisect.bisect(repo.changelog, state)
# update to next check
cmdutil.bail_if_changed(repo)
hg.clean(repo, nodes[0], show_stats=False)
finally:
hbisect.save_state(repo, state)
Matt Mackall
bisect: use util.system and fix good/bad when using -c...
r9584 return print_result(nodes, good)
Alexander Solovyov
bisect: ability to check revision with command
r7227
# update state
node = repo.lookup(rev or '.')
Benoit Boissinot
bisect: no need to save the state if it wasn't changed
r9689 if good or bad or skip:
if good:
state['good'].append(node)
elif bad:
state['bad'].append(node)
elif skip:
state['skip'].append(node)
hbisect.save_state(repo, state)
Alexander Solovyov
bisect: ability to check revision with command
r7227
if not check_state(state):
return
# actually bisect
nodes, changesets, good = hbisect.bisect(repo.changelog, state)
if changesets == 0:
print_result(nodes, good)
Bernhard Leiner
Add support for multiple possible bisect results (issue1228, issue1182)...
r6858 else:
assert len(nodes) == 1 # only a single node can be tested next
node = nodes[0]
Matt Mackall
bisect: make bisect a built-in command
r5775 # 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)
Cédric Duval
bisect: fix format specifiers for integers
r9012 ui.write(_("Testing changeset %d:%s "
"(%d changesets remaining, ~%d tests)\n")
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 % (rev, short(node), changesets, tests))
Matt Mackall
bisect: make bisect a built-in command
r5775 if not noupdate:
cmdutil.bail_if_changed(repo)
return hg.clean(repo, node)
Brendan Cully
branch: require --force to shadow existing branches
r4202 def branch(ui, repo, label=None, **opts):
Matt Mackall
add branch and branches commands
r3502 """set or show the current branch name
Brendan Cully
Notify the user that hg branch does not create a branch until commit
r4601 With no argument, show the current branch name. With one argument,
timeless
Improve English for help text of many core hg commands....
r8779 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.
Brendan Cully
branch: require --force to shadow existing branches
r4202
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 Unless -f/--force is specified, branch will not let you set a
timeless
Improve English for help text of many core hg commands....
r8779 branch name that already exists, even if it's inactive.
Thomas Arendsen Hein
Mention 'hg update' to switch branches in help for branch and branches.
r5999
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 Use -C/--clean to reset the working directory branch to that of
the parent of the working directory, negating a previous branch
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 change.
Sune Foldager
branch: added more support for named branches...
r7006
Matt Mackall
help: add more pointers to commit --close-branch
r8992 Use the command 'hg update' to switch to an existing branch. Use
'hg commit --close-branch' to mark this branch as closed.
Matt Mackall
add branch and branches commands
r3502 """
Sune Foldager
branch: added more support for named branches...
r7006 if opts.get('clean'):
label = repo[None].parents()[0].branch()
repo.dirstate.setbranch(label)
ui.status(_('reset working directory to branch %s\n') % label)
elif label:
Steve Borho
commands: label from user is in local encoding...
r10315 utflabel = encoding.fromlocal(label)
if not opts.get('force') and utflabel in repo.branchtags():
Matt Mackall
use repo[changeid] to get a changectx
r6747 if label not in [p.branch() for p in repo.parents()]:
Brendan Cully
branch: require --force to shadow existing branches
r4202 raise util.Abort(_('a branch of the same name already exists'
' (use --force to override)'))
Steve Borho
commands: label from user is in local encoding...
r10315 repo.dirstate.setbranch(utflabel)
Brendan Cully
Notify the user that hg branch does not create a branch until commit
r4601 ui.status(_('marked working directory as branch %s\n') % label)
Matt Mackall
add branch and branches commands
r3502 else:
Matt Mackall
move encoding bits from util to encoding...
r7948 ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
Matt Mackall
add branch and branches commands
r3502
Matt Mackall
branches: add --closed flag for consistency with heads
r8991 def branches(ui, repo, active=False, closed=False):
Matt Mackall
add branch and branches commands
r3502 """list repository named branches
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675 List the repository's named branches, indicating which ones are
Matt Mackall
branches: add --closed flag for consistency with heads
r8991 inactive. If -c/--closed is specified, also list branches which have
been marked closed (see hg commit --close-branch).
If -a/--active is specified, only show active branches. A branch
is considered active if it contains repository heads.
Thomas Arendsen Hein
Mention 'hg update' to switch branches in help for branch and branches.
r5999
Use the command 'hg update' to switch to an existing branch.
Matt Mackall
add branch and branches commands
r3502 """
Matt Mackall
branches: add --closed flag for consistency with heads
r8991
Stefano Tortarolo
Active branches fix (issue1104)
r6631 hexfunc = ui.debugflag and hex or short
Benoit Boissinot
localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names...
r9675 activebranches = [repo[n].branch() for n in repo.heads()]
John Mulligan
localrepo: remove 'closed' argument to heads(...) function...
r8796 def testactive(tag, node):
realhead = tag in activebranches
open = node in repo.branchheads(tag, closed=False)
return realhead and open
branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
Matt Mackall
replace various uses of list.reverse()
r8210 for tag, node in repo.branchtags().items()],
reverse=True)
Stefano Tortarolo
Active branches fix (issue1104)
r6631
for isactive, node, tag in branches:
if (not active) or isactive:
Benoit Boissinot
localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names...
r9675 encodedtag = encoding.tolocal(tag)
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675 if ui.quiet:
Benoit Boissinot
localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names...
r9675 ui.write("%s\n" % encodedtag)
Eric Hopper
Change branches to sort 'active' branches first, and add an option to show only active branches.
r4675 else:
John Mulligan
branch closing: referencing open and closed branches/heads...
r7656 hn = repo.lookup(node)
if isactive:
notice = ''
elif hn not in repo.branchheads(tag, closed=False):
Matt Mackall
branches: add --closed flag for consistency with heads
r8991 if not closed:
continue
Martin Geisler
commands: mark strings for translation
r9951 notice = _(' (closed)')
John Mulligan
branch closing: referencing open and closed branches/heads...
r7656 else:
Martin Geisler
commands: mark strings for translation
r9951 notice = _(' (inactive)')
Benoit Boissinot
localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names...
r9675 rev = str(node).rjust(31 - encoding.colwidth(encodedtag))
data = encodedtag, rev, hexfunc(hn), notice
Stefano Tortarolo
branches unparseable output fix (issue1230)
r6814 ui.write("%s %s:%s%s\n" % data)
Matt Mackall
add branch and branches commands
r3502
Vadim Gelfer
push, outgoing, bundle: fall back to "default" if "default-push" not defined
r2494 def bundle(ui, repo, fname, dest=None, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """create a changegroup file
Thomas Arendsen Hein
Corrected help text for bundle.
r3511 Generate a compressed changegroup file collecting changesets not
timeless
help: miscellaneous language fixes
r7807 known to be in another repository.
Thomas Arendsen Hein
Corrected help text for bundle.
r3511
timeless
help: Improved body text
r10376 If you omit the destination repository, then hg assumes the
destination will have all the nodes you specify with --base
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 parameters. To create a bundle containing all changesets, use
Henrik Stuart
help: describe bundle compression methods (issue1523)
r8903 -a/--all (or --base null).
Stefano Mioli
commands: improve bundle compression methods description
r8958 You can change compression method with the -t/--type option.
The available compression methods are: none, bzip2, and
Henrik Stuart
help: describe bundle compression methods (issue1523)
r8903 gzip (by default, bundles are compressed using bzip2).
Thomas Arendsen Hein
Corrected help text for bundle.
r3511
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 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.
Thomas Arendsen Hein
Corrected help text for bundle.
r3511
Applying bundles preserves all changeset contents including
permissions, copy/rename information, and revision history.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284 revs = opts.get('rev') or None
if revs:
revs = [repo.lookup(rev) for rev in revs]
John Mulligan
Add --all option to bundle command
r6171 if opts.get('all'):
base = ['null']
else:
base = opts.get('base')
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284 if base:
if dest:
Martin Geisler
commands: typo in bundle abort message...
r8669 raise util.Abort(_("--base is incompatible with specifying "
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284 "a destination"))
Benoit Boissinot
bundle --base: use the right set for the base
r3318 base = [repo.lookup(rev) for rev in base]
# create the right base
# XXX: nodesbetween / changegroup* should be "fixed" instead
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284 o = []
Benoit Boissinot
revlog: use set instead of dict
r8464 has = set((nullid,))
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284 for n in base:
Matt Mackall
bundle: don't use sets.Set
r3631 has.update(repo.changelog.reachable(n))
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284 if revs:
Benoit Boissinot
bundle --base: use the right set for the base
r3318 visit = list(revs)
Benoit Boissinot
bundle: exclude csets given in --base, unless they are in --rev (issue1910)...
r10479 has.difference_update(revs)
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284 else:
Benoit Boissinot
bundle --base: use the right set for the base
r3318 visit = repo.changelog.heads()
Matt Mackall
bundle: don't use sets.Set
r3631 seen = {}
Benoit Boissinot
bundle --base: use the right set for the base
r3318 while visit:
n = visit.pop(0)
Matt Mackall
bundle: don't use sets.Set
r3631 parents = [p for p in repo.changelog.parents(n) if p not in has]
Benoit Boissinot
bundle --base: use the right set for the base
r3318 if len(parents) == 0:
Benoit Boissinot
bundle: exclude csets given in --base, unless they are in --rev (issue1910)...
r10479 if n not in has:
o.append(n)
Benoit Boissinot
bundle --base: use the right set for the base
r3318 else:
Benoit Boissinot
fix graph traversal in commands.bundle (it wasn't O(n))
r3512 for p in parents:
if p not in seen:
Matt Mackall
bundle: don't use sets.Set
r3631 seen[p] = 1
Benoit Boissinot
fix graph traversal in commands.bundle (it wasn't O(n))
r3512 visit.append(p)
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284 else:
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 dest = ui.expandpath(dest or 'default-push', dest or 'default')
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 dest, branches = hg.parseurl(dest, opts.get('branch'))
Matt Mackall
add cmdutil.remoteui...
r8188 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
Alexander Solovyov
commands: optional options where possible...
r7131 o = repo.findoutgoing(other, force=opts.get('force'))
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284
if revs:
cg = repo.changegroupsubset(o, revs, 'bundle')
else:
cg = repo.changegroup(o, 'bundle')
Benoit Allard
add compression type type parameter to bundle command
r6570
bundletype = opts.get('type', 'bzip2').lower()
btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
bundletype = btypes.get(bundletype)
if bundletype not in changegroup.bundletypes:
raise util.Abort(_('unknown bundle type specified with --type'))
changegroup.writebundle(cg, fname, bundletype)
mpm@selenic.com
Add preliminary support for the bundle and unbundle commands
r1218
Bryan O'Sullivan
Switch cat command to use walk code....
r1254 def cat(ui, repo, file1, *pats, **opts):
Thomas Arendsen Hein
doc string fix: hg cat and manifest default to current parent revision.
r3914 """output the current or given revision of files
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 Print the specified files as they were at the given revision. If
no revision is given, the parent of the working directory is used,
Thomas Arendsen Hein
doc fix: hg tags defaults to current parent revision, too....
r3915 or tip if no revision is checked out.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Output may be to a file, in which case the name of the file is
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 given using a format string. The formatting rules are the same as
Martin Geisler
commands: use field lists instead of literal blocks in docstrings...
r9892 for the export command, with the following additions:
:``%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
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Alexander Solovyov
commands: optional options where possible...
r7131 ctx = repo[opts.get('rev')]
Matt Mackall
cat: return an error on failure
r4697 err = 1
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 m = cmdutil.match(repo, (file1,) + pats, opts)
Matt Mackall
context: add walk method
r6764 for abs in ctx.walk(m):
Alexander Solovyov
commands: optional options where possible...
r7131 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
Matt Mackall
context: add walk method
r6764 data = ctx[abs].data()
Thomas Arendsen Hein
cat --decode: Drop short option, use opts.get() instead of opts[]...
r6094 if opts.get('decode'):
Jesse Glick
Option --decode for hg cat to apply decode filters....
r6093 data = repo.wwritedata(abs, data)
fp.write(data)
Matt Mackall
cat: return an error on failure
r4697 err = 0
return err
mpm@selenic.com
migrate remaining commands...
r248
Thomas Arendsen Hein
Use python function instead of external 'cp' command when cloning repos....
r698 def clone(ui, source, dest=None, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """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.
Matt Mackall
mention default branch in branch and clone help
r7942 See 'hg help urls' for valid source format details.
Martin Geisler
commands: mark "ssh://" as inline literals in help texts
r9970 It is possible to specify an ``ssh://`` URL as the destination, but no
Matt Mackall
mention default branch in branch and clone help
r7942 .hg/hgrc and working directory will be created on the remote side.
Martin Geisler
commands: mark "ssh://" as inline literals in help texts
r9970 Please see 'hg help urls' for important details about ``ssh://`` URLs.
Matt Mackall
mention default branch in branch and clone help
r7942
Adrian Buehlmann
clone: add option -u/--updaterev
r9714 If the -U/--noupdate option is specified, the new clone will contain
only a repository (.hg) and no working copy (the working copy parent
will be the null changeset). Otherwise, clone will initially check
Martin Geisler
commands: use enumerated lists in help texts
r9740 out (in order of precedence):
Adrian Buehlmann
clone: add option -u/--updaterev
r9714
Martin Geisler
commands: do not indent list in clone help string
r9891 a) the changeset, tag or branch specified with -u/--updaterev
b) the changeset, tag or branch given with the first -r/--rev
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 c) the branch given with the first -b/--branch
d) the branch given with the url#branch source syntax
e) the head of the default branch
Adrian Buehlmann
clone: add option -u/--updaterev
r9714
Use 'hg clone -u . src dst' to checkout the source repository's
parent changeset (applicable for local source repositories only).
A set of changesets (tags, or branch names) to pull may be specified
by listing each changeset (tag, or branch name) with -r/--rev.
If -r/--rev is used, the cloned repository will contain only a subset
of the changesets of the source repository. Only the set of changesets
Wagner Bruna
clone: simplify help text
r9806 defined by all -r/--rev options (including all their ancestors)
will be pulled into the destination repository.
Adrian Buehlmann
clone: add option -u/--updaterev
r9714 No subsequent changesets (including subsequent tags) will be present
in the destination.
Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
local source repositories.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 For efficiency, hardlinks are used for cloning whenever the source
Inaky Perez-Gonzalez
Expand clone help with hardlink information
r2762 and destination are on the same filesystem (note this applies only
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 to the repository data, not to the checked out files). Some
Inaky Perez-Gonzalez
Expand clone help with hardlink information
r2762 filesystems, such as AFS, implement hardlinking incorrectly, but
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 do not report errors. In these cases, use the --pull option to
Inaky Perez-Gonzalez
Expand clone help with hardlink information
r2762 avoid hardlinking.
Bryan O'Sullivan
issue 1053: heavily qualify the "cp -al" advice for cloning
r6509 In some cases, you can clone repositories and checked out files
Martin Geisler
commands: wrap docstrings at 70 characters...
r9249 using full hardlinks with ::
Inaky Perez-Gonzalez
Expand clone help with hardlink information
r2762
$ cp -al REPO REPOCLONE
Martin Geisler
Change double spaces to single spaces in help texts.
r7983 This is the fastest way to clone, but it is not always safe. The
Bryan O'Sullivan
issue 1053: heavily qualify the "cp -al" advice for cloning
r6509 operation is not atomic (making sure REPO is not modified during
the operation is up to you) and you have to make sure your editor
Martin Geisler
Change double spaces to single spaces in help texts.
r7983 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
Bryan O'Sullivan
issue 1053: heavily qualify the "cp -al" advice for cloning
r6509 this is not compatible with certain extensions that place their
metadata under the .hg directory, such as mq.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Adrian Buehlmann
clone: add option -u/--updaterev
r9714 if opts.get('noupdate') and opts.get('updaterev'):
raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
Matt Mackall
add cmdutil.remoteui...
r8188 hg.clone(cmdutil.remoteui(ui, opts), source, dest,
Alexander Solovyov
commands: optional options where possible...
r7131 pull=opts.get('pull'),
stream=opts.get('uncompressed'),
rev=opts.get('rev'),
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 update=opts.get('updaterev') or not opts.get('noupdate'),
branch=opts.get('branch'))
mpm@selenic.com
Whitespace cleanups...
r515
Bryan O'Sullivan
Adapt commit to use file matching code....
r813 def commit(ui, repo, *pats, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """commit the specified files or all outstanding changes
Martin Geisler
Change double spaces to single spaces in help texts.
r7983 Commit changes to the given files into the repository. Unlike a
centralized RCS, this operation is a local operation. See hg push
timeless
Improve English for help text of many core hg commands....
r8779 for a way to actively distribute your changes.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
If a list of files is omitted, all changes reported by "hg status"
mcmillen@cs.cmu.edu
Spelling fix: "commited" -> "committed"
r1995 will be committed.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Bryan O'Sullivan
commit: when committing the results of a merge, it's all or nothing...
r6385 If you are committing the result of a merge, do not provide any
timeless
Generally replace "file name" with "filename" in help and comments.
r8761 filenames or -I/-X filters.
Bryan O'Sullivan
commit: when committing the results of a merge, it's all or nothing...
r6385
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 If no commit message is specified, the configured editor is
started to prompt you for a message.
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163
See 'hg help dates' for a list of formats valid for -d/--date.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
John Mulligan
branch closing: mark closed branches with a 'close' extra...
r7655 extra = {}
if opts.get('close_branch'):
extra['close'] = 1
Matt Mackall
commit: move commit editor to cmdutil, pass as function
r8407 e = cmdutil.commiteditor
if opts.get('force_editor'):
e = cmdutil.commitforceeditor
Matt Mackall
match: stop passing files through commitfunc
r6600 def commitfunc(ui, repo, message, match, opts):
Matt Mackall
commit: drop the now-unused files parameter
r8706 return repo.commit(message, opts.get('user'), opts.get('date'), match,
editor=e, extra=extra)
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336
Alexis S. L. Carvalho
Avoid calling heads() twice on every hg commit....
r6369 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
if not node:
Matt Mackall
commit: lose some pointless 'nothing changed' messages...
r8995 ui.status(_("nothing changed\n"))
Alexis S. L. Carvalho
Avoid calling heads() twice on every hg commit....
r6369 return
cl = repo.changelog
rev = cl.rev(node)
parents = cl.parentrevs(rev)
if rev - 1 in parents:
# one of the parents was the old tip
Gilles Moris
Have verbose and debug flag print the changeset rev and hash when committing....
r6935 pass
elif (parents == (nullrev, nullrev) or
len(cl.heads(cl.node(parents[0]))) > 1 and
(parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)):
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 ui.status(_('created new head\n'))
mpm@selenic.com
big heap of command clean-up work...
r245
Gilles Moris
Have verbose and debug flag print the changeset rev and hash when committing....
r6935 if ui.debugflag:
Martin Geisler
coding style: use a space after comma...
r9198 ui.write(_('committed changeset %d:%s\n') % (rev, hex(node)))
Gilles Moris
Have verbose and debug flag print the changeset rev and hash when committing....
r6935 elif ui.verbose:
Martin Geisler
coding style: use a space after comma...
r9198 ui.write(_('committed changeset %d:%s\n') % (rev, short(node)))
Gilles Moris
Have verbose and debug flag print the changeset rev and hash when committing....
r6935
Bryan O'Sullivan
Add rename/mv command....
r1253 def copy(ui, repo, *pats, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """mark files as copied for the next commit
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 Mark dest as having copies of source files. If dest is a
directory, copies are put in that directory. If dest is a file,
timeless
help: miscellaneous language fixes
r7807 the source must be a single file.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
By default, this command copies the contents of files as they
timeless
Improve English for help text of many core hg commands....
r8779 exist in the working directory. If invoked with -A/--after, the
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 operation is recorded, but no copying is performed.
timeless
help: miscellaneous language fixes
r7807 This command takes effect with the next commit. To undo a copy
Matt Mackall
Add doc notes about revert and hg status vs diff
r3829 before that, see hg revert.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Matt Mackall
repo locks: use True/False
r4914 wlock = repo.wlock(False)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
Matt Mackall
copy: handle rename internally...
r5610 return cmdutil.copy(ui, repo, pats, opts)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 finally:
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 wlock.release()
mpm@selenic.com
Add hg copy...
r363
Thomas Arendsen Hein
Make hg debugancestor accept -R by making it an optionalrepo command.
r6189 def debugancestor(ui, repo, *args):
mpm@selenic.com
Add debugancestor command
r1262 """find the ancestor revision of two revisions in a given index"""
Thomas Arendsen Hein
debugancestor: use *args instead of *opts, to not confuse with option dicts.
r6188 if len(args) == 3:
index, rev1, rev2 = args
Bryan O'Sullivan
debugancestor: make the index argument optional, defaulting to 00changelog.i
r6178 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
Alexis S. L. Carvalho
debugancestor: use repo.lookup when no revlog was specified
r6253 lookup = r.lookup
Thomas Arendsen Hein
debugancestor: use *args instead of *opts, to not confuse with option dicts.
r6188 elif len(args) == 2:
Thomas Arendsen Hein
Make hg debugancestor accept -R by making it an optionalrepo command.
r6189 if not repo:
raise util.Abort(_("There is no Mercurial repository here "
"(.hg not found)"))
Thomas Arendsen Hein
debugancestor: use *args instead of *opts, to not confuse with option dicts.
r6188 rev1, rev2 = args
Bryan O'Sullivan
debugancestor: make the index argument optional, defaulting to 00changelog.i
r6178 r = repo.changelog
Alexis S. L. Carvalho
debugancestor: use repo.lookup when no revlog was specified
r6253 lookup = repo.lookup
Bryan O'Sullivan
debugancestor: make the index argument optional, defaulting to 00changelog.i
r6178 else:
raise util.Abort(_('either two or three arguments required'))
Alexis S. L. Carvalho
debugancestor: use repo.lookup when no revlog was specified
r6253 a = r.ancestor(lookup(rev1), lookup(rev2))
mpm@selenic.com
Add debugancestor command
r1262 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
Dirkjan Ochtman
add debugcommands command: an easy to parse command + option index
r7880 def debugcommands(ui, cmd='', *args):
Matt Mackall
replace util.sort with sorted built-in...
r8209 for cmd, vals in sorted(table.iteritems()):
Dirkjan Ochtman
add debugcommands command: an easy to parse command + option index
r7880 cmd = cmd.split('|')[0].strip('^')
opts = ', '.join([i[1] for i in vals[1]])
ui.write('%s: %s\n' % (cmd, opts))
Alexis S. L. Carvalho
add --options to debugcomplete and change bash_completion to use it...
r2034 def debugcomplete(ui, cmd='', **opts):
Benoit Boissinot
new command debugcomplete...
r1887 """returns the completion list associated with the given command"""
Alexis S. L. Carvalho
add --options to debugcomplete and change bash_completion to use it...
r2034
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('options'):
Alexis S. L. Carvalho
add --options to debugcomplete and change bash_completion to use it...
r2034 options = []
otables = [globalopts]
if cmd:
Matt Mackall
findcmd: have dispatch look up strict flag
r7213 aliases, entry = cmdutil.findcmd(cmd, table, False)
Alexis S. L. Carvalho
add --options to debugcomplete and change bash_completion to use it...
r2034 otables.append(entry[1])
for t in otables:
for o in t:
if o[0]:
options.append('-%s' % o[0])
options.append('--%s' % o[1])
ui.write("%s\n" % "\n".join(options))
return
Brendan Cully
Make debugcomplete -v print aliases as well as commands
r7509 cmdlist = cmdutil.findpossible(cmd, table)
if ui.verbose:
cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
Matt Mackall
replace util.sort with sorted built-in...
r8209 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
Benoit Boissinot
new command debugcomplete...
r1887
Matt Mackall
add debugfsinfo to check fs capabilities
r5741 def debugfsinfo(ui, path = "."):
Alejandro Santos
compat: use open() instead of file() everywhere
r9031 open('.debugfsinfo', 'w').write('')
Matt Mackall
add debugfsinfo to check fs capabilities
r5741 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
Matt Mackall
rename checkfolding to checkcase
r6746 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
Matt Mackall
add debugfsinfo to check fs capabilities
r5741 and 'yes' or 'no'))
os.unlink('.debugfsinfo')
Matt Mackall
use repo[changeid] to get a changectx
r6747 def debugrebuildstate(ui, repo, rev="tip"):
Benoit Boissinot
add 'debugrebuildstate' to rebuild the dirstate from a given revision...
r1755 """rebuild the dirstate as it would look like for the given revision"""
Matt Mackall
use repo[changeid] to get a changectx
r6747 ctx = repo[rev]
Benoit Boissinot
fix typo in debugrebuildstate
r1760 wlock = repo.wlock()
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
Matt Mackall
use repo[changeid] to get a changectx
r6747 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 finally:
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 wlock.release()
Benoit Boissinot
add 'debugrebuildstate' to rebuild the dirstate from a given revision...
r1755
mpm@selenic.com
A bunch of parsing/help updates...
r596 def debugcheckstate(ui, repo):
"""validate the correctness of the current dirstate"""
mpm@selenic.com
add dirstate debugging commands...
r460 parent1, parent2 = repo.dirstate.parents()
Matt Mackall
use repo[changeid] to get a changectx
r6747 m1 = repo[parent1].manifest()
m2 = repo[parent2].manifest()
mpm@selenic.com
add dirstate debugging commands...
r460 errors = 0
Matt Mackall
dirstate: add __contains__ and make __getitem__ more useful...
r4906 for f in repo.dirstate:
state = repo.dirstate[f]
mpm@selenic.com
add dirstate debugging commands...
r460 if state in "nr" and f not in m1:
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
mpm@selenic.com
add dirstate debugging commands...
r460 errors += 1
if state in "a" and f in m1:
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
mpm@selenic.com
add dirstate debugging commands...
r460 errors += 1
if state in "m" and f not in m1 and f not in m2:
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ui.warn(_("%s in state %s, but not in either manifest\n") %
mpm@selenic.com
Remove all remaining print statements...
r582 (f, state))
mpm@selenic.com
add dirstate debugging commands...
r460 errors += 1
for f in m1:
Matt Mackall
dirstate: add __contains__ and make __getitem__ more useful...
r4906 state = repo.dirstate[f]
mpm@selenic.com
add dirstate debugging commands...
r460 if state not in "nrm":
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
mpm@selenic.com
add dirstate debugging commands...
r460 errors += 1
if errors:
Muli Ben-Yehuda
strictly adher to 80 chars per line
r1602 error = _(".hg/dirstate inconsistent with current parent's manifest")
raise util.Abort(error)
mpm@selenic.com
add dirstate debugging commands...
r460
Alexis S. L. Carvalho
add --untrusted to showconfig
r3553 def showconfig(ui, repo, *values, **opts):
Vadim Gelfer
debugconfig: allow to print by section and exact item name
r2410 """show combined config settings from all hgrc files
Martin Geisler
commands: expand "arg" -> "argument" in showconfig help strings...
r8664 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.
Martin Geisler
commands: describe --debug in showconfig help
r8279
timeless
Improve English for help text of many core hg commands....
r8779 With --debug, the source (filename and line number) is printed
for each config item.
Martin Geisler
commands: describe --debug in showconfig help
r8279 """
Vadim Gelfer
debugconfig: allow to print by section and exact item name
r2410
Alexis S. L. Carvalho
add --untrusted to showconfig
r3553 untrusted = bool(opts.get('untrusted'))
Vadim Gelfer
debugconfig: allow to print by section and exact item name
r2410 if values:
if len([v for v in values if '.' in v]) > 1:
raise util.Abort(_('only one config item permitted'))
Alexis S. L. Carvalho
add --untrusted to showconfig
r3553 for section, name, value in ui.walkconfig(untrusted=untrusted):
Vadim Gelfer
debugconfig: allow to print by section and exact item name
r2410 sectname = section + '.' + name
if values:
for v in values:
if v == section:
Matt Mackall
showconfig: show source file and line with --debug
r8182 ui.debug('%s: ' %
ui.configsource(section, name, untrusted))
Vadim Gelfer
debugconfig: allow to print by section and exact item name
r2410 ui.write('%s=%s\n' % (sectname, value))
elif v == sectname:
Matt Mackall
showconfig: show source file and line with --debug
r8182 ui.debug('%s: ' %
ui.configsource(section, name, untrusted))
Vadim Gelfer
debugconfig: allow to print by section and exact item name
r2410 ui.write(value, '\n')
else:
Matt Mackall
showconfig: show source file and line with --debug
r8182 ui.debug('%s: ' %
ui.configsource(section, name, untrusted))
Vadim Gelfer
debugconfig: allow to print by section and exact item name
r2410 ui.write('%s=%s\n' % (sectname, value))
Bryan O'Sullivan
Add commands.debugconfig....
r1028
Matt Mackall
Add debugsetparents command
r1395 def debugsetparents(ui, repo, rev1, rev2=None):
TK Soh
minor fix on command help docstrings
r1470 """manually set the parents of the current working directory
Matt Mackall
Add debugsetparents command
r1395
This is useful for writing repository conversion tools, but should
be used with care.
"""
if not rev2:
rev2 = hex(nullid)
Alexis S. L. Carvalho
debugsetparents: wlock the repo before updating the dirstate
r4247 wlock = repo.wlock()
try:
repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
finally:
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 wlock.release()
Matt Mackall
Add debugsetparents command
r1395
Alexis S. L. Carvalho
debugstate: add --nodates...
r6296 def debugstate(ui, repo, nodates=None):
mpm@selenic.com
A bunch of parsing/help updates...
r596 """show the contents of the current dirstate"""
Alexis S. L. Carvalho
debugstate: add --nodates...
r6296 timestr = ""
showdate = not nodates
Matt Mackall
replace util.sort with sorted built-in...
r8209 for file_, ent in sorted(repo.dirstate._map.iteritems()):
Alexis S. L. Carvalho
debugstate: add --nodates...
r6296 if showdate:
if ent[3] == -1:
# Pad or slice to locale representation
Matt Mackall
many, many trivial check-code fixups
r10282 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
time.localtime(0)))
Alexis S. L. Carvalho
debugstate: add --nodates...
r6296 timestr = 'unset'
Matt Mackall
many, many trivial check-code fixups
r10282 timestr = (timestr[:locale_len] +
' ' * (locale_len - len(timestr)))
Alexis S. L. Carvalho
debugstate: add --nodates...
r6296 else:
Matt Mackall
many, many trivial check-code fixups
r10282 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
time.localtime(ent[3]))
Bryan O'Sullivan
debugstate: print symlinks as 'lnk', not '777'
r5156 if ent[1] & 020000:
mode = 'lnk'
else:
mode = '%3o' % (ent[1] & 0777)
Alexis S. L. Carvalho
debugstate: add --nodates...
r6296 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
Benoit Boissinot
fix users of dirstate.copies broken by b1f10d3223c1
r3159 for f in repo.dirstate.copies():
ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
mpm@selenic.com
add dirstate debugging commands...
r460
Matt Mackall
subrepo: introduce basic state parsing
r8812 def debugsub(ui, repo, rev=None):
if rev == '':
rev = None
Matt Mackall
many, many trivial check-code fixups
r10282 for k, v in sorted(repo[rev].substate.items()):
Matt Mackall
subrepo: introduce basic state parsing
r8812 ui.write('path %s\n' % k)
ui.write(' source %s\n' % v[0])
ui.write(' revision %s\n' % v[1])
mpm@selenic.com
Add debugdata for dumping revlog revision data
r1039 def debugdata(ui, file_, rev):
Matt Mackall
revlog: simplify revlog version handling...
r4258 """dump the contents of a data file revision"""
r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i")
Anupam Kapoor
Fix traceback during invalid rev identifier for debugdata
r1313 try:
ui.write(r.revision(r.lookup(rev)))
except KeyError:
Thomas Arendsen Hein
Never apply string formatting to generated errors with util.Abort....
r3072 raise util.Abort(_('invalid revision identifier %s') % rev)
mpm@selenic.com
Add debugdata for dumping revlog revision data
r1039
Matt Mackall
Add date matching support...
r3812 def debugdate(ui, date, range=None, **opts):
Matt Mackall
add debugdate command
r3805 """parse and display a date"""
Matt Mackall
Add date matching support...
r3812 if opts["extended"]:
d = util.parsedate(date, util.extendeddateformats)
else:
d = util.parsedate(date)
Matt Mackall
add debugdate command
r3805 ui.write("internal: %s %s\n" % d)
ui.write("standard: %s\n" % util.datestr(d))
Matt Mackall
Add date matching support...
r3812 if range:
m = util.matchdate(range)
ui.write("match: %s\n" % m(d[0]))
Matt Mackall
add debugdate command
r3805
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 def debugindex(ui, file_):
mpm@selenic.com
A bunch of parsing/help updates...
r596 """dump the contents of an index file"""
Matt Mackall
revlog: simplify revlog version handling...
r4258 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
Martin Geisler
commands: removed unnecessary string concatenation
r7737 ui.write(" rev offset length base linkrev"
mpm@selenic.com
Reformat debugindex output
r989 " nodeid p1 p2\n")
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 for i in r:
mason@suse.com
Implement revlogng....
r2072 node = r.node(i)
Matt Mackall
debugindex: more robust for damaged indexes
r5311 try:
pp = r.parents(node)
except:
pp = [nullid, nullid]
mpm@selenic.com
Reformat debugindex output
r989 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
Matt Mackall
linkrev: take a revision number rather than a hash
r7361 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
mason@suse.com
Implement revlogng....
r2072 short(node), short(pp[0]), short(pp[1])))
mpm@selenic.com
migrate remaining commands...
r248
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 def debugindexdot(ui, file_):
timeless
Improve English for help text of many core hg commands....
r8779 """dump an index DAG as a graphviz dot file"""
Matt Mackall
revlog: simplify revlog version handling...
r4258 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
mpm@selenic.com
Remove all remaining print statements...
r582 ui.write("digraph G {\n")
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 for i in r:
Samuel Masham
Update debugindexdot to work with RevlogNG.
r2287 node = r.node(i)
pp = r.parents(node)
ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
if pp[1] != nullid:
ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
mpm@selenic.com
Remove all remaining print statements...
r582 ui.write("}\n")
mpm@selenic.com
migrate remaining commands...
r248
Matt Mackall
Add debuginstall command to do basic install tests
r3844 def debuginstall(ui):
'''test Mercurial installation'''
Matt Mackall
Make debuginstall actually attempt to use external patch and merge...
r3846 def writetemp(contents):
Thomas Arendsen Hein
Use a prefix for debuginstall tempfiles....
r4849 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
Matt Mackall
Make debuginstall actually attempt to use external patch and merge...
r3846 f = os.fdopen(fd, "wb")
f.write(contents)
f.close()
return name
Matt Mackall
Add debuginstall command to do basic install tests
r3844 problems = 0
# encoding
Matt Mackall
move encoding bits from util to encoding...
r7948 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
Matt Mackall
Add debuginstall command to do basic install tests
r3844 try:
Matt Mackall
move encoding bits from util to encoding...
r7948 encoding.fromlocal("test")
Matt Mackall
Add debuginstall command to do basic install tests
r3844 except util.Abort, inst:
ui.write(" %s\n" % inst)
Matt Mackall
Add some remedies and a username check to debuginstall
r3848 ui.write(_(" (check that your locale is properly set)\n"))
Matt Mackall
Add debuginstall command to do basic install tests
r3844 problems += 1
# compiled modules
ui.status(_("Checking extensions...\n"))
try:
import bdiff, mpatch, base85
except Exception, inst:
ui.write(" %s\n" % inst)
Matt Mackall
Add some remedies and a username check to debuginstall
r3848 ui.write(_(" One or more extensions could not be found"))
ui.write(_(" (check that you compiled the extensions)\n"))
Matt Mackall
Add debuginstall command to do basic install tests
r3844 problems += 1
# templates
ui.status(_("Checking templates...\n"))
try:
import templater
Peter Arrenbrecht
cleanup: drop variables for unused return values...
r7874 templater.templater(templater.templatepath("map-cmdline.default"))
Matt Mackall
Add debuginstall command to do basic install tests
r3844 except Exception, inst:
ui.write(" %s\n" % inst)
Matt Mackall
Add some remedies and a username check to debuginstall
r3848 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
Matt Mackall
Add debuginstall command to do basic install tests
r3844 problems += 1
# patch
ui.status(_("Checking patch...\n"))
Patrick Mezard
debuginstall: stop looking for patch utility, just test it
r5310 patchproblems = 0
a = "1\n2\n3\n4\n"
b = "1\n2\n3\ninsert\n4\n"
fa = writetemp(a)
Dustin Sallings
Use both the from and to name in mdiff.unidiff....
r5482 d = mdiff.unidiff(a, None, b, None, os.path.basename(fa),
os.path.basename(fa))
Patrick Mezard
debuginstall: stop looking for patch utility, just test it
r5310 fd = writetemp(d)
files = {}
try:
patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files)
except util.Abort, e:
ui.write(_(" patch call failed:\n"))
ui.write(" " + str(e) + "\n")
patchproblems += 1
Matt Mackall
Make debuginstall actually attempt to use external patch and merge...
r3846 else:
Patrick Mezard
debuginstall: stop looking for patch utility, just test it
r5310 if list(files) != [os.path.basename(fa)]:
ui.write(_(" unexpected patch output!\n"))
patchproblems += 1
Alejandro Santos
compat: use open() instead of file() everywhere
r9031 a = open(fa).read()
Patrick Mezard
debuginstall: stop looking for patch utility, just test it
r5310 if a != b:
ui.write(_(" patch test failed!\n"))
patchproblems += 1
if patchproblems:
if ui.config('ui', 'patch'):
ui.write(_(" (Current patch tool may be incompatible with patch,"
" or misconfigured. Please check your .hgrc file)\n"))
Thomas Arendsen Hein
Removed trailing whitespace and tabs from python files
r4516 else:
Thomas Arendsen Hein
Removed tabs and trailing whitespace in python files
r5760 ui.write(_(" Internal patcher failure, please report this error"
Dirkjan Ochtman
change wiki/bts URLs to point to new hostname
r8936 " to http://mercurial.selenic.com/bts/\n"))
Patrick Mezard
debuginstall: stop looking for patch utility, just test it
r5310 problems += patchproblems
os.unlink(fa)
os.unlink(fd)
Matt Mackall
Add debuginstall command to do basic install tests
r3844
# editor
ui.status(_("Checking commit editor...\n"))
Osku Salerma
Use VISUAL in addition to EDITOR when choosing the editor to use.
r5660 editor = ui.geteditor()
Bryan O'Sullivan
Introduce find_exe. Use instead of find_in_path for programs....
r4488 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
Matt Mackall
Add debuginstall command to do basic install tests
r3844 if not cmdpath:
Benoit Boissinot
debuginstall: fix a copy/paste error
r3855 if editor == 'vi':
Matt Mackall
Add debuginstall command to do basic install tests
r3844 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
Matt Mackall
Add some remedies and a username check to debuginstall
r3848 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
Matt Mackall
Add debuginstall command to do basic install tests
r3844 else:
ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
Matt Mackall
Add some remedies and a username check to debuginstall
r3848 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
Matt Mackall
Add debuginstall command to do basic install tests
r3844 problems += 1
Matt Mackall
Add some remedies and a username check to debuginstall
r3848 # check username
ui.status(_("Checking username...\n"))
Martin Geisler
commands: call ui.username carefully in debuginstall...
r9734 try:
user = ui.username()
except util.Abort, e:
ui.write(" %s\n" % e)
Matt Mackall
Add some remedies and a username check to debuginstall
r3848 ui.write(_(" (specify a username in your .hgrc file)\n"))
Martin Geisler
commands: call ui.username carefully in debuginstall...
r9734 problems += 1
Matt Mackall
Add some remedies and a username check to debuginstall
r3848
Matt Mackall
Add debuginstall command to do basic install tests
r3844 if not problems:
ui.status(_("No problems detected\n"))
else:
ui.write(_("%s problems detected,"
" please check your install!\n") % problems)
return problems
Matt Mackall
refactor debugrenamed
r3652 def debugrename(ui, repo, file1, *pats, **opts):
bos@serpentine.internal.keyresearch.com
Add doc string for debugrename.
r1194 """dump rename information"""
Matt Mackall
refactor debugrenamed
r3652
Matt Mackall
make debugrename work on p1, not tip
r6748 ctx = repo[opts.get('rev')]
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 m = cmdutil.match(repo, (file1,) + pats, opts)
Matt Mackall
context: add walk method
r6764 for abs in ctx.walk(m):
fctx = ctx[abs]
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 o = fctx.filelog().renamed(fctx.filenode())
Matt Mackall
walk: remove rel and exact returns
r6584 rel = m.rel(abs)
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 if o:
ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
Matt Mackall
refactor debugrenamed
r3652 else:
ui.write(_("%s not renamed\n") % rel)
mpm@selenic.com
Add some rename debugging support
r1116
Bryan O'Sullivan
Clean up walk and changes code to use normalised names properly....
r820 def debugwalk(ui, repo, *pats, **opts):
Thomas Arendsen Hein
Added missing doc strings for two new debug commmands.
r1053 """show how files match on given patterns"""
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 m = cmdutil.match(repo, pats, opts)
Matt Mackall
walk: remove cmdutil.walk
r6585 items = list(repo.walk(m))
Thomas Arendsen Hein
Cleanups to commands.py
r1065 if not items:
return
Matt Mackall
walk: return a single value
r6586 fmt = 'f %%-%ds %%-%ds %%s' % (
max([len(abs) for abs in items]),
max([len(m.rel(abs)) for abs in items]))
for abs in items:
line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
Thomas Arendsen Hein
Make debugwalk strip trailing spaces and remove these from test-walk.out
r1309 ui.write("%s\n" % line.rstrip())
Bryan O'Sullivan
Clean up walk and changes code to use normalised names properly....
r820
Bryan O'Sullivan
Convert diff command over to using walk code.
r732 def diff(ui, repo, *pats, **opts):
Benoit Boissinot
make all commands be repo-wide by default...
r1568 """diff repository (or selected files)
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Show differences between revisions for the specified files.
Differences between files are shown using the unified diff format.
Matt Mackall
Add notes about diff/merge asymmetry to export, diff, and log
r3822 NOTE: 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.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 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 parent.
timeless
commands: correct diff -c explanation
r10527 Alternatively you can specify -c/--change with a revision to see
the changes in that changeset relative to its first parent.
timeless
commands: mention diff -c
r10520
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 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
Martin Geisler
commands: use single-quotes for 'hg help ...' hints
r7974 format. For more information, read 'hg help diffs'.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Stepan Koltsov
diff: add --change option to display single changeset diff (issue1420)
r7628
revs = opts.get('rev')
change = opts.get('change')
Brodie Rao
diff: add --stat for diffstat output...
r9640 stat = opts.get('stat')
Martin Geisler
diff: change --inverse to --reverse...
r9857 reverse = opts.get('reverse')
Stepan Koltsov
diff: add --change option to display single changeset diff (issue1420)
r7628
if revs and change:
msg = _('cannot specify --rev and --change at the same time')
raise util.Abort(msg)
elif change:
node2 = repo.lookup(change)
node1 = repo[node2].parents()[0].node()
else:
node1, node2 = cmdutil.revpair(repo, revs)
mpm@selenic.com
big heap of command clean-up work...
r245
Martin Geisler
diff: change --inverse to --reverse...
r9857 if reverse:
Yannick Gingras
diff: add --inverse option...
r9725 node1, node2 = node2, node1
Brodie Rao
diff: add --stat for diffstat output...
r9640 if stat:
opts['unified'] = '0'
Brodie Rao
diffstat: with --git, mark binary files with Bin...
r9642 diffopts = patch.diffopts(ui, opts)
Brodie Rao
diff: add --stat for diffstat output...
r9640
Matt Mackall
walk: remove remaining users of cmdutils.matchpats
r6582 m = cmdutil.match(repo, pats, opts)
Brodie Rao
diffstat: with --git, mark binary files with Bin...
r9642 it = patch.diff(repo, node1, node2, match=m, opts=diffopts)
Brodie Rao
diff: add --stat for diffstat output...
r9640 if stat:
width = ui.interactive() and util.termwidth() or 80
Brodie Rao
diffstat: with --git, mark binary files with Bin...
r9642 ui.write(patch.diffstat(util.iterlines(it), width=width,
git=diffopts.git))
Brodie Rao
diff: add --stat for diffstat output...
r9640 else:
for chunk in it:
ui.write(chunk)
Thomas Arendsen Hein
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli....
r396
mpm@selenic.com
[PATCH] New export patch...
r580 def export(ui, repo, *changesets, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """dump the header and diffs for one or more changesets
Print the changeset header and diffs for one or more revisions.
Steve Losh
commands: fix the list of changeset header information in 'hg help export'
r10334 The information shown in the changeset header is: author, date,
Steve Losh
commands: fix more changeset header information in 'hg help export'
r10335 branch name (if non-default), changeset hash, parent(s) and commit
comment.
Matt Mackall
Add notes about diff/merge asymmetry to export, diff, and log
r3822
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 NOTE: export may generate unexpected diff output for merge
changesets, as it will compare the merge changeset against its
first parent only.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Output may be to a file, in which case the name of the file is
Martin Geisler
commands: use field lists instead of literal blocks in docstrings...
r9892 given using a format string. The formatting rules are as follows:
:``%%``: literal "%" character
:``%H``: changeset hash (40 bytes of hexadecimal)
:``%N``: number of patches being generated
:``%R``: changeset revision number
:``%b``: basename of the exporting repository
:``%h``: short-form changeset hash (12 bytes of hexadecimal)
:``%n``: zero-padded sequence number, starting at 1
:``%r``: zero-padded changeset revision number
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 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.
Use the -g/--git option to generate diffs in the git extended diff
timeless
Improve English for help text of many core hg commands....
r8779 format. See 'hg help diffs' for more information.
Dirkjan Ochtman
help: commands supporting --git point to the gitdiffs topic (issue1352)
r7307
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 With the --switch-parent option, the diff will be against the
second parent. It can be useful to review a merge.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Alexander Solovyov
commands.export: accept -r option as revision specification...
r10015 changesets += tuple(opts.get('rev', []))
shaleh@speakeasy.net
check export options for changeset before running...
r610 if not changesets:
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 raise util.Abort(_("export requires at least one changeset"))
Thomas Arendsen Hein
Removed unused ui parameter from revpair/revrange and fix its users.
r3707 revs = cmdutil.revrange(repo, changesets)
Vadim Gelfer
refactor text diff/patch code....
r2874 if len(revs) > 1:
ui.note(_('exporting patches:\n'))
else:
ui.note(_('exporting patch:\n'))
Alexander Solovyov
commands: optional options where possible...
r7131 patch.export(repo, revs, template=opts.get('output'),
switch_parent=opts.get('switch_parent'),
Matt Mackall
Move ui.diffopts to patch.diffopts where it belongs
r2888 opts=patch.diffopts(ui, opts))
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246
Steve Losh
Add a forget command for easily untracking files....
r8902 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 undo a forget before the next commit, see hg add.
"""
if not pats:
raise util.Abort(_('no files specified'))
m = cmdutil.match(repo, pats, opts)
s = repo.status(match=m, clean=True)
forget = sorted(s[0] + s[1] + s[3] + s[6])
for f in m.files():
if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
ui.warn(_('not removing %s: file is already untracked\n')
% m.rel(f))
for f in forget:
if ui.verbose or not m.exact(f):
ui.status(_('removing %s\n') % m.rel(f))
repo.remove(forget, unlink=False)
Thomas Arendsen Hein
Remove some options from 'hg grep':...
r1108 def grep(ui, repo, pattern, *pats, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """search for a pattern in specified files and revisions
Search revisions of files for a regular expression.
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 This command behaves differently than Unix grep. It only accepts
Python/Perl regexps. It searches repository history, not the
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 working directory. It always prints the revision number in which a
match appears.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
By default, grep only prints output for the first revision of a
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 file in which it finds a match. To get it to print every revision
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 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 --all flag.
"""
Bryan O'Sullivan
Add grep command....
r1057 reflags = 0
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('ignore_case'):
Thomas Arendsen Hein
Cleanups to commands.py
r1065 reflags |= re.I
Giorgos Keramidas
hg grep: handle re.compile errors & update tests/test-grep
r4877 try:
regexp = re.compile(pattern, reflags)
except Exception, inst:
Thomas Arendsen Hein
Remove trailing ! from two error messages as this was confusing.
r6057 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
Giorgos Keramidas
hg grep: handle re.compile errors & update tests/test-grep
r4877 return None
bos@serpentine.internal.keyresearch.com
grep: extend functionality, add man page entry, add unit test....
r1146 sep, eol = ':', '\n'
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('print0'):
bos@serpentine.internal.keyresearch.com
grep: extend functionality, add man page entry, add unit test....
r1146 sep = eol = '\0'
Bryan O'Sullivan
Add grep command....
r1057
Matt Mackall
fix memory usage of revlog caches by limiting cache size [issue1639]
r9097 getfile = util.lrucachefunc(repo.file)
Bryan O'Sullivan
Add grep command....
r1057
def matchlines(body):
bos@serpentine.internal.keyresearch.com
grep: speed up matching, and only return one match per line.
r1059 begin = 0
linenum = 0
while True:
match = regexp.search(body, begin)
Thomas Arendsen Hein
Cleanups to commands.py
r1065 if not match:
break
bos@serpentine.internal.keyresearch.com
grep: speed up matching, and only return one match per line.
r1059 mstart, mend = match.span()
linenum += body.count('\n', begin, mstart) + 1
lstart = body.rfind('\n', begin, mstart) + 1 or begin
Matt Mackall
grep: avoid infinite loop when trailing newline is missing
r7230 begin = body.find('\n', mend) + 1 or len(body)
lend = begin - 1
bos@serpentine.internal.keyresearch.com
grep: speed up matching, and only return one match per line.
r1059 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
Bryan O'Sullivan
Add grep command....
r1057
Eric Hopper
Convert all classes to new-style classes by deriving them from object.
r1559 class linestate(object):
Bryan O'Sullivan
Add grep command....
r1057 def __init__(self, line, linenum, colstart, colend):
self.line = line
self.linenum = linenum
self.colstart = colstart
self.colend = colend
Brendan Cully
grep: display correct user/revision for --all in reverse....
r2869
Paul Moore
python 2.6 compatibility: add __hash__ to classes that have __eq__
r6469 def __hash__(self):
return hash((self.linenum, self.line))
Thomas Arendsen Hein
Cleanups to commands.py
r1065 def __eq__(self, other):
return self.line == other.line
Bryan O'Sullivan
Add grep command....
r1057
matches = {}
Brendan Cully
grep: add --follow support.
r2870 copies = {}
Bryan O'Sullivan
Add grep command....
r1057 def grepbody(fn, rev, body):
Brendan Cully
grep: display correct user/revision for --all in reverse....
r2869 matches[rev].setdefault(fn, [])
Bryan O'Sullivan
Add grep command....
r1057 m = matches[rev][fn]
for lnum, cstart, cend, line in matchlines(body):
s = linestate(line, lnum, cstart, cend)
Brendan Cully
grep: display correct user/revision for --all in reverse....
r2869 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 == 'insert':
Benoit Boissinot
use xrange instead of range
r3472 for i in xrange(blo, bhi):
Brendan Cully
grep: display correct user/revision for --all in reverse....
r2869 yield ('+', b[i])
elif tag == 'delete':
Benoit Boissinot
use xrange instead of range
r3472 for i in xrange(alo, ahi):
Brendan Cully
grep: display correct user/revision for --all in reverse....
r2869 yield ('-', a[i])
elif tag == 'replace':
Benoit Boissinot
use xrange instead of range
r3472 for i in xrange(alo, ahi):
Brendan Cully
grep: display correct user/revision for --all in reverse....
r2869 yield ('-', a[i])
Benoit Boissinot
use xrange instead of range
r3472 for i in xrange(blo, bhi):
Brendan Cully
grep: display correct user/revision for --all in reverse....
r2869 yield ('+', b[i])
Matt Mackall
walkchangerevs: internalize ctx caching
r9655 def display(fn, ctx, pstates, states):
rev = ctx.rev()
Thomas Arendsen Hein
Make annotae/grep print short dates with -q/--quiet....
r6134 datefunc = ui.quiet and util.shortdate or util.datestr
Benoit Boissinot
grep: remove count handling, simplify, fix issue337
r3951 found = False
bos@serpentine.internal.keyresearch.com
grep: extend functionality, add man page entry, add unit test....
r1146 filerevmatches = {}
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('all'):
FUJIWARA Katsunori
compare grep result between target and its parent...
r8849 iter = difflinestates(pstates, states)
Brendan Cully
grep: display correct user/revision for --all in reverse....
r2869 else:
FUJIWARA Katsunori
compare grep result between target and its parent...
r8849 iter = [('', l) for l in states]
Benoit Boissinot
grep: remove count handling, simplify, fix issue337
r3951 for change, l in iter:
Matt Mackall
walkchangerevs: internalize ctx caching
r9655 cols = [fn, str(rev)]
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('line_number'):
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 cols.append(str(l.linenum))
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('all'):
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 cols.append(change)
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('user'):
Matt Mackall
walkchangerevs: internalize ctx caching
r9655 cols.append(ui.shortuser(ctx.user()))
Thomas Arendsen Hein
Add hg grep -d/--date to list the commit date of matched revisions....
r6133 if opts.get('date'):
Matt Mackall
walkchangerevs: internalize ctx caching
r9655 cols.append(datefunc(ctx.date()))
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('files_with_matches'):
Matt Mackall
walkchangerevs: internalize ctx caching
r9655 c = (fn, rev)
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 if c in filerevmatches:
continue
bos@serpentine.internal.keyresearch.com
grep: extend functionality, add man page entry, add unit test....
r1146 filerevmatches[c] = 1
else:
cols.append(l.line)
ui.write(sep.join(cols), eol)
Benoit Boissinot
grep: remove count handling, simplify, fix issue337
r3951 found = True
return found
Bryan O'Sullivan
Add grep command....
r1057
Bryan O'Sullivan
grep: change default to printing first matching rev....
r1145 skip = {}
FUJIWARA Katsunori
compare grep result between target and its parent...
r8849 revfiles = {}
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 matchfn = cmdutil.match(repo, pats, opts)
Benoit Boissinot
grep: remove count handling, simplify, fix issue337
r3951 found = False
Brendan Cully
grep: add --follow support.
r2870 follow = opts.get('follow')
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662
def prep(ctx, fns):
rev = ctx.rev()
pctx = ctx.parents()[0]
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
copied = flog.renamed(fnode)
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]:
grepbody(fn, rev, flog.read(fnode))
pfn = copy or fn
if pfn not in matches[parent]:
Bryan O'Sullivan
Add grep command....
r1057 try:
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 fnode = pctx.filenode(pfn)
grepbody(pfn, parent, flog.read(fnode))
Matt Mackall
errors: move revlog errors...
r7633 except error.LookupError:
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 pass
Matt Mackall
walkchangerevs: drop ui arg
r9665 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 rev = ctx.rev()
parent = ctx.parents()[0].rev()
for fn in sorted(revfiles.get(rev, [])):
states = matches[rev][fn]
copy = copies.get(rev, {}).get(fn)
if fn in skip:
FUJIWARA Katsunori
compare grep result between target and its parent...
r8849 if copy:
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 skip[copy] = True
continue
pstates = matches.get(parent, {}).get(copy or fn, [])
if pstates or states:
r = display(fn, ctx, pstates, states)
found = found or r
if r and not opts.get('all'):
skip[fn] = True
FUJIWARA Katsunori
compare grep result between target and its parent...
r8849 if copy:
skip[copy] = True
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 del matches[rev]
del revfiles[rev]
Bryan O'Sullivan
Add grep command....
r1057
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 def heads(ui, repo, *branchrevs, **opts):
"""show current repository heads or show branch heads
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 With no arguments, show all repository branch heads.
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
Greg Ward
commands: tweak help for 'heads'....
r9502 Repository "heads" are changesets with no child changesets. They are
where development generally takes place and are the usual targets
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 for update and merge operations. Branch heads are changesets that have
no child changeset on the same branch.
If one or more REVs are given, only branch heads on the branches
associated with the specified changesets are shown.
Greg Ward
commands: tweak help for 'heads'....
r9502
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.
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350
If -t/--topo is specified, named branch mechanics will be ignored and only
changesets without children will be shown.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Dirkjan Ochtman
commands: simplify heads a little bit before I start hacking it up
r10328
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('rev'):
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 start = repo.lookup(opts['rev'])
else:
start = None
Dirkjan Ochtman
commands: simplify heads a little bit before I start hacking it up
r10328
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 if opts.get('topo'):
heads = [repo[h] for h in repo.heads(start)]
Benoit Boissinot
add a -r/--rev option to heads to show only heads descendant from rev
r1550 else:
Dirkjan Ochtman
commands: externalize branchheads so we can do it for all branches at once
r10348 heads = []
for b, ls in repo.branchmap().iteritems():
if start is None:
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 heads += [repo[h] for h in ls]
Dirkjan Ochtman
commands: externalize branchheads so we can do it for all branches at once
r10348 continue
startrev = repo.changelog.rev(start)
descendants = set(repo.changelog.descendants(startrev))
descendants.add(startrev)
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 rev = repo.changelog.rev
heads += [repo[h] for h in ls if rev(h) in descendants]
if branchrevs:
decode, encode = encoding.fromlocal, encoding.tolocal
branches = set(repo[decode(br)].branch() for br in branchrevs)
heads = [h for h in heads if h.branch() in branches]
Dirkjan Ochtman
commands: simplify heads a little bit before I start hacking it up
r10328
Dirkjan Ochtman
commands: actually implement --closed for topological heads
r10349 if not opts.get('closed'):
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 heads = [h for h in heads if not h.extra().get('close')]
Dirkjan Ochtman
commands: actually implement --closed for topological heads
r10349
if opts.get('active') and branchrevs:
dagheads = repo.heads(start)
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 heads = [h for h in heads if h.node() in dagheads]
Dirkjan Ochtman
commands: actually implement --closed for topological heads
r10349
if branchrevs:
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 haveheads = set(h.branch() for h in heads)
Dirkjan Ochtman
commands: don't do too much work for error messages
r10346 if branches - haveheads:
headless = ', '.join(encode(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)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 if not heads:
return 1
Dirkjan Ochtman
commands: simplify heads a little bit before I start hacking it up
r10328
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 heads = sorted(heads, key=lambda x: -x.rev())
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 displayer = cmdutil.show_changeset(ui, repo, opts)
Dirkjan Ochtman
commands: always order heads recent to oldest
r10331 for ctx in heads:
displayer.show(ctx)
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 displayer.close()
mpm@selenic.com
Beginning of multi-head support...
r221
Brodie Rao
dispatch: provide help for disabled extensions and commands...
r10364 def help_(ui, name=None, with_version=False, unknowncmd=False):
Matt Mackall
help: update help...
r7210 """show help for a given topic or a help overview
Matt Mackall
alphabetize help_ in commands
r3655
timeless
Improve English for help text of many core hg commands....
r8779 With no arguments, print a list of commands with short help messages.
Matt Mackall
alphabetize help_ in commands
r3655
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 Given a topic, extension, or command name, print help for that
topic."""
Matt Mackall
alphabetize help_ in commands
r3655 option_lists = []
Martin Geisler
commands: use minirst parser when displaying help
r9157 textwidth = util.termwidth() - 2
Matt Mackall
alphabetize help_ in commands
r3655
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 def addglobalopts(aliases):
if ui.verbose:
option_lists.append((_("global options:"), globalopts))
if name == 'shortlist':
option_lists.append((_('use "hg help" for the full list '
'of commands'), ()))
else:
if name == 'shortlist':
msg = _('use "hg help" for the full list of commands '
'or "hg -v" for details')
elif aliases:
msg = _('use "hg -v help%s" to show aliases and '
'global options') % (name and " " + name or "")
else:
msg = _('use "hg -v help %s" to show global options') % name
option_lists.append((msg, ()))
Matt Mackall
alphabetize help_ in commands
r3655 def helpcmd(name):
if with_version:
version_(ui)
ui.write('\n')
Johannes Stezenbach
help: enable listing of a subset of the command list...
r6652
try:
Brodie Rao
dispatch: provide help for disabled extensions and commands...
r10364 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
Matt Mackall
error: move UnknownCommand and AmbiguousCommand
r7643 except error.AmbiguousCommand, inst:
Alejandro Santos
compat: don't reference an exception var inside a lambda
r9035 # py3k fix: except vars can't be used outside the scope of the
# except block, nor can be used inside a lambda. python issue4617
prefix = inst.args[0]
select = lambda c: c.lstrip('^').startswith(prefix)
Johannes Stezenbach
help: enable listing of a subset of the command list...
r6652 helplist(_('list of commands:\n\n'), select)
return
Brodie Rao
help: don't display bogus help messages for invalid aliases
r10021 # check if it's an invalid alias and display its error if it is
if getattr(entry[0], 'badalias', False):
Brodie Rao
dispatch: provide help for disabled extensions and commands...
r10364 if not unknowncmd:
entry[0](ui)
Brodie Rao
help: don't display bogus help messages for invalid aliases
r10021 return
Matt Mackall
alphabetize help_ in commands
r3655 # synopsis
Henri Wiechers
commands: minor refactoring...
r9901 if len(entry) > 2:
if entry[2].startswith('hg'):
ui.write("%s\n" % entry[2])
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 else:
Henri Wiechers
commands: minor refactoring...
r9901 ui.write('hg %s %s\n' % (aliases[0], entry[2]))
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 else:
ui.write('hg %s\n' % aliases[0])
Thomas Arendsen Hein
Move aliases section in help below synopsis (issue362)...
r5783
# aliases
if not ui.quiet and len(aliases) > 1:
ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
Matt Mackall
alphabetize help_ in commands
r3655
# description
Henri Wiechers
commands: minor refactoring...
r9901 doc = gettext(entry[0].__doc__)
Matt Mackall
alphabetize help_ in commands
r3655 if not doc:
Martin Geisler
lowercase help output...
r7598 doc = _("(no help text available)")
Yuya Nishihara
alias: fixes exception when displaying translated help text...
r10564 if hasattr(entry[0], 'definition'): # aliased command
doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
Matt Mackall
alphabetize help_ in commands
r3655 if ui.quiet:
Nicolas Dumazet
for calls expecting bool args, pass bool instead of int...
r9136 doc = doc.splitlines()[0]
Martin Geisler
commands: support verbose help
r10445 keep = ui.verbose and ['verbose'] or []
formatted, pruned = minirst.format(doc, textwidth, keep=keep)
ui.write("\n%s\n" % formatted)
if pruned:
ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name)
Matt Mackall
alphabetize help_ in commands
r3655
if not ui.quiet:
# options
Henri Wiechers
commands: minor refactoring...
r9901 if entry[1]:
option_lists.append((_("options:\n"), entry[1]))
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315
addglobalopts(False)
Matt Mackall
alphabetize help_ in commands
r3655
Alexis S. L. Carvalho
help: avoid traceback if an extension has only debug commands
r4950 def helplist(header, select=None):
Matt Mackall
alphabetize help_ in commands
r3655 h = {}
cmds = {}
Dirkjan Ochtman
use dict.iteritems() rather than dict.items()...
r7622 for c, e in table.iteritems():
Matt Mackall
alphabetize help_ in commands
r3655 f = c.split("|", 1)[0]
if select and not select(f):
continue
Dirkjan Ochtman
help: show extension commands in short list, separate extension list in help...
r7197 if (not select and name != 'shortlist' and
e[0].__module__ != __name__):
Dirkjan Ochtman
remove extension commands from global help
r7126 continue
Matt Mackall
alphabetize help_ in commands
r3655 if name == "shortlist" and not f.startswith("^"):
continue
f = f.lstrip("^")
if not ui.debugflag and f.startswith("debug"):
continue
Dan Villiom Podlaski Christiansen
commands: hide deprecated commands....
r9128 doc = e[0].__doc__
if doc and 'DEPRECATED' in doc and not ui.verbose:
continue
doc = gettext(doc)
Matt Mackall
alphabetize help_ in commands
r3655 if not doc:
Martin Geisler
lowercase help output...
r7598 doc = _("(no help text available)")
Nicolas Dumazet
for calls expecting bool args, pass bool instead of int...
r9136 h[f] = doc.splitlines()[0].rstrip()
Matt Mackall
alphabetize help_ in commands
r3655 cmds[f] = c.lstrip("^")
Alexis S. L. Carvalho
help: avoid traceback if an extension has only debug commands
r4950 if not h:
ui.status(_('no commands defined\n'))
return
ui.status(header)
Matt Mackall
replace util.sort with sorted built-in...
r8209 fns = sorted(h)
Matt Mackall
alphabetize help_ in commands
r3655 m = max(map(len, fns))
for f in fns:
if ui.verbose:
commands = cmds[f].replace("|",", ")
ui.write(" %s:\n %s\n"%(commands, h[f]))
else:
Martin Geisler
commands: wrap short descriptions in 'hg help'...
r8938 ui.write(' %-*s %s\n' % (m, f, util.wrap(h[f], m + 4)))
Matt Mackall
alphabetize help_ in commands
r3655
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 if not ui.quiet:
addglobalopts(True)
Matt Mackall
Add basic support for help topics and a dates topic
r3795 def helptopic(name):
Martin Geisler
restructure helptable...
r7012 for names, header, doc in help.helptable:
if name in names:
break
else:
Matt Mackall
error: move UnknownCommand and AmbiguousCommand
r7643 raise error.UnknownCommand(name)
Matt Mackall
Add basic support for help topics and a dates topic
r3795
# description
if not doc:
Martin Geisler
lowercase help output...
r7598 doc = _("(no help text available)")
Dirkjan Ochtman
some modernization cleanups, forward compatibility
r8366 if hasattr(doc, '__call__'):
Matt Mackall
Allow topics to be callables
r3796 doc = doc()
Matt Mackall
Add basic support for help topics and a dates topic
r3795
Martin Geisler
commands: use minirst parser when displaying help
r9157 ui.write("%s\n\n" % header)
Martin Geisler
help: un-indent help topics...
r9540 ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
Matt Mackall
Add basic support for help topics and a dates topic
r3795
Matt Mackall
alphabetize help_ in commands
r3655 def helpext(name):
try:
Matt Mackall
Create a separate module for managing extensions
r4544 mod = extensions.find(name)
Brodie Rao
dispatch: provide help for disabled extensions and commands...
r10364 doc = gettext(mod.__doc__) or _('no help text available')
Matt Mackall
alphabetize help_ in commands
r3655 except KeyError:
Brodie Rao
dispatch: provide help for disabled extensions and commands...
r10364 mod = None
doc = extensions.disabledext(name)
if not doc:
raise error.UnknownCommand(name)
David Soria Parra
commands: Check if helptext contains a newline before we split
r9280 if '\n' not in doc:
head, tail = doc, ""
else:
head, tail = doc.split('\n', 1)
Martin Geisler
commands: use minirst parser when displaying help
r9157 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
if tail:
ui.write(minirst.format(tail, textwidth))
ui.status('\n\n')
Benoit Boissinot
fix hg help <ext> for extension that do not define any command...
r4009
Brodie Rao
dispatch: provide help for disabled extensions and commands...
r10364 if mod:
try:
ct = mod.cmdtable
except AttributeError:
ct = {}
modcmds = set([c.split('|', 1)[0] for c in ct])
helplist(_('list of commands:\n\n'), modcmds.__contains__)
else:
ui.write(_('use "hg help extensions" for information on enabling '
'extensions\n'))
def helpextcmd(name):
cmd, ext, mod = extensions.disabledcmd(name, ui.config('ui', 'strict'))
doc = gettext(mod.__doc__).splitlines()[0]
msg = help.listexts(_("'%s' is provided by the following "
"extension:") % cmd, {ext: doc}, len(ext),
indent=4)
ui.write(minirst.format(msg, textwidth))
ui.write('\n\n')
ui.write(_('use "hg help extensions" for information on enabling '
'extensions\n'))
Matt Mackall
alphabetize help_ in commands
r3655
if name and name != 'shortlist':
Matt Mackall
Add basic support for help topics and a dates topic
r3795 i = None
Brodie Rao
dispatch: provide help for disabled extensions and commands...
r10364 if unknowncmd:
queries = (helpextcmd,)
else:
queries = (helptopic, helpcmd, helpext, helpextcmd)
for f in queries:
Matt Mackall
Add basic support for help topics and a dates topic
r3795 try:
f(name)
i = None
break
Matt Mackall
error: move UnknownCommand and AmbiguousCommand
r7643 except error.UnknownCommand, inst:
Matt Mackall
Add basic support for help topics and a dates topic
r3795 i = inst
if i:
raise i
Matt Mackall
alphabetize help_ in commands
r3655
else:
# program name
if ui.verbose or with_version:
version_(ui)
else:
ui.status(_("Mercurial Distributed SCM\n"))
ui.status('\n')
# list of commands
if name == "shortlist":
Alexis S. L. Carvalho
help: avoid traceback if an extension has only debug commands
r4950 header = _('basic commands:\n\n')
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 else:
Alexis S. L. Carvalho
help: avoid traceback if an extension has only debug commands
r4950 header = _('list of commands:\n\n')
helplist(header)
Dirkjan Ochtman
help: don't show extension list on extension help
r9839 if name != 'shortlist':
exts, maxlength = extensions.enabled()
text = help.listexts(_('enabled extensions:'), exts, maxlength)
if text:
ui.write("\n%s\n" % minirst.format(text, textwidth))
Matt Mackall
alphabetize help_ in commands
r3655
# list all option lists
opt_output = []
for title, options in option_lists:
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 opt_output.append(("\n%s" % title, None))
Matt Mackall
alphabetize help_ in commands
r3655 for shortopt, longopt, default, desc in options:
Matt Mackall
many, many trivial check-code fixups
r10282 if _("DEPRECATED") in desc and not ui.verbose:
Benoit Boissinot
fix spaces/identation issues
r10339 continue
Matt Mackall
alphabetize help_ in commands
r3655 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
longopt and " --%s" % longopt),
"%s%s" % (desc,
default
and _(" (default: %s)") % default
or "")))
Dirkjan Ochtman
help: show help topics by default in 'hg help', with longest available id
r7196 if not name:
Matt Mackall
help: update help...
r7210 ui.write(_("\nadditional help topics:\n\n"))
Johannes Stezenbach
help: list special help topics with -v
r6653 topics = []
Martin Geisler
restructure helptable...
r7012 for names, header, doc in help.helptable:
Martin Geisler
commands: simpler sort of help topic names
r9537 topics.append((sorted(names, key=len, reverse=True)[0], header))
Johannes Stezenbach
help: list special help topics with -v
r6653 topics_len = max([len(s[0]) for s in topics])
for t, desc in topics:
ui.write(" %-*s %s\n" % (topics_len, t, desc))
Matt Mackall
alphabetize help_ in commands
r3655 if opt_output:
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
r4315 opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0])
Matt Mackall
alphabetize help_ in commands
r3655 for first, second in opt_output:
if second:
Martin Geisler
commands: wrap short descriptions in 'hg help'...
r8938 second = util.wrap(second, opts_len + 3)
ui.write(" %-*s %s\n" % (opts_len, first, second))
Matt Mackall
alphabetize help_ in commands
r3655 else:
ui.write("%s\n" % first)
mpm@selenic.com
Beginning of multi-head support...
r221
Matt Mackall
identify: take a path to a remote repo...
r4671 def identify(ui, repo, source=None,
rev=None, num=None, id=None, branch=None, tags=None):
Matt Mackall
identify: accept a revision argument
r4665 """identify the working copy or specified revision
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 With no revision, print a summary of the current state of the
Martin Geisler
expand "repo" to "repository" in help texts
r8027 repository.
Matt Mackall
identify: take a path to a remote repo...
r4671
timeless
Improve English for help text of many core hg commands....
r8779 Specifying a path to a repository root or Mercurial bundle will
cause lookup to operate on that repository/bundle.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 This summary identifies the repository state using one or two
parent hash identifiers, followed by a "+" if there are
uncommitted changes in the working directory, a list of tags for
this revision and a branch name for non-default branches.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Matt Mackall
identify: show nullid for empty repo
r4662
Alexis S. L. Carvalho
make identify an optionalrepo command...
r5330 if not repo and not source:
raise util.Abort(_("There is no Mercurial repository here "
"(.hg not found)"))
Matt Mackall
Only show long hashes with --debug, not --verbose
r2966 hexfunc = ui.debugflag and hex or short
Matt Mackall
identify: add support for output flags
r4666 default = not (num or id or branch or tags)
output = []
Matt Mackall
identify: use contexts
r4664
Dirkjan Ochtman
identify: have consistent output for local repositories...
r7757 revs = []
Matt Mackall
identify: take a path to a remote repo...
r4671 if source:
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 source, branches = hg.parseurl(ui.expandpath(source))
Dirkjan Ochtman
identify: have consistent output for local repositories...
r7757 repo = hg.repository(ui, source)
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
Dirkjan Ochtman
identify: have consistent output for local repositories...
r7757
if not repo.local():
Matt Mackall
identify: take a path to a remote repo...
r4671 if not rev and revs:
rev = revs[0]
Matt Mackall
identify: work with remote repos
r4667 if not rev:
rev = "tip"
if num or branch or tags:
raise util.Abort(
"can't query remote revision number, branch, or tags")
Dirkjan Ochtman
identify: have consistent output for local repositories...
r7757 output = [hexfunc(repo.lookup(rev))]
Matt Mackall
identify: work with remote repos
r4667 elif not rev:
Matt Mackall
use repo[changeid] to get a changectx
r6747 ctx = repo[None]
Matt Mackall
identify: accept a revision argument
r4665 parents = ctx.parents()
Matt Mackall
identify: add support for output flags
r4666 changed = False
if default or id or num:
Dirkjan Ochtman
identify: don't include unknown in status
r10515 changed = util.any(repo.status())
Matt Mackall
identify: add support for output flags
r4666 if default or id:
output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
(changed) and "+" or "")]
if num:
output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
(changed) and "+" or ""))
Matt Mackall
identify: accept a revision argument
r4665 else:
Matt Mackall
use repo[changeid] to get a changectx
r6747 ctx = repo[rev]
Matt Mackall
identify: add support for output flags
r4666 if default or id:
output = [hexfunc(ctx.node())]
if num:
output.append(str(ctx.rev()))
Dirkjan Ochtman
identify: have consistent output for local repositories...
r7757 if repo.local() and default and not ui.quiet:
Matt Mackall
move encoding bits from util to encoding...
r7948 b = encoding.tolocal(ctx.branch())
Matt Mackall
identify: add support for output flags
r4666 if b != 'default':
output.append("(%s)" % b)
Matt Mackall
Report branch for hg id
r3415
Thomas Arendsen Hein
Improvements for hg identify:...
r386 # multiple tags for a single parent separated by '/'
Matt Mackall
identify: add support for output flags
r4666 t = "/".join(ctx.tags())
if t:
output.append(t)
if branch:
Matt Mackall
move encoding bits from util to encoding...
r7948 output.append(encoding.tolocal(ctx.branch()))
Matt Mackall
identify: add support for output flags
r4666
if tags:
output.extend(ctx.tags())
Thomas Arendsen Hein
added hg identify|id (based on a patch from Andrew Thompson)...
r339
Thomas Arendsen Hein
Improvements for hg identify:...
r386 ui.write("%s\n" % ' '.join(output))
Thomas Arendsen Hein
added hg identify|id (based on a patch from Andrew Thompson)...
r339
mpm@selenic.com
Commands cleanup...
r437 def import_(ui, repo, patch1, *patches, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """import an ordered set of patches
timeless@mozdev.org
minor documentation improvements
r9649 Import a list of patches and commit them individually (unless
--no-commit is specified).
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
If there are outstanding changes in the working directory, import
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 will abort unless given the -f/--force flag.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 You can import a patch straight from a mail message. Even patches
timeless
Improve English for help text of many core hg commands....
r8779 as attachments work (to use the body part, it must have type
text/plain or text/x-patch). From and Subject headers of email
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 message are used as default committer and commit message. All
Vadim Gelfer
import: make help clearer. suggested by asak.
r2515 text/plain body parts before first diff are added to commit
message.
Vadim Gelfer
import: parse email messages
r2504
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 If the imported patch was generated by hg export, user and
description from patch override values from message headers and
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 body. Values given on command line with -m/--message and -u/--user
override these.
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004
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 may happen due to character set problems or other
deficiencies in the text patch format.
Brendan Cully
Add import --exact....
r4263
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 With -s/--similarity, hg will attempt to discover renames and
copies in the patch in the same way as 'addremove'.
Brendan Cully
import: add similarity option (issue295)
r7402
Dirkjan Ochtman
commands: add note about import retrieving patches from URLs
r8931 To read a patch from standard input, use "-" as the patch name. If
a URL is specified, the patch will be downloaded from it.
timeless
Improve English for help text of many core hg commands....
r8779 See 'hg help dates' for a list of formats valid for -d/--date.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
mpm@selenic.com
Commands cleanup...
r437 patches = (patch1,) + patches
mpm@selenic.com
[PATCH] Clean up destination directory if a clone fails....
r500
Thomas Arendsen Hein
Fix bad behaviour when specifying an invalid date (issue700)...
r6139 date = opts.get('date')
if date:
opts['date'] = util.parsedate(date)
Brendan Cully
import: add similarity option (issue295)
r7402 try:
sim = float(opts.get('similarity') or 0)
except ValueError:
raise util.Abort(_('similarity must be a number'))
if sim < 0 or sim > 100:
raise util.Abort(_('similarity must be between 0 and 100'))
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('exact') or not opts.get('force'):
Matt Mackall
dispatch: move dispatching code to cmdutil
r4549 cmdutil.bail_if_changed(repo)
mpm@selenic.com
hg import: abort with uncommitted changes, override with --force
r966
mpm@selenic.com
Commands cleanup...
r437 d = opts["base"]
strip = opts["strip"]
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 wlock = lock = None
Brendan Cully
import: import each patch in a file or stream as a separate change...
r10384
def tryone(ui, hunk):
Matt Mackall
fix up a bunch of check-code warnings
r10413 tmpname, message, user, date, branch, nodeid, p1, p2 = \
patch.extract(ui, hunk)
Brendan Cully
import: import each patch in a file or stream as a separate change...
r10384
if not tmpname:
return None
commitid = _('to working directory')
try:
cmdline_message = cmdutil.logmessage(opts)
if cmdline_message:
# pickup the cmdline msg
message = cmdline_message
elif message:
# pickup the patch msg
message = message.strip()
else:
# launch the editor
message = None
ui.debug('message:\n%s\n' % message)
wp = repo.parents()
if opts.get('exact'):
if not nodeid or not p1:
raise util.Abort(_('not a Mercurial patch'))
p1 = repo.lookup(p1)
p2 = repo.lookup(p2 or hex(nullid))
if p1 != wp[0].node():
hg.clean(repo, p1)
repo.dirstate.setparents(p1, p2)
elif p2:
try:
p1 = repo.lookup(p1)
p2 = repo.lookup(p2)
if p1 == wp[0].node():
repo.dirstate.setparents(p1, p2)
except error.RepoError:
pass
if opts.get('exact') or opts.get('import_branch'):
repo.dirstate.setbranch(branch or 'default')
files = {}
try:
patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
files=files, eolmode=None)
finally:
files = patch.updatedir(ui, repo, files,
similarity=sim / 100.0)
if not opts.get('no_commit'):
if opts.get('exact'):
m = None
else:
m = cmdutil.matchfiles(repo, files or [])
n = repo.commit(message, opts.get('user') or user,
opts.get('date') or date, match=m,
editor=cmdutil.commiteditor)
if opts.get('exact'):
if hex(n) != nodeid:
repo.rollback()
raise util.Abort(_('patch is damaged'
' or loses information'))
# Force a dirstate write so that the next transaction
# backups an up-do-date file.
repo.dirstate.write()
if n:
commitid = short(n)
return commitid
finally:
os.unlink(tmpname)
Peter Arrenbrecht
whitespace cleanup
r10405
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
wlock = repo.wlock()
lock = repo.lock()
Brendan Cully
import: import each patch in a file or stream as a separate change...
r10384 lastcommit = None
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 for p in patches:
pf = os.path.join(d, p)
if pf == '-':
ui.status(_("applying patch from stdin\n"))
Benoit Boissinot
use our urlopener (proxy handling, etc) instead of urllib
r7271 pf = sys.stdin
Vadim Gelfer
import: allow to import stdin with file name "-"
r2400 else:
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 ui.status(_("applying %s\n") % p)
Benoit Boissinot
use our urlopener (proxy handling, etc) instead of urllib
r7271 pf = url.open(ui, pf)
Brendan Cully
import: import each patch in a file or stream as a separate change...
r10384
haspatch = False
for hunk in patch.split(pf):
commitid = tryone(ui, hunk)
if commitid:
haspatch = True
if lastcommit:
ui.status(_('applied %s\n') % lastcommit)
lastcommit = commitid
if not haspatch:
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 raise util.Abort(_('no diffs found'))
finally:
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 release(lock, wlock)
mpm@selenic.com
Commands cleanup...
r437
TK Soh
Add -p to incoming and outgoing commands to show patch
r1192 def incoming(ui, repo, source="default", **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """show new changesets found in source
Thomas Arendsen Hein
More detailed documentation about ssh:// URLs; fixes issue170.
r1979 Show new changesets found in the specified path/URL or the default
timeless
Improve English for help text of many core hg commands....
r8779 pull location. These are the changesets that would have been pulled
if a pull at the time you issued this command.
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004
For remote repository, using --bundle avoids downloading the
changesets twice if the incoming is followed by a pull.
Thomas Arendsen Hein
More detailed documentation about ssh:// URLs; fixes issue170.
r1979
See pull for valid source format details.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Thomas Arendsen Hein
Add option -l/--limit to hg incoming and hg outgoing.
r6191 limit = cmdutil.loglimit(opts)
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
Matt Mackall
add cmdutil.remoteui...
r8188 other = hg.repository(cmdutil.remoteui(repo, opts), source)
Benoit Boissinot
factor out the url handling from httprepo...
r7270 ui.status(_('comparing with %s\n') % url.hidepassword(source))
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
Matt Mackall
Add support for url#id syntax...
r4478 if revs:
Bryan O'Sullivan
Push capability checking into protocol-level code.
r5259 revs = [other.lookup(rev) for rev in revs]
Benoit Boissinot
protocol: use changegroupsubset() if possible (issue1389)...
r7415 common, incoming, rheads = repo.findcommonincoming(other, heads=revs,
force=opts["force"])
Benoit Boissinot
incoming: add support for remote repo using bundlerepo
r1944 if not incoming:
Matt Mackall
hg in: if no incoming csets, remove existing bundle
r3933 try:
os.unlink(opts["bundle"])
except:
pass
TK Soh
show message if no changes found on incoming
r1993 ui.status(_("no changes found\n"))
Matt Mackall
incoming/outgoing: return failure if no changes found
r3931 return 1
Benoit Boissinot
incoming: add support for remote repo using bundlerepo
r1944
cleanup = None
Thomas Arendsen Hein
Delete bundle file of hg incoming in case of errors, preserve existing files....
r1974 try:
fname = opts["bundle"]
if fname or not other.local():
# create a bundle (uncompressed if other repo is not local)
Benoit Boissinot
protocol: use changegroupsubset() if possible (issue1389)...
r7415
if revs is None and other.capable('changegroupsubset'):
revs = rheads
Thomas Arendsen Hein
Make "hg incoming -r revision_number" work for remote repos (issue566)...
r4451 if revs is None:
cg = other.changegroup(incoming, "incoming")
else:
cg = other.changegroupsubset(incoming, revs, 'incoming')
Thomas Arendsen Hein
Use 'bundletype' instead of 'type' to not shadow built-in function.
r3706 bundletype = other.local() and "HG10BZ" or "HG10UN"
fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
Thomas Arendsen Hein
Delete bundle file of hg incoming in case of errors, preserve existing files....
r1974 # keep written bundle?
if opts["bundle"]:
cleanup = None
if not other.local():
# use the created uncompressed bundlerepo
other = bundlerepo.bundlerepository(ui, repo.root, fname)
Benoit Boissinot
add -r/--rev arguments to incoming and outgoing
r2521 o = other.changelog.nodesbetween(incoming, revs)[0]
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('newest_first'):
Thomas Arendsen Hein
Delete bundle file of hg incoming in case of errors, preserve existing files....
r1974 o.reverse()
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 displayer = cmdutil.show_changeset(ui, other, opts)
Thomas Arendsen Hein
Add option -l/--limit to hg incoming and hg outgoing.
r6191 count = 0
Thomas Arendsen Hein
Delete bundle file of hg incoming in case of errors, preserve existing files....
r1974 for n in o:
Nicolas Dumazet
cmdutil: replace sys.maxint with None as default value in loglimit...
r10111 if limit is not None and count >= limit:
Thomas Arendsen Hein
Add option -l/--limit to hg incoming and hg outgoing.
r6191 break
Thomas Arendsen Hein
Delete bundle file of hg incoming in case of errors, preserve existing files....
r1974 parents = [p for p in other.changelog.parents(n) if p != nullid]
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('no_merges') and len(parents) == 2:
Thomas Arendsen Hein
Delete bundle file of hg incoming in case of errors, preserve existing files....
r1974 continue
Thomas Arendsen Hein
Add option -l/--limit to hg incoming and hg outgoing.
r6191 count += 1
Dirkjan Ochtman
cmdutil: use change contexts for cset-printer and cset-templater
r7369 displayer.show(other[n])
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 displayer.close()
Thomas Arendsen Hein
Delete bundle file of hg incoming in case of errors, preserve existing files....
r1974 finally:
if hasattr(other, 'close'):
other.close()
if cleanup:
os.unlink(cleanup)
Benoit Boissinot
incoming: add support for remote repo using bundlerepo
r1944
Thomas Arendsen Hein
Add ui method to set --ssh/--remotecmd, use it in init/clone/pull/push/in/out....
r2598 def init(ui, dest=".", **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """create a new repository in the given directory
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 Initialize a new repository in the given directory. If the given
timeless
Improve English for help text of many core hg commands....
r8779 directory does not exist, it will be created.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
If no directory is given, the current directory is used.
Thomas Arendsen Hein
Additional information about URLs in pull/push/clone/init:...
r2590
Martin Geisler
commands: mark "ssh://" as inline literals in help texts
r9970 It is possible to specify an ``ssh://`` URL as the destination.
Bill Barry
consolidated url help into urls help topic and added information about path aliases
r7693 See 'hg help urls' for more information.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Matt Mackall
add cmdutil.remoteui...
r8188 hg.repository(cmdutil.remoteui(ui, opts), dest, create=1)
mpm@selenic.com
default path support with .hg/hgrc...
r338
Bryan O'Sullivan
Add locate command....
r627 def locate(ui, repo, *pats, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """locate files matching specific patterns
timeless
Improve English for help text of many core hg commands....
r8779 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.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
If you want to feed the output of this command into the "xargs"
Martin Geisler
commands: use double quotes consistently in help texts
r8032 command, use the -0 option to both this command and "xargs". This
will avoid the problem of "xargs" treating single filenames that
timeless
Improve English for help text of many core hg commands....
r8779 contain whitespace as multiple filenames.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Alexander Solovyov
commands: optional options where possible...
r7131 end = opts.get('print0') and '\0' or '\n'
Matt Mackall
context: add walk method
r6764 rev = opts.get('rev') or None
mpm@selenic.com
Refactor matchpats and walk...
r742
Alexis S. L. Carvalho
locate: exit(1) if we didn't print any file
r4196 ret = 1
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 m = cmdutil.match(repo, pats, opts, default='relglob')
Matt Mackall
many, many trivial check-code fixups
r10282 m.bad = lambda x, y: False
Matt Mackall
context: add walk method
r6764 for abs in repo[rev].walk(m):
if not rev and abs not in repo.dirstate:
Alexis S. L. Carvalho
locate: don't print "file not found" messages....
r4308 continue
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('fullpath'):
Martin Geisler
use repo.wjoin(f) instead of os.path.join(repo.root, f)
r7570 ui.write(repo.wjoin(abs), end)
Bryan O'Sullivan
Get add and locate to use new repo and dirstate walk code....
r724 else:
Matt Mackall
walk: remove rel and exact returns
r6584 ui.write(((pats and m.rel(abs)) or abs), end)
Alexis S. L. Carvalho
locate: exit(1) if we didn't print any file
r4196 ret = 0
return ret
Bryan O'Sullivan
Add locate command....
r627
Bryan O'Sullivan
Rewrite log command. New version is faster and more featureful....
r1031 def log(ui, repo, *pats, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """show revision history of entire repository or files
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
r2741 Print the revision history of the specified files or the entire
project.
File history is shown without following rename or copy history of
timeless
Generally replace "file name" with "filename" in help and comments.
r8761 files. Use -f/--follow with a filename to follow history across
renames and copies. --follow without a filename will only show
Brendan Cully
Add log option --follow-first to follow only the first parent of...
r2784 ancestors or descendants of the starting revision. --follow-first
only follows the first parent of merge revisions.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Brendan Cully
Make log --follow revision range start default to working dir parent.
r2783 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.
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163 See 'hg help dates' for a list of formats valid for -d/--date.
timeless
Improve English for help text of many core hg commands....
r8779 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.
Matt Mackall
Add notes about diff/merge asymmetry to export, diff, and log
r3822
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 NOTE: log -p/--patch may generate unexpected diff output for merge
timeless
help: miscellaneous language fixes
r7807 changesets, as it will only compare the merge changeset against
timeless
Improve English for help text of many core hg commands....
r8779 its first parent. Also, only files different from BOTH parents
will appear in files:.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Vadim Gelfer
add -l,--limit to log command.
r1756
Matt Mackall
walkchangerevs: pull out matchfn...
r9652 matchfn = cmdutil.match(repo, pats, opts)
Thomas Arendsen Hein
Move finding/checking the log limit to cmdutil
r6190 limit = cmdutil.loglimit(opts)
Vadim Gelfer
add -l,--limit to log command.
r1756 count = 0
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 endrev = None
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('copies') and opts.get('rev'):
endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
Brendan Cully
Show copies in hg log....
r3197
Matt Mackall
Add --date support to log...
r3813 df = False
if opts["date"]:
df = util.matchdate(opts["date"])
Matt Mackall
Fix log regression where log -p file showed diffs for other files
r3837 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn)
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 def prep(ctx, fns):
Matt Mackall
walkchangerevs: internalize ctx caching
r9655 rev = ctx.rev()
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 parents = [p for p in repo.changelog.parentrevs(rev)
if p != nullrev]
if opts.get('no_merges') and len(parents) == 2:
return
if opts.get('only_merges') and len(parents) != 2:
return
Matt Mackall
log: tidy up some filter tests
r9663 if opts.get('only_branch') and ctx.branch() not in opts['only_branch']:
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 return
if df and not df(ctx.date()[0]):
return
Matt Mackall
log: tidy up some filter tests
r9663 if opts['user'] and not [k for k in opts['user'] if k in ctx.user()]:
return
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 if opts.get('keyword'):
for k in [kw.lower() for kw in opts['keyword']]:
Matt Mackall
log: tidy up some filter tests
r9663 if (k in ctx.user().lower() or
k in ctx.description().lower() or
k in " ".join(ctx.files()).lower()):
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 break
Matt Mackall
log: tidy up some filter tests
r9663 else:
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 return
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 copies = None
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 if opts.get('copies') and rev:
Patrick Mezard
templatekw: change {file_copies} behaviour, add {file_copies_switch}...
r10060 copies = []
getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
Matt Mackall
walkchangerevs: move 'add' to callback...
r9662 for fn in ctx.files():
rename = getrenamed(fn, rev)
if rename:
copies.append((fn, rename[0]))
displayer.show(ctx, copies=copies)
Matt Mackall
walkchangerevs: drop ui arg
r9665 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
Benoit Boissinot
log --limit: break after a limited number of csets (broken by f3d60543924f)
r9687 if count == limit:
break
if displayer.flush(ctx.rev()):
count += 1
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 displayer.close()
mpm@selenic.com
hg help: use docstrings only...
r255
Bryan O'Sullivan
manifest: accept -r for rev specification
r5155 def manifest(ui, repo, node=None, rev=None):
Thomas Arendsen Hein
doc string fix: hg cat and manifest default to current parent revision.
r3914 """output the current or given revision of the project manifest
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Print a list of version controlled files for the given revision.
Patrick Mezard
Fix manifest default rev doc when no rev is checked out (issue1603)
r8041 If no revision is given, the first parent of the working directory
timeless
Improve English for help text of many core hg commands....
r8779 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.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Matt Mackall
make manifest friendlier...
r3736
Bryan O'Sullivan
manifest: accept -r for rev specification
r5155 if rev and node:
raise util.Abort(_("please specify just one revision"))
if not node:
node = rev
Matt Mackall
manifest: remove execf/linkf methods
r6749 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
ctx = repo[node]
for f in ctx:
Matt Mackall
make manifest friendlier...
r3736 if ui.debugflag:
Matt Mackall
manifest: remove execf/linkf methods
r6749 ui.write("%40s " % hex(ctx.manifest()[f]))
Matt Mackall
make manifest friendlier...
r3736 if ui.verbose:
Matt Mackall
manifest: remove execf/linkf methods
r6749 ui.write(decor[ctx.flags(f)])
Matt Mackall
make manifest friendlier...
r3736 ui.write("%s\n" % f)
mpm@selenic.com
hg help: use docstrings only...
r255
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
r8387 def merge(ui, repo, node=None, **opts):
Benoit Boissinot
various doc fixes...
r4014 """merge working directory with another revision
Vadim Gelfer
add merge command. means same thing as "update -m"....
r2019
timeless
Improve English for help text of many core hg commands....
r8779 The current working directory is updated with all changes made in
the requested revision since the last common predecessor revision.
Martin Geisler
commands: better merge help text
r7977
Files that changed between either parent are marked as changed for
the next commit and a commit must be performed before any further
timeless
Improve English for help text of many core hg commands....
r8779 updates to the repository are allowed. The next commit will have
two parents.
Vadim Gelfer
merge with other head by default, not tip....
r2915
If no revision is specified, the working directory's parent is a
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 head revision, and the current branch contains exactly one other
head, the other head is merged with by default. Otherwise, an
timeless
Improve English for help text of many core hg commands....
r8779 explicit revision with which to merge with must be provided.
Vadim Gelfer
add merge command. means same thing as "update -m"....
r2019 """
Matt Mackall
Factor doupdate into _lookup + hg.update
r2806
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
r8387 if opts.get('rev') and node:
Daniel Holth
accept -r REV in more places...
r4450 raise util.Abort(_("please specify just one revision"))
if not node:
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
r8387 node = opts.get('rev')
Daniel Holth
accept -r REV in more places...
r4450
Matt Mackall
Remove deprecated old-style branch support
r3876 if not node:
Matt Mackall
use repo.changectx(None) to get a workingctx
r6740 branch = repo.changectx(None).branch()
Dirkjan Ochtman
merge: use correct branch name for counting heads
r6844 bheads = repo.branchheads(branch)
Dirkjan Ochtman
merge: only in-branch merges can be implicit
r6723 if len(bheads) > 2:
Benoit Boissinot
merge: add hints about the use of 'hg heads' to find the rev to merge
r10355 ui.warn(_("abort: branch '%s' has %d heads - "
"please merge with an explicit rev\n")
% (branch, len(bheads)))
ui.status(_("(run 'hg heads .' to see heads)\n"))
return False
Dirkjan Ochtman
merge: only in-branch merges can be implicit
r6723
Benoit Boissinot
improve error message for 'hg merge' when repo already at branchtip
r5242 parent = repo.dirstate.parents()[0]
Dirkjan Ochtman
merge: only in-branch merges can be implicit
r6723 if len(bheads) == 1:
if len(repo.heads()) > 1:
Benoit Boissinot
merge: add hints about the use of 'hg heads' to find the rev to merge
r10355 ui.warn(_("abort: branch '%s' has one head - "
"please merge with an explicit rev\n" % branch))
ui.status(_("(run 'hg heads' to see all heads)\n"))
return False
Benoit Boissinot
improve error message for 'hg merge' when repo already at branchtip
r5242 msg = _('there is nothing to merge')
Matt Mackall
use repo[changeid] to get a changectx
r6747 if parent != repo.lookup(repo[None].branch()):
Matt Mackall
i18n: fix complaints from pygettext
r5542 msg = _('%s - use "hg update" instead') % msg
Benoit Boissinot
improve error message for 'hg merge' when repo already at branchtip
r5242 raise util.Abort(msg)
Dirkjan Ochtman
merge: only in-branch merges can be implicit
r6723 if parent not in bheads:
Vadim Gelfer
merge with other head by default, not tip....
r2915 raise util.Abort(_('working dir not at a head rev - '
'use "hg update" or merge with an explicit rev'))
Dirkjan Ochtman
merge: only in-branch merges can be implicit
r6723 node = parent == bheads[0] and bheads[-1] or bheads[0]
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
r8387
Dirkjan Ochtman
merge: rename -S/--show option to -P/--preview
r8834 if opts.get('preview'):
Greg Ward
merge: fix --preview to show all nodes that will be merged (issue2043)....
r10505 # find nodes that are ancestors of p2 but not of p1
p1 = repo.lookup('.')
p2 = repo.lookup(node)
nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
r8387 displayer = cmdutil.show_changeset(ui, repo, opts)
Greg Ward
merge: fix --preview to show all nodes that will be merged (issue2043)....
r10505 for node in nodes:
displayer.show(repo[node])
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 displayer.close()
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
r8387 return 0
return hg.merge(repo, node, force=opts.get('force'))
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029
Vadim Gelfer
push, outgoing, bundle: fall back to "default" if "default-push" not defined
r2494 def outgoing(ui, repo, dest=None, **opts):
timeless
help: Improved body text
r10376 """show changesets not found in the destination
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 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.
Benoit Boissinot
resync commands.py docstrings with hg.1.txt
r1811
timeless
help: Improved body text
r10376 See pull for details of valid destination formats.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Thomas Arendsen Hein
Add option -l/--limit to hg incoming and hg outgoing.
r6191 limit = cmdutil.loglimit(opts)
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 dest = ui.expandpath(dest or 'default-push', dest or 'default')
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 dest, branches = hg.parseurl(dest, opts.get('branch'))
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
Matt Mackall
Add support for url#id syntax...
r4478 if revs:
revs = [repo.lookup(rev) for rev in revs]
Benoit Boissinot
add remotecmd/ssh option support to incoming/outgoing
r1965
Matt Mackall
add cmdutil.remoteui...
r8188 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
Benoit Boissinot
factor out the url handling from httprepo...
r7270 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
Alexander Solovyov
commands: optional options where possible...
r7131 o = repo.findoutgoing(other, force=opts.get('force'))
Thomas Arendsen Hein
show message if no changes found on outgoing...
r1994 if not o:
ui.status(_("no changes found\n"))
Matt Mackall
incoming/outgoing: return failure if no changes found
r3931 return 1
Benoit Boissinot
add -r/--rev arguments to incoming and outgoing
r2521 o = repo.changelog.nodesbetween(o, revs)[0]
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('newest_first'):
Michal Kvasnica
allow 'hg out' / 'hg in' to show newest commit first
r1439 o.reverse()
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 displayer = cmdutil.show_changeset(ui, repo, opts)
Thomas Arendsen Hein
Add option -l/--limit to hg incoming and hg outgoing.
r6191 count = 0
mpm@selenic.com
Add hg outgoing command
r920 for n in o:
Nicolas Dumazet
cmdutil: replace sys.maxint with None as default value in loglimit...
r10111 if limit is not None and count >= limit:
Thomas Arendsen Hein
Add option -l/--limit to hg incoming and hg outgoing.
r6191 break
Benoit Boissinot
add --no-merges (-M) for log, outgoing, incoming
r1435 parents = [p for p in repo.changelog.parents(n) if p != nullid]
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('no_merges') and len(parents) == 2:
Benoit Boissinot
add --no-merges (-M) for log, outgoing, incoming
r1435 continue
Thomas Arendsen Hein
Add option -l/--limit to hg incoming and hg outgoing.
r6191 count += 1
Dirkjan Ochtman
cmdutil: use change contexts for cset-printer and cset-templater
r7369 displayer.show(repo[n])
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 displayer.close()
mpm@selenic.com
Add hg outgoing command
r920
Matt Mackall
remove legacy hg parents REV syntax
r3658 def parents(ui, repo, file_=None, **opts):
Martin Geisler
expand "dir" to "directory" in help texts
r8026 """show the parents of the working directory or revision
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 Print the working directory's parent revisions. If a revision is
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 given via -r/--rev, the parent of that revision will be printed.
timeless
Improve English for help text of many core hg commands....
r8779 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.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Matt Mackall
remove legacy hg parents REV syntax
r3658 rev = opts.get('rev')
Patrick Mezard
parents: make it match the doc when called on a file...
r5298 if rev:
Matt Mackall
use repo[changeid] to get a changectx
r6747 ctx = repo[rev]
Patrick Mezard
parents: make it match the doc when called on a file...
r5298 else:
Matt Mackall
use repo[changeid] to get a changectx
r6747 ctx = repo[None]
Patrick Mezard
parents: make it match the doc when called on a file...
r5298
Brendan Cully
Make parents with a file but not a revision use working directory revision.
r4586 if file_:
Matt Mackall
walk: remove remaining users of cmdutils.matchpats
r6582 m = cmdutil.match(repo, (file_,), opts)
if m.anypats() or len(m.files()) != 1:
timeless
Generally replace "file name" with "filename" in help and comments.
r8761 raise util.Abort(_('can only specify an explicit filename'))
Matt Mackall
walk: remove remaining users of cmdutils.matchpats
r6582 file_ = m.files()[0]
Patrick Mezard
parents: make it match the doc when called on a file...
r5298 filenodes = []
for cp in ctx.parents():
if not cp:
continue
try:
filenodes.append(cp.filenode(file_))
Matt Mackall
errors: move revlog errors...
r7633 except error.LookupError:
Patrick Mezard
parents: make it match the doc when called on a file...
r5298 pass
if not filenodes:
raise util.Abort(_("'%s' not found in manifest!") % file_)
fl = repo.file(file_)
Matt Mackall
linkrev: take a revision number rather than a hash
r7361 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
mpm@selenic.com
hg help: use docstrings only...
r255 else:
Patrick Mezard
parents: make it match the doc when called on a file...
r5298 p = [cp.node() for cp in ctx.parents()]
mpm@selenic.com
hg help: use docstrings only...
r255
Matt Mackall
templates: move changeset templating bits to cmdutils
r3643 displayer = cmdutil.show_changeset(ui, repo, opts)
mpm@selenic.com
hg help: use docstrings only...
r255 for n in p:
mpm@selenic.com
commands: use node functions directly
r1092 if n != nullid:
Martin Geisler
commands: fix paths command docstring indention
r7743 displayer.show(repo[n])
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 displayer.close()
mpm@selenic.com
hg help: use docstrings only...
r255
Thomas Arendsen Hein
Make hg paths and hg debugconfig work with -R/--repository option....
r1858 def paths(ui, repo, search=None):
Bill Barry
Clarified 'hg paths' command help
r7691 """show aliases for remote repositories
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 Show definition of symbolic path name NAME. If no name is given,
timeless
Improve English for help text of many core hg commands....
r8779 show definition of all available names.
Martin Geisler
commands: fix paths command docstring indention
r7743
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 Path names are defined in the [paths] section of /etc/mercurial/hgrc
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
Bill Barry
consolidated url help into urls help topic and added information about path aliases
r7693
See 'hg help urls' for more information.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
TK Soh
Add paths command...
r779 if search:
for name, path in ui.configitems("paths"):
if name == search:
Benoit Boissinot
factor out the url handling from httprepo...
r7270 ui.write("%s\n" % url.hidepassword(path))
TK Soh
Add paths command...
r779 return
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ui.warn(_("not found!\n"))
TK Soh
Add paths command...
r779 return 1
else:
for name, path in ui.configitems("paths"):
Benoit Boissinot
factor out the url handling from httprepo...
r7270 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
TK Soh
Add paths command...
r779
Alexis S. L. Carvalho
pull -u: if "url#rev" was given, update to rev
r5224 def postincoming(ui, repo, modheads, optupdate, checkout):
Vadim Gelfer
add merge command. means same thing as "update -m"....
r2019 if modheads == 0:
return
if optupdate:
Benoit Allard
pull: update to branch tip if there is only one head on the current branch...
r7372 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
Alexis S. L. Carvalho
pull -u: if "url#rev" was given, update to rev
r5224 return hg.update(repo, checkout)
Vadim Gelfer
add merge command. means same thing as "update -m"....
r2019 else:
ui.status(_("not updating, since new heads added\n"))
if modheads > 1:
ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
else:
ui.status(_("(run 'hg update' to get a working copy)\n"))
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029
mpm@selenic.com
[PATCH] Unintuive use...
r404 def pull(ui, repo, source="default", **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """pull changes from the specified source
timeless
Improve English for help text of many core hg commands....
r8779 Pull changes from a remote repository to a local one.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
This finds all changes from the repository at the specified path
timeless
Improve English for help text of many core hg commands....
r8779 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.
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
added those changes to the repository, you should use pull -r X
where X is the last changeset listed by hg incoming.
Martin Geisler
commands: make pull help point to the incoming command
r7980
Bill Barry
consolidated url help into urls help topic and added information about path aliases
r7693 If SOURCE is omitted, the 'default' path will be used.
See 'hg help urls' for more information.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
Matt Mackall
add cmdutil.remoteui...
r8188 other = hg.repository(cmdutil.remoteui(repo, opts), source)
Benoit Boissinot
factor out the url handling from httprepo...
r7270 ui.status(_('pulling from %s\n') % url.hidepassword(source))
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
Matt Mackall
Add support for url#id syntax...
r4478 if revs:
Bryan O'Sullivan
Push capability checking into protocol-level code.
r5259 try:
Matt Mackall
Add support for url#id syntax...
r4478 revs = [other.lookup(rev) for rev in revs]
Matt Mackall
error: move repo errors...
r7637 except error.CapabilityError:
err = _("Other repository doesn't support revision lookup, "
"so a rev cannot be specified.")
raise util.Abort(err)
Matt Mackall
Add support for url#id syntax...
r4478
Alexander Solovyov
commands: optional options where possible...
r7131 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
timeless@mozdev.org
commands: use rev from remote repo when updating as part of a pull
r9645 if checkout:
checkout = str(repo.changelog.rev(other.lookup(checkout)))
Alexander Solovyov
commands: optional options where possible...
r7131 return postincoming(ui, repo, modheads, opts.get('update'), checkout)
mpm@selenic.com
Migrate rawcommit, import, export, history, and merge...
r246
Vadim Gelfer
push, outgoing, bundle: fall back to "default" if "default-push" not defined
r2494 def push(ui, repo, dest=None, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """push changes to the specified destination
timeless
help: Improved body text
r10376 Push changes from the local repository to the specified destination.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: clarify push help text
r7981 This is the symmetrical operation for pull. It moves changes from
the current repository to a different one. If the destination is
local this is identical to a pull in that directory from the
current one.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
By default, push will refuse to run if it detects the result would
increase the number of remote heads. This generally indicates the
timeless
Improve English for help text of many core hg commands....
r8779 user forgot to pull and merge before pushing.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 If -r/--rev is used, the named revision and all its ancestors will
be pushed to the remote repository.
Bill Barry
consolidated url help into urls help topic and added information about path aliases
r7693
Martin Geisler
commands: mark "ssh://" as inline literals in help texts
r9970 Please see 'hg help urls' for important details about ``ssh://``
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 URLs. If DESTINATION is omitted, a default path will be used.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 dest = ui.expandpath(dest or 'default-push', dest or 'default')
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 dest, branches = hg.parseurl(dest, opts.get('branch'))
Sune Foldager
interpret repo#name url syntax as branch instead of revision...
r10365 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
Matt Mackall
add cmdutil.remoteui...
r8188 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
Benoit Boissinot
factor out the url handling from httprepo...
r7270 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
Matt Mackall
Add support for url#id syntax...
r4478 if revs:
revs = [repo.lookup(rev) for rev in revs]
Matt Mackall
subrepo: basic push support
r8815
# push subrepos depth-first for coherent ordering
c = repo['']
subs = c.substate # only repos that are committed
for s in sorted(subs):
c.sub(s).push(opts.get('force'))
Alexander Solovyov
commands: optional options where possible...
r7131 r = repo.push(other, opts.get('force'), revs=revs)
Vadim Gelfer
add merge command. means same thing as "update -m"....
r2019 return r == 0
mpm@selenic.com
stopgap hg push support...
r319
mpm@selenic.com
big heap of command clean-up work...
r245 def recover(ui, repo):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """roll back an interrupted transaction
Recover from an interrupted commit or pull.
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 This command tries to fix the repository status after an
interrupted operation. It should only be necessary when Mercurial
suggests it.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Matt Mackall
Automatically run "verify" whenever we run "recover"
r1516 if repo.recover():
Matt Mackall
Move repo.verify
r2778 return hg.verify(repo)
Thomas Arendsen Hein
Never exit directly from commands.dispatch(), but pass return code to caller....
r2057 return 1
mpm@selenic.com
big heap of command clean-up work...
r245
Vadim Gelfer
add --after option to remove command.
r2179 def remove(ui, repo, *pats, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """remove the specified files on the next commit
Schedule the indicated files for removal from the repository.
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 This only removes files from the current branch, not from the
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 entire project history. -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
timeless
Improve English for help text of many core hg commands....
r8779 revision without deleting them from the working directory.
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004
The following table details the behavior of remove for different
file states (columns) and option combinations (rows). The file
Martin Geisler
commands: wrap docstrings at 70 characters...
r9249 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)::
Martin Geisler
commands: use minirst parser when displaying help
r9157
A C M !
none W RD W R
-f R RD RD R
-A W W W R
-Af R R R R
Vadim Gelfer
remove: rewrite to be ~400x faster, bit more friendly...
r2309
Matt Mackall
Add doc notes about revert and hg status vs diff
r3829 This command schedules the files to be removed at the next commit.
To undo a remove before that, see hg revert.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Dirkjan Ochtman
improved semantics for remove (issue438)...
r6346
after, force = opts.get('after'), opts.get('force')
if not pats and not after:
Vadim Gelfer
add --after option to remove command.
r2179 raise util.Abort(_('no files specified'))
Dirkjan Ochtman
improved semantics for remove (issue438)...
r6346
Matt Mackall
walk: remove remaining users of cmdutils.matchpats
r6582 m = cmdutil.match(repo, pats, opts)
Matt Mackall
remove: work directly off status...
r6761 s = repo.status(match=m, clean=True)
modified, added, deleted, clean = s[0], s[1], s[3], s[6]
Benoit Boissinot
remove: warn if unversionned files are specified (issue1454)
r8533 for f in m.files():
if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
Matt Mackall
remove: work directly off status...
r6761 def warn(files, reason):
for f in files:
ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
% (m.rel(f), reason))
if force:
remove, forget = modified + deleted + clean, added
elif after:
remove, forget = deleted, []
warn(modified + added + clean, _('still exists'))
else:
remove, forget = deleted + clean, []
warn(modified, _('is modified'))
warn(added, _('has been marked for add'))
Matt Mackall
replace util.sort with sorted built-in...
r8209 for f in sorted(remove + forget):
Matt Mackall
remove: work directly off status...
r6761 if ui.verbose or not m.exact(f):
ui.status(_('removing %s\n') % m.rel(f))
Dirkjan Ochtman
improved semantics for remove (issue438)...
r6346
Vadim Gelfer
remove: rewrite to be ~400x faster, bit more friendly...
r2309 repo.forget(forget)
Dirkjan Ochtman
improved semantics for remove (issue438)...
r6346 repo.remove(remove, unlink=not after)
mpm@selenic.com
big heap of command clean-up work...
r245
Bryan O'Sullivan
Add rename/mv command....
r1253 def rename(ui, repo, *pats, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """rename files; equivalent of copy + remove
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 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.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
By default, this command copies the contents of files as they
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 exist in the working directory. If invoked with -A/--after, the
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 operation is recorded, but no copying is performed.
timeless
help: miscellaneous language fixes
r7807 This command takes effect at the next commit. To undo a rename
Matt Mackall
Add doc notes about revert and hg status vs diff
r3829 before that, see hg revert.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Matt Mackall
repo locks: use True/False
r4914 wlock = repo.wlock(False)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 try:
Matt Mackall
copy: handle rename internally...
r5610 return cmdutil.copy(ui, repo, pats, opts, rename=True)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 finally:
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 wlock.release()
Bryan O'Sullivan
Add rename/mv command....
r1253
Matt Mackall
resolve: new command...
r6518 def resolve(ui, repo, *pats, **opts):
Greg Ward
resolve: rewrite help to be clearer and more complete (issue2030).
r10559 """various operations to help finish a merge
This command includes several actions that are often useful while
performing a merge, after running ``merge`` but before running
``commit``. (It is only meaningful if your working directory has
two parents.) It is most relevant for merges with unresolved
conflicts, which are typically a result of non-interactive merging with
``internal:merge`` or a command-line merge tool like ``diff3``.
The available actions are:
1) list files that were merged with conflicts (U, for unresolved)
and without conflicts (R, for resolved): ``hg resolve -l``
(this is like ``status`` for merges)
2) record that you have resolved conflicts in certain files:
``hg resolve -m [file ...]`` (default: mark all unresolved files)
3) forget that you have resolved conflicts in certain files:
``hg resolve -u [file ...]`` (default: unmark all resolved files)
4) discard your current attempt(s) at resolving conflicts and
restart the merge from scratch: ``hg resolve file...``
(or ``-a`` for all unresolved files)
Note that 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.
Matt Mackall
resolve: new command...
r6518 """
timeless
commands: adding --no-status to resolve to match status
r9646 all, mark, unmark, show, nostatus = \
[opts.get(o) for o in 'all mark unmark list no_status'.split()]
Matt Mackall
resolve: require -a switch to resolve all files...
r7527
if (show and (mark or unmark)) or (mark and unmark):
Matt Mackall
resolve: new command...
r6518 raise util.Abort(_("too many options specified"))
Matt Mackall
resolve: require -a switch to resolve all files...
r7527 if pats and all:
raise util.Abort(_("can't specify --all and patterns"))
if not (all or pats or show or mark or unmark):
raise util.Abort(_('no files or directories specified; '
'use --all to remerge all files'))
Matt Mackall
resolve: new command...
r6518
ms = merge_.mergestate(repo)
Matt Mackall
resolve: use cmdutil.match
r6594 m = cmdutil.match(repo, pats, opts)
Matt Mackall
resolve: new command...
r6518
for f in ms:
Matt Mackall
resolve: use cmdutil.match
r6594 if m(f):
Matt Mackall
resolve: require -a switch to resolve all files...
r7527 if show:
timeless
commands: adding --no-status to resolve to match status
r9646 if nostatus:
ui.write("%s\n" % f)
else:
ui.write("%s %s\n" % (ms[f].upper(), f))
Matt Mackall
resolve: require -a switch to resolve all files...
r7527 elif mark:
Matt Mackall
resolve: new command...
r6518 ms.mark(f, "r")
Matt Mackall
resolve: require -a switch to resolve all files...
r7527 elif unmark:
Matt Mackall
resolve: new command...
r6518 ms.mark(f, "u")
else:
Matt Mackall
use repo[changeid] to get a changectx
r6747 wctx = repo[None]
Matt Mackall
resolve: new command...
r6518 mctx = wctx.parents()[-1]
Matt Mackall
resolve: keep .orig files
r7847
# backup pre-resolve (merge uses .orig for its own purposes)
a = repo.wjoin(f)
util.copyfile(a, a + ".resolve")
# resolve file
Matt Mackall
resolve: new command...
r6518 ms.resolve(f, wctx, mctx)
Matt Mackall
resolve: keep .orig files
r7847 # replace filemerge's .orig file with our resolve file
util.rename(a + ".resolve", a + ".orig")
Benoit Boissinot
make revert use standard matcher
r1472 def revert(ui, repo, *pats, **opts):
Martin Geisler
expand "dir" to "directory" in help texts
r8026 """restore individual files or directories to an earlier state
Matt Mackall
imported patch rev-help
r5574
Martin Geisler
commands: fix capitalization in revert help text
r8287 (Use update -r to check out earlier revisions, revert does not
change the working directory parents.)
Vadim Gelfer
fix doc comments for revert command. people found them confusing.
r2204
Vadim Gelfer
revert: require explicit revision when working dir has two parents.
r2212 With no revision specified, revert the named files or directories
to the contents they had in the parent of the working directory.
This restores the contents of the affected files to an unmodified
Matt Mackall
Add doc notes about revert and hg status vs diff
r3829 state and unschedules adds, removes, copies, and renames. If the
timeless
help: Improved body text
r10376 working directory has two parents, you must explicitly specify a
revision.
Benoit Boissinot
resync commands.py docstrings with hg.1.txt
r1811
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 Using the -r/--rev option, revert the given files or directories
to their contents as of a specific revision. This can be helpful
to "roll back" some or all of an earlier change. See 'hg help
dates' for a list of formats valid for -d/--date.
Benoit Boissinot
resync commands.py docstrings with hg.1.txt
r1811
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 Revert modifies the working directory. It does not commit any
changes, or change the parent of the working directory. If you
Vadim Gelfer
fix doc comments for revert command. people found them confusing.
r2204 revert to a revision other than the parent of the working
directory, the reverted files will thus appear modified
afterwards.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 If a file has been deleted, it is restored. If the executable mode
of a file was changed, it is reset.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Benoit Boissinot
make revert use standard matcher
r1472 If names are given, all files matching the names are reverted.
Vadim Gelfer
revert: require --all to revert all files.
r2982 If no arguments are given, no files are reverted.
Matt Mackall
imported patch rev-help
r5574
Modified files are saved with a .orig suffix before reverting.
To disable these backups, use --no-backup.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Vadim Gelfer
revert: require --all to revert all files.
r2982
Matt Mackall
Add --date support to update and revert...
r3814 if opts["date"]:
if opts["rev"]:
raise util.Abort(_("you can't specify a revision and a date"))
opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
Alexander Solovyov
commands: optional options where possible...
r7131 if not pats and not opts.get('all'):
Benoit Boissinot
Add a hint for revert --all when aborting
r3020 raise util.Abort(_('no files or directories specified; '
'use --all to revert the whole repo'))
Vadim Gelfer
revert: require --all to revert all files.
r2982
Vadim Gelfer
revert: require explicit revision when working dir has two parents.
r2212 parent, p2 = repo.dirstate.parents()
Alexander Solovyov
commands: optional options where possible...
r7131 if not opts.get('rev') and p2 != nullid:
Brendan Cully
Move defaultrev into changectx...
r3132 raise util.Abort(_('uncommitted merge - please provide a '
'specific revision'))
Alexander Solovyov
commands: optional options where possible...
r7131 ctx = repo[opts.get('rev')]
Benoit Boissinot
commands.py: use contexts in various places (debug*state, revert)
r3972 node = ctx.node()
mf = ctx.manifest()
Vadim Gelfer
revert: better fix for not printing 'reverting' message
r2407 if node == parent:
pmf = mf
else:
pmf = None
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029
Vadim Gelfer
small changes to revert command....
r2042 # need all matching names in dirstate and manifest of target rev,
# so have to walk both. do not print errors if files exist in one
# but not other.
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029 names = {}
Vadim Gelfer
small changes to revert command....
r2042
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 wlock = repo.wlock()
try:
# walk dirstate.
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579
m = cmdutil.match(repo, pats, opts)
Matt Mackall
many, many trivial check-code fixups
r10282 m.bad = lambda x, y: False
Matt Mackall
walk: return a single value
r6586 for abs in repo.walk(m):
Matt Mackall
walk: remove rel and exact returns
r6584 names[abs] = m.rel(abs), m.exact(abs)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915
# walk target manifest.
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 def badfn(path, msg):
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 if path in names:
Matt Mackall
add: use match.bad callback more effectively
r8679 return
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 path_ = path + '/'
for f in names:
if f.startswith(path_):
Matt Mackall
add: use match.bad callback more effectively
r8679 return
Martin Geisler
use ui instead of repo.ui when the former is in scope
r8615 ui.warn("%s: %s\n" % (m.rel(path), msg))
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915
Matt Mackall
walk: pass match object to cmdutil.walk...
r6579 m = cmdutil.match(repo, pats, opts)
m.bad = badfn
Matt Mackall
context: add walk method
r6764 for abs in repo[node].walk(m):
Matt Mackall
walk: remove rel and exact returns
r6584 if abs not in names:
names[abs] = m.rel(abs), m.exact(abs)
Alexis S. L. Carvalho
revert: don't assume ignored files will be returned in the unknown list...
r6031
Matt Mackall
status: use match helpers for various users
r6599 m = cmdutil.matchfiles(repo, names)
Matt Mackall
match: remove files arg from repo.status and friends
r6603 changes = repo.status(match=m)[:4]
Martin Geisler
replace set-like dictionaries with real sets...
r8152 modified, added, removed, deleted = map(set, changes)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915
Brendan Cully
Merge with crew-stable
r5266 # if f is a rename, also revert the source
cwd = repo.getcwd()
for f in added:
src = repo.dirstate.copied(f)
if src and src not in names and repo.dirstate[src] == 'r':
Martin Geisler
replace set-like dictionaries with real sets...
r8152 removed.add(src)
Brendan Cully
Merge with crew-stable
r5266 names[src] = (repo.pathto(src, cwd), True)
Alexis S. L. Carvalho
revert: unify forget and remove lists...
r6109 def removeforget(abs):
if repo.dirstate[abs] == 'a':
return _('forgetting %s\n')
return _('removing %s\n')
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 revert = ([], _('reverting %s\n'))
add = ([], _('adding %s\n'))
Alexis S. L. Carvalho
revert: unify forget and remove lists...
r6109 remove = ([], removeforget)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 undelete = ([], _('undeleting %s\n'))
disptable = (
# dispatch table:
# file state
# action if in target manifest
# action if not in target manifest
# make backup if in target manifest
# make backup if not in target manifest
(modified, revert, remove, True, True),
Alexis S. L. Carvalho
revert: unify forget and remove lists...
r6109 (added, revert, remove, True, False),
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 (removed, undelete, None, False, False),
(deleted, revert, remove, False, False),
)
Matt Mackall
replace util.sort with sorted built-in...
r8209 for abs, (rel, exact) in sorted(names.items()):
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 mfentry = mf.get(abs)
target = repo.wjoin(abs)
def handle(xlist, dobackup):
xlist[0].append(abs)
Alexander Solovyov
commands: optional options where possible...
r7131 if dobackup and not opts.get('no_backup') and util.lexists(target):
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 bakname = "%s.orig" % rel
ui.note(_('saving current version of %s as %s\n') %
(rel, bakname))
if not opts.get('dry_run'):
util.copyfile(target, bakname)
if ui.verbose or not exact:
Alexis S. L. Carvalho
revert: unify forget and remove lists...
r6109 msg = xlist[1]
if not isinstance(msg, basestring):
msg = msg(abs)
ui.status(msg % rel)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 for table, hitlist, misslist, backuphit, backupmiss in disptable:
Matt Mackall
many, many trivial check-code fixups
r10282 if abs not in table:
continue
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 # file has changed in dirstate
if mfentry:
handle(hitlist, backuphit)
elif misslist is not None:
handle(misslist, backupmiss)
break
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029 else:
Alexis S. L. Carvalho
revert: don't assume ignored files will be returned in the unknown list...
r6031 if abs not in repo.dirstate:
if mfentry:
handle(add, True)
elif exact:
ui.warn(_('file not managed: %s\n') % rel)
continue
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 # file has not changed in dirstate
if node == parent:
Matt Mackall
many, many trivial check-code fixups
r10282 if exact:
ui.warn(_('no changes needed to %s\n') % rel)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 continue
if pmf is None:
# only need parent manifest in this unlikely case,
# so do not read by default
Matt Mackall
use repo[changeid] to get a changectx
r6747 pmf = repo[parent].manifest()
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 if abs in pmf:
if mfentry:
# if version of file is same in parent and target
# manifests, do nothing
Alexis S. L. Carvalho
revert: revert clean files when only a change of flags is needed
r6030 if (pmf[abs] != mfentry or
pmf.flags(abs) != mf.flags(abs)):
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 handle(revert, False)
else:
handle(remove, False)
if not opts.get('dry_run'):
Alexis S. L. Carvalho
commands.revert: don't call hg.revert...
r6107 def checkout(f):
fc = ctx[f]
Matt Mackall
simplify flag handling...
r6743 repo.wwrite(f, fc.data(), fc.flags())
Alexis S. L. Carvalho
commands.revert: don't call hg.revert...
r6107
Alexis S. L. Carvalho
revert: unify forget and remove lists...
r6109 audit_path = util.path_auditor(repo.root)
for f in remove[0]:
if repo.dirstate[f] == 'a':
repo.dirstate.forget(f)
continue
audit_path(f)
try:
util.unlink(repo.wjoin(f))
except OSError:
pass
repo.dirstate.remove(f)
Alexis S. L. Carvalho
commands.revert: don't call hg.revert...
r6107
Alexis S. L. Carvalho
revert: update state of files in the "checkout" list...
r6299 normal = None
if node == parent:
# We're reverting to our parent. If possible, we'd like status
# to report the file as clean. We have to use normallookup for
# merges to avoid losing information about merged/dirty files.
if p2 != nullid:
normal = repo.dirstate.normallookup
else:
normal = repo.dirstate.normal
Alexis S. L. Carvalho
commands.revert: don't call hg.revert...
r6107 for f in revert[0]:
checkout(f)
Alexis S. L. Carvalho
revert: update state of files in the "checkout" list...
r6299 if normal:
normal(f)
Alexis S. L. Carvalho
commands.revert: don't call hg.revert...
r6107
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 for f in add[0]:
Alexis S. L. Carvalho
commands.revert: don't call hg.revert...
r6107 checkout(f)
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 repo.dirstate.add(f)
Alexis S. L. Carvalho
commands.revert: don't call hg.revert...
r6107
Alexis S. L. Carvalho
revert: only call dirstate.normal when we know the file is clean
r6108 normal = repo.dirstate.normallookup
if node == parent and p2 == nullid:
normal = repo.dirstate.normal
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 for f in undelete[0]:
Alexis S. L. Carvalho
commands.revert: don't call hg.revert...
r6107 checkout(f)
Alexis S. L. Carvalho
revert: only call dirstate.normal when we know the file is clean
r6108 normal(f)
Alexis S. L. Carvalho
commands.revert: don't call hg.revert...
r6107
Matt Mackall
Use try/finally pattern to cleanup locks and transactions
r4915 finally:
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 wlock.release()
mpm@selenic.com
[PATCH] hg revert...
r588
Vadim Gelfer
deprecate undo command, replace with rollback command.
r2227 def rollback(ui, repo):
Matt Mackall
imported patch rollback-help
r5575 """roll back the last transaction
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
Matt Mackall
rollback: minor clarification (issue828)
r8856 any dirstate changes since that time. This command does not alter
the working directory.
Vadim Gelfer
deprecate undo command, replace with rollback command.
r2227
Transactions are used to encapsulate the effects of all commands
that create new changesets or propagate existing changesets into a
repository. For example, the following commands are transactional,
Martin Geisler
commands, dates: use real lists instead of literal blocks
r9893 and their effects can be rolled back:
- commit
- import
- pull
timeless
help: Improved body text
r10376 - push (with this repository as the destination)
Martin Geisler
commands, dates: use real lists instead of literal blocks
r9893 - unbundle
Vadim Gelfer
deprecate undo command, replace with rollback command.
r2227
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.
"""
Thomas Arendsen Hein
Renamed localrepo.undo() to rollback() and talk about "rollback information".
r2362 repo.rollback()
Vadim Gelfer
deprecate undo command, replace with rollback command.
r2227
mpm@selenic.com
[PATCH] add "root" command...
r468 def root(ui, repo):
Martin Geisler
expand "dir" to "directory" in help texts
r8026 """print the root (top) of the current working directory
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Print the root directory of the current repository.
"""
mpm@selenic.com
[PATCH] add "root" command...
r468 ui.write(repo.root + "\n")
mpm@selenic.com
big heap of command clean-up work...
r245 def serve(ui, repo, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """export the repository via HTTP
Start a local HTTP repository browser and pull server.
By default, the server logs accesses to stdout and errors to
Martin Geisler
write options in "-r/--rev" style in help texts
r8277 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
files.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Matt Mackall
Add an sshrepository class and hg serve --stdio
r624
if opts["stdio"]:
Thomas Arendsen Hein
Allow 'hg serve --webdir-conf foo' to be run outside a repository.
r2127 if repo is None:
Matt Mackall
error: move repo errors...
r7637 raise error.RepoError(_("There is no Mercurial repository here"
Joel Rosdahl
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
r6217 " (.hg not found)"))
Vadim Gelfer
refactor ssh server.
r2396 s = sshserver.sshserver(ui, repo)
s.serve_forever()
Matt Mackall
Give a response to unknown SSH commands
r2363
Matt Mackall
ui: kill most users of parentui name and arg, replace with .copy()
r8190 baseui = repo and repo.baseui or ui
Michele Cella
adding "prefix" option to "hg serve" (command line and [web] section)...
r5835 optlist = ("name templates style address port prefix ipv6"
Dirkjan Ochtman
serve: obey the --encoding option
r8870 " accesslog errorlog webdir_conf certificate encoding")
mpm@selenic.com
hgweb: change startup argument processing...
r987 for o in optlist.split():
Dirkjan Ochtman
serve: obey the --encoding option
r8870 if opts.get(o, None):
Matt Mackall
ui: kill most users of parentui name and arg, replace with .copy()
r8190 baseui.setconfig("web", o, str(opts[o]))
if (repo is not None) and (repo.ui != baseui):
Alexis S. L. Carvalho
serve: respect settings from .hg/hgrc...
r4835 repo.ui.setconfig("web", o, str(opts[o]))
mpm@selenic.com
hgweb: change startup argument processing...
r987
Thomas Arendsen Hein
Allow 'hg serve --webdir-conf foo' to be run outside a repository.
r2127 if repo is None and not ui.config("web", "webdir_conf"):
Matt Mackall
error: move repo errors...
r7637 raise error.RepoError(_("There is no Mercurial repository here"
" (.hg not found)"))
Thomas Arendsen Hein
Allow 'hg serve --webdir-conf foo' to be run outside a repository.
r2127
Benoit Boissinot
use new style classes
r8778 class service(object):
Bryan O'Sullivan
Refactor commands.serve to allow other commands to run as services....
r4380 def init(self):
Marcos Chaves
Handle CTRL+C in serve under Windows.
r4672 util.set_signal_handler()
Simon Heimberg
separate import lines from mercurial and general python modules
r8312 self.httpd = server.create_server(baseui, repo)
Bryan O'Sullivan
Refactor commands.serve to allow other commands to run as services....
r4380
Matt Mackall
many, many trivial check-code fixups
r10282 if not ui.verbose:
return
Bryan O'Sullivan
Refactor commands.serve to allow other commands to run as services....
r4380
Michele Cella
hgweb: fixes to make hg serve prefix handling more robust
r5970 if self.httpd.prefix:
prefix = self.httpd.prefix.strip('/') + '/'
else:
prefix = ''
Stephen Deasey
hgweb: clarify which address and port can/cannot be bound at startup (bug 769)...
r6262 port = ':%d' % self.httpd.port
if port == ':80':
port = ''
Benoit Boissinot
hg serve: add clearer message when starting the server with --verbose...
r6419 bindaddr = self.httpd.addr
if bindaddr == '0.0.0.0':
bindaddr = '*'
elif ':' in bindaddr: # IPv6
bindaddr = '[%s]' % bindaddr
fqaddr = self.httpd.fqaddr
if ':' in fqaddr:
fqaddr = '[%s]' % fqaddr
ui.status(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
(fqaddr, port, prefix, bindaddr, self.httpd.port))
Bryan O'Sullivan
Refactor commands.serve to allow other commands to run as services....
r4380
def run(self):
self.httpd.serve_forever()
service = service()
cmdutil.service(opts, initfn=service.init, runfn=service.run)
mpm@selenic.com
[PATCH] Clean up destination directory if a clone fails....
r500
Bryan O'Sullivan
Add name matching to status command.
r731 def status(ui, repo, *pats, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """show changed files in the working directory
mpm@selenic.com
commands: migrate status and branch...
r213
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 Show status of files in the repository. If names are given, only
files that match are shown. Files that are clean or ignored or
timeless
Improve English for help text of many core hg commands....
r8779 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.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Thomas Arendsen Hein
Extend/correct acc40572da5b regarding -qA and ignored files....
r6201 Option -q/--quiet hides untracked (unknown and ignored) files
Wagner Bruna
commands: fix typo on flag description
r8009 unless explicitly requested with -u/--unknown or -i/--ignored.
Zoran Bosnjak
'hg status -q' output skips non-tracked files....
r6200
Matt Mackall
Add notes about diff/merge asymmetry to export, diff, and log
r3822 NOTE: 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.
Brendan Cully
Add --rev option to status
r3467 If one revision is given, it is used as the base revision.
timeless
Improve English for help text of many core hg commands....
r8779 If two revisions are given, the differences between them are
Gilles Moris
status: add the --change option to display files changed in a revision...
r10014 shown. The --change option can also be used as a shortcut to list
the changed files of a revision from its first parent.
Brendan Cully
Add --rev option to status
r3467
Martin Geisler
commands: use minirst parser when displaying help
r9157 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 listed as A (added)
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
mpm@selenic.com
Optimize diff and status in subdirectories...
r312
Gilles Moris
status: add the --change option to display files changed in a revision...
r10014 revs = opts.get('rev')
change = opts.get('change')
if revs and change:
msg = _('cannot specify --rev and --change at the same time')
raise util.Abort(msg)
elif change:
node2 = repo.lookup(change)
node1 = repo[node2].parents()[0].node()
else:
node1, node2 = cmdutil.revpair(repo, revs)
Benoit Boissinot
correct the relative path when walking from a subdir...
r1625 cwd = (pats and repo.getcwd()) or ''
Alexander Solovyov
commands: optional options where possible...
r7131 end = opts.get('print0') and '\0' or '\n'
Matt Mackall
status: find copies and renames beyond the working directory
r6276 copy = {}
Matt Mackall
status: refactor status command...
r6605 states = 'modified added removed deleted unknown ignored clean'.split()
Alexander Solovyov
status: make options optional (issue1481)
r7684 show = [k for k in states if opts.get(k)]
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('all'):
Matt Mackall
status: refactor status command...
r6605 show += ui.quiet and (states[:4] + ['clean']) or states
if not show:
show = ui.quiet and states[:4] or states[:5]
stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
'ignored' in show, 'clean' in show, 'unknown' in show)
changestates = zip(states, 'MAR!?IC', stat)
Alexander Solovyov
commands: optional options where possible...
r7131 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
Matt Mackall
use repo[changeid] to get a changectx
r6747 ctxn = repo[nullid]
ctx1 = repo[node1]
ctx2 = repo[node2]
Matt Mackall
copies: teach copies about dirstate.copies...
r6646 added = stat[1]
if node2 is None:
added = stat[0] + stat[1] # merged?
Matt Mackall
use repo.changectx(None) to get a workingctx
r6740
Dirkjan Ochtman
use dict.iteritems() rather than dict.items()...
r7622 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
Matt Mackall
copies: teach copies about dirstate.copies...
r6646 if k in added:
copy[k] = v
elif v in added:
Matt Mackall
status: find copies and renames beyond the working directory
r6276 copy[v] = k
Matt Mackall
status: refactor status command...
r6605 for state, char, files in changestates:
if state in show:
Thomas Arendsen Hein
hg status cleanups: Don't translate long options, remove stray semicolon.
r1966 format = "%s %%s%s" % (char, end)
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('no_status'):
Matt Mackall
status: refactor status command...
r6605 format = "%%s%s" % end
for f in files:
ui.write(format % repo.pathto(f, cwd))
if f in copy:
ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end))
mpm@selenic.com
commands: migrate status and branch...
r213
Matt Mackall
summary: add --remote
r9620 def summary(ui, repo, **opts):
Matt Mackall
Introduce summary command
r9603 """summarize working directory state
This generates a brief summary of the working directory state,
including parents, branch, commit status, and available updates.
Matt Mackall
summary: add --remote
r9620
With the --remote option, this will check the default paths for
incoming and outgoing changes. This can be time-consuming.
Matt Mackall
Introduce summary command
r9603 """
ctx = repo[None]
parents = ctx.parents()
pnode = parents[0].node()
tags = repo.tags()
for p in parents:
t = ' '.join([t for t in tags if tags[t] == p.node()])
Matt Mackall
summary: add empty repository and no revision checked out hints
r9618 if p.rev() == -1:
if not len(repo):
t += _(' (empty repository)')
else:
t += _(' (no revision checked out)')
Matt Mackall
Introduce summary command
r9603 ui.write(_('parent: %d:%s %s\n') % (p.rev(), str(p), t))
Matt Mackall
summary: add empty repository and no revision checked out hints
r9618 if p.description():
ui.status(' ' + p.description().splitlines()[0].strip() + '\n')
Matt Mackall
Introduce summary command
r9603
branch = ctx.branch()
bheads = repo.branchheads(branch)
Matt Mackall
summary: note non-default branches with -q
r9873 m = _('branch: %s\n') % branch
if branch != 'default':
ui.write(m)
else:
ui.status(m)
Matt Mackall
Introduce summary command
r9603
Matt Mackall
summary: various fixes, add a test...
r10390 st = list(repo.status(unknown=True))[:6]
Matt Mackall
Introduce summary command
r9603 ms = merge_.mergestate(repo)
Matt Mackall
summary: various fixes, add a test...
r10390 st.append([f for f in ms if ms[f] == 'u'])
Matt Mackall
summary: restore briefer commit status
r9619 labels = [_('%d modified'), _('%d added'), _('%d removed'),
_('%d deleted'), _('%d unknown'), _('%d ignored'),
_('%d unresolved')]
Matt Mackall
Introduce summary command
r9603 t = []
Matt Mackall
many, many trivial check-code fixups
r10282 for s, l in zip(st, labels):
Martin Geisler
commands: do not split a translated string...
r9607 if s:
t.append(l % len(s))
Matt Mackall
Introduce summary command
r9603
t = ', '.join(t)
FUJIWARA Katsunori
summary: L10N messages hide clean-ness of workdir from 'hg summary'...
r10269 cleanworkdir = False
Matt Mackall
Introduce summary command
r9603
if len(parents) > 1:
t += _(' (merge)')
elif branch != parents[0].branch():
t += _(' (new branch)')
elif (not st[0] and not st[1] and not st[2]):
t += _(' (clean)')
FUJIWARA Katsunori
summary: L10N messages hide clean-ness of workdir from 'hg summary'...
r10269 cleanworkdir = True
Matt Mackall
Introduce summary command
r9603 elif pnode not in bheads:
t += _(' (new branch head)')
FUJIWARA Katsunori
summary: L10N messages hide clean-ness of workdir from 'hg summary'...
r10269 if cleanworkdir:
Matt Mackall
summary: quieter with -q
r9605 ui.status(_('commit: %s\n') % t.strip())
else:
ui.write(_('commit: %s\n') % t.strip())
Matt Mackall
Introduce summary command
r9603
# all ancestors of branch heads - all ancestors of parent = new csets
new = [0] * len(repo)
cl = repo.changelog
Matt Mackall
summary: various fixes, add a test...
r10390 for a in [cl.rev(n) for n in bheads]:
new[a] = 1
Matt Mackall
Introduce summary command
r9603 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
new[a] = 1
Matt Mackall
summary: various fixes, add a test...
r10390 for a in [p.rev() for p in parents]:
if a >= 0:
new[a] = 0
Matt Mackall
Introduce summary command
r9603 for a in cl.ancestors(*[p.rev() for p in parents]):
new[a] = 0
new = sum(new)
if new == 0:
Matt Mackall
summary: quieter with -q
r9605 ui.status(_('update: (current)\n'))
Matt Mackall
Introduce summary command
r9603 elif pnode not in bheads:
ui.write(_('update: %d new changesets (update)\n') % new)
else:
ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
(new, len(bheads)))
Matt Mackall
summary: add --remote
r9620 if opts.get('remote'):
t = []
Sune Foldager
fix remaining hg.parseurl uses
r10389 source, branches = hg.parseurl(ui.expandpath('default'))
Matt Mackall
summary: add --remote
r9620 other = hg.repository(cmdutil.remoteui(repo, {}), source)
Sune Foldager
fix remaining hg.parseurl uses
r10389 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
Matt Mackall
summary: add --remote
r9620 ui.debug('comparing with %s\n' % url.hidepassword(source))
repo.ui.pushbuffer()
common, incoming, rheads = repo.findcommonincoming(other)
repo.ui.popbuffer()
if incoming:
t.append(_('1 or more incoming'))
Sune Foldager
fix remaining hg.parseurl uses
r10389 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
Matt Mackall
summary: add --remote
r9620 other = hg.repository(cmdutil.remoteui(repo, {}), dest)
ui.debug('comparing with %s\n' % url.hidepassword(dest))
repo.ui.pushbuffer()
o = repo.findoutgoing(other)
repo.ui.popbuffer()
Matt Mackall
summary: various fixes, add a test...
r10390 o = repo.changelog.nodesbetween(o, None)[0]
Matt Mackall
summary: add --remote
r9620 if o:
t.append(_('%d outgoing') % len(o))
if t:
ui.write(_('remote: %s\n') % (', '.join(t)))
else:
ui.status(_('remote: (synced)\n'))
John Coomes
tag: allow multiple tags to be added or removed...
r6321 def tag(ui, repo, name1, *names, **opts):
"""add one or more tags for the current or given revision
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Name a particular revision using <name>.
Tags are used to name particular revisions of the repository and are
Thomas Arendsen Hein
Fixed typo in tag help, found by John Coomes
r6220 very useful to compare different revisions, to go back to significant
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 earlier versions or to mark branch points as releases, etc.
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 If no revision is given, the parent of the working directory is
used, or tip if no revision is checked out.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
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
Christian Ebert
Consistently 1 space after full stops in command doc strings...
r6448 necessary. The file '.hg/localtags' is used for local tags (not
Benoit Boissinot
deprecate the use of 'hg tag NAME [REV]'...
r1654 shared among repositories).
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163
See 'hg help dates' for a list of formats valid for -d/--date.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
John Coomes
tag: allow multiple tags to be added or removed...
r6321
Matt Mackall
context: avoid using None for working parent
r6739 rev_ = "."
John Coomes
tag: allow multiple tags to be added or removed...
r6321 names = (name1,) + names
Martin Geisler
replace set-like dictionaries with real sets...
r8152 if len(names) != len(set(names)):
John Coomes
tag: allow multiple tags to be added or removed...
r6321 raise util.Abort(_('tag names must be unique'))
for n in names:
if n in ['tip', '.', 'null']:
raise util.Abort(_('the name \'%s\' is reserved') % n)
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('rev') and opts.get('remove'):
Matt Mackall
tags: add --remove
r4213 raise util.Abort(_("--rev and --remove are incompatible"))
Alexander Solovyov
commands: optional options where possible...
r7131 if opts.get('rev'):
Benoit Boissinot
fix 'hg tag <tagname> <revision>...
r1596 rev_ = opts['rev']
Alexander Solovyov
commands: optional options where possible...
r7131 message = opts.get('message')
if opts.get('remove'):
expectedtype = opts.get('local') and 'local' or 'global'
John Coomes
tag: allow multiple tags to be added or removed...
r6321 for n in names:
if not repo.tagtype(n):
raise util.Abort(_('tag \'%s\' does not exist') % n)
if repo.tagtype(n) != expectedtype:
Wagner Bruna
commands, i18n: avoid untranslated strings as message parameters
r8008 if expectedtype == 'global':
raise util.Abort(_('tag \'%s\' is not a global tag') % n)
else:
raise util.Abort(_('tag \'%s\' is not a local tag') % n)
Matt Mackall
tags: add --remove
r4213 rev_ = nullid
if not message:
Martin Geisler
do not translate commit messages...
r9183 # we don't translate commit messages
message = 'Removed tag %s' % ', '.join(names)
Alexander Solovyov
commands: optional options where possible...
r7131 elif not opts.get('force'):
John Coomes
tag: allow multiple tags to be added or removed...
r6321 for n in names:
if n in repo.tags():
raise util.Abort(_('tag \'%s\' already exists '
'(use -f to force)') % n)
Brendan Cully
Move defaultrev into changectx...
r3132 if not rev_ and repo.dirstate.parents()[1] != nullid:
raise util.Abort(_('uncommitted merge - please provide a '
'specific revision'))
Matt Mackall
use repo[changeid] to get a changectx
r6747 r = repo[rev_].node()
Matt Mackall
tag: shorten hash in default commit message...
r2967
if not message:
Martin Geisler
do not translate commit messages...
r9183 # we don't translate commit messages
message = ('Added tag %s for changeset %s' %
John Coomes
tag: allow multiple tags to be added or removed...
r6321 (', '.join(names), short(r)))
Matt Mackall
tag: shorten hash in default commit message...
r2967
Benoit Boissinot
fix incorrect date when committing a tag...
r6243 date = opts.get('date')
if date:
date = util.parsedate(date)
Alexander Solovyov
commands: optional options where possible...
r7131 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401
mpm@selenic.com
migrate remaining commands...
r248 def tags(ui, repo):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """list repository tags
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 This lists both regular and local tags. When the -v/--verbose
switch is used, a third column "local" is printed for local tags.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Thomas Arendsen Hein
Handle errors in .hgtags or hgrc [tags] section more gracefully....
r477
Matt Mackall
Only show long hashes with --debug, not --verbose
r2966 hexfunc = ui.debugflag and hex or short
Osku Salerma
Add --verbose support to tags command.
r5658 tagtype = ""
Matt Mackall
replace various uses of list.reverse()
r8210 for t, n in reversed(repo.tagslist()):
Osku Salerma
Add --verbose support to tags command.
r5658 if ui.quiet:
ui.write("%s\n" % t)
continue
mpm@selenic.com
migrate remaining commands...
r248 try:
Thomas Arendsen Hein
Removed trailing whitespace and tabs from python files
r4516 hn = hexfunc(n)
Osku Salerma
Add --verbose support to tags command.
r5658 r = "%5d:%s" % (repo.changelog.rev(n), hn)
Matt Mackall
errors: move revlog errors...
r7633 except error.LookupError:
Brendan Cully
Add revlog.LookupError exception, and use it instead of RevlogError....
r3930 r = " ?:%s" % hn
Thomas Arendsen Hein
Make 'hg tags -q' only list tag names without revision numbers and hashes,...
r2035 else:
Matt Mackall
move encoding bits from util to encoding...
r7948 spaces = " " * (30 - encoding.colwidth(t))
Osku Salerma
Add --verbose support to tags command.
r5658 if ui.verbose:
if repo.tagtype(t) == 'local':
tagtype = " local"
else:
tagtype = ""
ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
mpm@selenic.com
migrate remaining commands...
r248
Vadim Gelfer
add -p option to tip. for issue 64.
r1731 def tip(ui, repo, **opts):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """show the tip revision
timeless
Improve English for help text of many core hg commands....
r8779 The tip revision (usually just called the tip) is the changeset
most recently added to the repository (and therefore the most
recently changed head).
Patrick Mezard
Make tip help more helpful
r6364
Patrick Mezard
Remove unexpected "Alternately" word from tip help.
r6367 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.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Robert Bachmann
Added support for templatevar "footer" to cmdutil.py
r10152 displayer = cmdutil.show_changeset(ui, repo, opts)
displayer.show(repo[len(repo) - 1])
displayer.close()
mpm@selenic.com
big heap of command clean-up work...
r245
Giorgos Keramidas
unbundle: accept multiple file arguments...
r4699 def unbundle(ui, repo, fname1, *fnames, **opts):
"""apply one or more changegroup files
Apply one or more compressed changegroup files generated by the
bundle command.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Giorgos Keramidas
unbundle: accept multiple file arguments...
r4699 fnames = (fname1,) + fnames
Patrick Mezard
commands: lock() the repo while unbundling (issue1004)
r6180
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 lock = repo.lock()
Patrick Mezard
commands: lock() the repo while unbundling (issue1004)
r6180 try:
for fname in fnames:
Benoit Boissinot
use our urlopener (proxy handling, etc) instead of urllib
r7271 f = url.open(ui, fname)
Patrick Mezard
commands: lock() the repo while unbundling (issue1004)
r6180 gen = changegroup.readbundle(f, fname)
modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
finally:
Ronny Pfannschmidt
switch lock releasing in the core from gc to explicit
r8109 lock.release()
Giorgos Keramidas
unbundle: accept multiple file arguments...
r4699
Alexander Solovyov
commands: optional options where possible...
r7131 return postincoming(ui, repo, modheads, opts.get('update'), None)
mpm@selenic.com
Add preliminary support for the bundle and unbundle commands
r1218
Matt Mackall
update: add --check option
r8855 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
Benoit Boissinot
various doc fixes...
r4014 """update working directory
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 Update the repository's working directory to the specified
Stuart W Marks
help: describe new cross-branch behavior in update help text, plus cleanups
r9718 changeset.
If no changeset is specified, attempt to update to the head of the
current branch. If this head is a descendant of the working
directory's parent, update to it, otherwise abort.
The following rules apply when the working directory contains
uncommitted changes:
Stuart W Marks
help: improve wording of update help text
r9831 1. If neither -c/--check nor -C/--clean 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
Martin Geisler
commands: use enumerated lists in help texts
r9740 are preserved.
Stuart W Marks
help: describe new cross-branch behavior in update help text, plus cleanups
r9718
2. With the -c/--check option, the update is aborted and the
Martin Geisler
commands: use enumerated lists in help texts
r9740 uncommitted changes are preserved.
Stuart W Marks
help: describe new cross-branch behavior in update help text, plus cleanups
r9718
3. With the -C/--clean option, uncommitted changes are discarded and
Martin Geisler
commands: use enumerated lists in help texts
r9740 the working directory is updated to the requested changeset.
Stuart W Marks
help: describe new cross-branch behavior in update help text, plus cleanups
r9718
Use null as the changeset to remove the working directory (like 'hg
Martin Geisler
commands: word-wrap help texts at 70 characters
r8004 clone -U').
Matt Mackall
update: better logic and messages for updates...
r6375
Stuart W Marks
help: describe new cross-branch behavior in update help text, plus cleanups
r9718 If you want to update just one file to an older changeset, use 'hg revert'.
Dirkjan Ochtman
add note about updating one file to update help
r6842
Martin Geisler
commands: consistently write switches as -a/--abc
r8033 See 'hg help dates' for a list of formats valid for -d/--date.
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """
Daniel Holth
accept -r REV in more places...
r4450 if rev and node:
raise util.Abort(_("please specify just one revision"))
if not rev:
rev = node
Stuart W Marks
commands: forbid 'hg update --check --clean'
r9450 if check and clean:
Martin Geisler
commands: expand -c and -C in update error message
r9451 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
Stuart W Marks
commands: forbid 'hg update --check --clean'
r9450
if check:
Matt Mackall
update: add --check option
r8855 # we could use dirty() but we can ignore merge and branch trivia
c = repo[None]
if c.modified() or c.added() or c.removed():
raise util.Abort(_("uncommitted local changes"))
Matt Mackall
Add --date support to update and revert...
r3814 if date:
Daniel Holth
accept -r REV in more places...
r4450 if rev:
Matt Mackall
Add --date support to update and revert...
r3814 raise util.Abort(_("you can't specify a revision and a date"))
Daniel Holth
accept -r REV in more places...
r4450 rev = cmdutil.finddate(ui, repo, date)
Matt Mackall
Add --date support to update and revert...
r3814
Matt Mackall
update: allow -c to jump branches if clean
r9187 if clean or check:
Daniel Holth
accept -r REV in more places...
r4450 return hg.clean(repo, rev)
Matt Mackall
Introduce update helper functions: update, merge, clean, and revert
r2808 else:
Daniel Holth
accept -r REV in more places...
r4450 return hg.update(repo, rev)
mpm@selenic.com
unify checkout and resolve into update...
r254
mpm@selenic.com
migrate verify...
r247 def verify(ui, repo):
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 """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.
"""
Matt Mackall
Move repo.verify
r2778 return hg.verify(repo)
mpm@selenic.com
migrate verify...
r247
Matt Mackall
move show_version to version_
r3651 def version_(ui):
"""output version and copyright information"""
ui.write(_("Mercurial Distributed SCM (version %s)\n")
Matt Mackall
refactor version code...
r7632 % util.version())
Matt Mackall
move show_version to version_
r3651 ui.status(_(
Martin Geisler
commands: update copyright year to 2010
r10206 "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
Matt Mackall
move show_version to version_
r3651 "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"
))
mpm@selenic.com
hg help: use docstrings only...
r255 # Command options and aliases are listed here, alphabetically
Benoit Boissinot
factor opts: move globalopts to a more logical place...
r3187 globalopts = [
('R', 'repository', '',
Adrian Buehlmann
mention overlay bundle file in global --repository option...
r9477 _('repository root directory or name of overlay bundle file')),
Benoit Boissinot
factor opts: move globalopts to a more logical place...
r3187 ('', 'cwd', '', _('change working directory')),
('y', 'noninteractive', None,
_('do not prompt, assume \'yes\' for any required answers')),
('q', 'quiet', None, _('suppress output')),
('v', 'verbose', None, _('enable additional output')),
Wagner Bruna
commands: clarify --config syntax
r10541 ('', 'config', [],
_('set/override config option (use \'section.name=value\')')),
Benoit Boissinot
factor opts: move globalopts to a more logical place...
r3187 ('', 'debug', None, _('enable debugging output')),
('', 'debugger', None, _('start debugger')),
Matt Mackall
move encoding bits from util to encoding...
r7948 ('', 'encoding', encoding.encoding, _('set the charset encoding')),
('', 'encodingmode', encoding.encodingmode,
_('set the charset encoding mode')),
Martin Geisler
commands: slightly better help for --traceback
r9698 ('', 'traceback', None, _('always print a traceback on exception')),
Benoit Boissinot
factor opts: move globalopts to a more logical place...
r3187 ('', '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')),
]
Benoit Boissinot
factor opts: --dry-run option
r3189 dryrunopts = [('n', 'dry-run', None,
_('do not perform actions, just print output'))]
Benoit Boissinot
factor opts: remote repo access options
r3190 remoteopts = [
('e', 'ssh', '', _('specify ssh command to use')),
('', 'remotecmd', '', _('specify hg command to run on the remote side')),
]
Benoit Boissinot
factor opts: walk options
r3188 walkopts = [
('I', 'include', [], _('include names matching the given patterns')),
('X', 'exclude', [], _('exclude names matching the given patterns')),
]
Mathieu Clabaut
Uniformisation of commit help for -m and -l....
r3857 commitopts = [
('m', 'message', '', _('use <text> as commit message')),
('l', 'logfile', '', _('read commit message from <file>')),
]
Benoit Boissinot
refactor options from cmdtable...
r5147 commitopts2 = [
('d', 'date', '', _('record datecode as commit date')),
Sverre Rabbelier
commit: be more verbose in the -u help text...
r8313 ('u', 'user', '', _('record the specified user as committer')),
Benoit Boissinot
refactor options from cmdtable...
r5147 ]
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 templateopts = [
('', 'style', '', _('display using template map file')),
('', 'template', '', _('display with template')),
]
logopts = [
('p', 'patch', None, _('show patch')),
Jim Correia
log-like commands now use -G for --graph, -g for --git
r7763 ('g', 'git', None, _('use git extended diff format')),
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 ('l', 'limit', '', _('limit number of changes displayed')),
('M', 'no-merges', None, _('do not show merges')),
] + templateopts
Jason Orendorff
mq: qdiff: support all diffopts
r6668 diffopts = [
('a', 'text', None, _('treat all files as text')),
('g', 'git', None, _('use git extended diff format')),
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 ('', 'nodates', None, _('omit dates from diff headers'))
Jason Orendorff
mq: qdiff: support all diffopts
r6668 ]
diffopts2 = [
('p', 'show-function', None, _('show which function each change is in')),
Martin Geisler
diff: change --inverse to --reverse...
r9857 ('', 'reverse', None, _('produce a diff that undoes the changes')),
Jason Orendorff
mq: qdiff: support all diffopts
r6668 ('w', 'ignore-all-space', None,
_('ignore white space when comparing lines')),
('b', 'ignore-space-change', None,
_('ignore changes in the amount of white space')),
('B', 'ignore-blank-lines', None,
_('ignore changes whose lines are all blank')),
Brodie Rao
diff: add --stat for diffstat output...
r9640 ('U', 'unified', '', _('number of lines of context to show')),
('', 'stat', None, _('output diffstat-style summary of changes')),
Jason Orendorff
mq: qdiff: support all diffopts
r6668 ]
Brendan Cully
import: add similarity option (issue295)
r7402 similarityopts = [
('s', 'similarity', '',
_('guess renamed files by similarity (0<=s<=100)'))
]
mpm@selenic.com
Beginning of new command parsing interface...
r209 table = {
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')),
Vadim Gelfer
addremove: do not deprecate....
r2955 "addremove":
Brendan Cully
import: add similarity option (issue295)
r7402 (addremove, similarityopts + walkopts + dryrunopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... [FILE]...')),
Dirkjan Ochtman
add a blame alias for annotate...
r6182 "^annotate|blame":
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 (annotate,
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 [('r', 'rev', '', _('annotate the specified revision')),
Dirkjan Ochtman
commands: annotate follows by default, separate -f/--file option
r10369 ('', 'follow', None, _('follow copies and renames (DEPRECATED)')),
('', 'no-follow', None, _("don't follow copies and renames")),
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ('a', 'text', None, _('treat all files as text')),
Thomas Arendsen Hein
Make annotae/grep print short dates with -q/--quiet....
r6134 ('u', 'user', None, _('list the author (long with -v)')),
Dirkjan Ochtman
commands: annotate follows by default, separate -f/--file option
r10369 ('f', 'file', None, _('list the filename')),
Thomas Arendsen Hein
Make annotae/grep print short dates with -q/--quiet....
r6134 ('d', 'date', None, _('list the date (short with -q)')),
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 ('n', 'number', None, _('list the revision number (default)')),
('c', 'changeset', None, _('list the changeset')),
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 ('l', 'line-number', None,
_('show line number at the first appearance'))
Benoit Boissinot
factor opts: walk options
r3188 ] + walkopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
Thomas Arendsen Hein
Cleanup archive command: Don't overwrite gettext, quoting in cmd table entry.
r2160 "archive":
Vadim Gelfer
add "archive" command, like "cvs export" only better....
r2112 (archive,
[('', 'no-decode', None, _('do not pass files through decoders')),
('p', 'prefix', '', _('directory prefix for files in archive')),
('r', 'rev', '', _('revision to distribute')),
('t', 'type', '', _('type of distribution to create')),
Benoit Boissinot
factor opts: walk options
r3188 ] + walkopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... DEST')),
Thomas Arendsen Hein
Small cleanups to backout command:...
r2159 "backout":
Vadim Gelfer
add backout command....
r2158 (backout,
Thomas Arendsen Hein
Small cleanups to backout command:...
r2159 [('', 'merge', None,
_('merge with old dirstate parent after backout')),
Vadim Gelfer
backout: allow backout of merge changeset with --parent option....
r2614 ('', 'parent', '', _('parent to choose when backing out merge')),
Daniel Holth
accept -r REV in more places...
r4450 ('r', 'rev', '', _('revision to backout')),
Benoit Boissinot
refactor options from cmdtable...
r5147 ] + walkopts + commitopts + commitopts2,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... [-r] REV')),
Thomas Arendsen Hein
realign commands table
r5778 "bisect":
(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')),
Martin Geisler
lowercase help output...
r7598 ('c', 'command', '', _('use command to check changeset state')),
Thomas Arendsen Hein
realign commands table
r5778 ('U', 'noupdate', False, _('do not update to target'))],
timeless@mozdev.org
commands: add missing options in command line help
r9952 _("[-gbsr] [-U] [-c CMD] [REV]")),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 "branch":
(branch,
[('f', 'force', None,
Sune Foldager
branch: added more support for named branches...
r7006 _('set branch name even if it shadows an existing branch')),
('C', 'clean', None, _('reset branch name to parent branch name'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-fC] [NAME]')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 "branches":
(branches,
[('a', 'active', False,
Matt Mackall
branches: add --closed flag for consistency with heads
r8991 _('show only branches that have unmerged heads')),
('c', 'closed', False,
Matt Mackall
heads: more clarity for --closed
r9189 _('show normal and closed branches'))],
timeless@mozdev.org
commands: add missing options in command line help
r9952 _('[-ac]')),
mpm@selenic.com
Add preliminary support for the bundle and unbundle commands
r1218 "bundle":
(bundle,
Vadim Gelfer
add -f/--force to pull, incoming, outgoing, to work on unrelated repo....
r1959 [('f', 'force', None,
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('run even when the destination is unrelated')),
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284 ('r', 'rev', [],
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('a changeset intended to be added to the destination')),
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 ('b', 'branch', [],
_('a specific branch you would like to bundle')),
Benoit Boissinot
add -r/--rev and --base option to bundle...
r3284 ('', 'base', [],
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('a base changeset assumed to be available at the destination')),
Benoit Allard
add compression type type parameter to bundle command
r6570 ('a', 'all', None, _('bundle all changesets in the repository')),
('t', 'type', 'bzip2', _('bundle compression type to use')),
Benoit Boissinot
add remoteopts to bundle command
r3191 ] + remoteopts,
timeless@mozdev.org
commands: add missing options in command line help
r9952 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "cat":
(cat,
Thomas Arendsen Hein
Updated help synopsises and reordered some options. Dropped [-n] from revert.
r1816 [('o', 'output', '', _('print output to file with formatted name')),
('r', 'rev', '', _('print the given revision')),
Thomas Arendsen Hein
cat --decode: Drop short option, use opts.get() instead of opts[]...
r6094 ('', 'decode', None, _('apply any matching decode filter')),
Benoit Boissinot
factor opts: walk options
r3188 ] + walkopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... FILE...')),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "^clone":
(clone,
Dirkjan Ochtman
improve help text for clone -U
r6625 [('U', 'noupdate', None,
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('the clone will include an empty working copy (only a repository)')),
Adrian Buehlmann
clone: add option -u/--updaterev
r9714 ('u', 'updaterev', '',
_('revision, tag or branch to check out')),
Muli Ben-Yehuda
strictly adher to 80 chars per line
r1602 ('r', 'rev', [],
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('include the specified changeset')),
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 ('b', 'branch', [],
_('clone only the specified branch')),
Thomas Arendsen Hein
Updated help synopsises and reordered some options. Dropped [-n] from revert.
r1816 ('', 'pull', None, _('use pull protocol to copy metadata')),
Vadim Gelfer
clone: change name of --stream to --uncompressed....
r2620 ('', 'uncompressed', None,
_('use uncompressed transfer (fast over LAN)')),
Benoit Boissinot
factor opts: remote repo access options
r3190 ] + remoteopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... SOURCE [DEST]')),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "^commit|ci":
(commit,
Thomas Arendsen Hein
Add debugaddremove alias to addremove, so it doesn't show up in 'hg help'....
r2184 [('A', 'addremove', None,
_('mark new/missing files as added/removed before committing')),
John Mulligan
branch closing: mark closed branches with a 'close' extra...
r7655 ('', 'close-branch', None,
_('mark a branch as closed, hiding it from the branch list')),
Benoit Boissinot
refactor options from cmdtable...
r5147 ] + walkopts + commitopts + commitopts2,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... [FILE]...')),
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 "copy|cp":
(copy,
Thomas Arendsen Hein
Updated help synopsises and reordered some options. Dropped [-n] from revert.
r1816 [('A', 'after', None, _('record a copy that has already occurred')),
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 ('f', 'force', None,
Thomas Arendsen Hein
Updated help synopsises and reordered some options. Dropped [-n] from revert.
r1816 _('forcibly copy over an existing managed file')),
Benoit Boissinot
factor opts: --dry-run option
r3189 ] + walkopts + dryrunopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... [SOURCE]... DEST')),
"debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
Matt Mackall
commands: fix missing empty synopses
r9604 "debugcheckstate": (debugcheckstate, [], ''),
Dirkjan Ochtman
add debugcommands command: an easy to parse command + option index
r7880 "debugcommands": (debugcommands, [], _('[COMMAND]')),
Alexis S. L. Carvalho
add --options to debugcomplete and change bash_completion to use it...
r2034 "debugcomplete":
(debugcomplete,
[('o', 'options', None, _('show the command options'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-o] CMD')),
Thomas Arendsen Hein
Sort commands table again and add some missing 'hg' in synopsises.
r5781 "debugdate":
(debugdate,
[('e', 'extended', None, _('try extended date formats'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-e] DATE [RANGE]')),
"debugdata": (debugdata, [], _('FILE REV')),
"debugfsinfo": (debugfsinfo, [], _('[PATH]')),
"debugindex": (debugindex, [], _('FILE')),
"debugindexdot": (debugindexdot, [], _('FILE')),
Matt Mackall
commands: fix missing empty synopses
r9604 "debuginstall": (debuginstall, [], ''),
Benoit Boissinot
add 'debugrebuildstate' to rebuild the dirstate from a given revision...
r1755 "debugrebuildstate":
(debugrebuildstate,
Thomas Arendsen Hein
Updated help synopsises and reordered some options. Dropped [-n] from revert.
r1816 [('r', 'rev', '', _('revision to rebuild to'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-r REV] [REV]')),
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 "debugrename":
(debugrename,
[('r', 'rev', '', _('revision to debug'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-r REV] FILE')),
Thomas Arendsen Hein
Sort commands table again and add some missing 'hg' in synopsises.
r5781 "debugsetparents":
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 (debugsetparents, [], _('REV1 [REV2]')),
Alexis S. L. Carvalho
debugstate: add --nodates...
r6296 "debugstate":
(debugstate,
[('', 'nodates', None, _('do not display the saved mtime'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]...')),
Matt Mackall
subrepo: introduce basic state parsing
r8812 "debugsub":
(debugsub,
[('r', 'rev', '', _('revision to check'))],
_('[-r REV] [REV]')),
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "^diff":
(diff,
Stepan Koltsov
diff: add --change option to display single changeset diff (issue1420)
r7628 [('r', 'rev', [], _('revision')),
('c', 'change', '', _('change made by revision'))
Jason Orendorff
mq: qdiff: support all diffopts
r6668 ] + diffopts + diffopts2 + walkopts,
timeless
commands: mention diff -c
r10520 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "^export":
(export,
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 [('o', 'output', '', _('print output to file with formatted name')),
Alexander Solovyov
commands.export: accept -r option as revision specification...
r10015 ('', 'switch-parent', None, _('diff against the second parent')),
('r', 'rev', [], _('revisions to export')),
Jason Orendorff
mq: qdiff: support all diffopts
r6668 ] + diffopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... [-o OUTFILESPEC] REV...')),
Steve Losh
Add a forget command for easily untracking files....
r8902 "^forget":
(forget,
[] + walkopts,
_('[OPTION]... FILE...')),
Thomas Arendsen Hein
Cleanups to commands.py
r1065 "grep":
(grep,
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 [('0', 'print0', None, _('end fields with NUL')),
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 ('', 'all', None, _('print all revisions that match')),
Brendan Cully
grep: add --follow support.
r2870 ('f', 'follow', None,
Matt Mackall
many, many trivial check-code fixups
r10282 _('follow changeset history,'
' or file history across copies and renames')),
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ('i', 'ignore-case', None, _('ignore case when matching')),
Muli Ben-Yehuda
strictly adher to 80 chars per line
r1602 ('l', 'files-with-matches', None,
Martin Geisler
expand "rev" to "revision" in help texts
r8028 _('print only filenames and revisions that match')),
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 ('n', 'line-number', None, _('print matching line numbers')),
('r', 'rev', [], _('search in given revision range')),
Thomas Arendsen Hein
Make annotae/grep print short dates with -q/--quiet....
r6134 ('u', 'user', None, _('list the author (long with -v)')),
('d', 'date', None, _('list the date (short with -q)')),
Benoit Boissinot
factor opts: walk options
r3188 ] + walkopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... PATTERN [FILE]...')),
Thomas Arendsen Hein
Update online help of hg heads for new --branches option.
r905 "heads":
(heads,
Martin Geisler
upper-case command line meta variables
r8031 [('r', 'rev', '', _('show only heads which are descendants of REV')),
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 ('t', 'topo', False, _('show topological heads only')),
John Mulligan
branch closing: referencing open and closed branches/heads...
r7656 ('a', 'active', False,
Dirkjan Ochtman
commands: deprecate the heads -a option...
r10326 _('show active branchheads only [DEPRECATED]')),
John Mulligan
heads: show closed heads only when --closed is passed...
r8695 ('c', 'closed', False,
Matt Mackall
heads: more clarity for --closed
r9189 _('show normal and closed branch heads')),
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 ] + templateopts,
timeless@mozdev.org
commands: add missing options in command line help
r9952 _('[-ac] [-r STARTREV] [REV]...')),
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 "help": (help_, [], _('[TOPIC]')),
Matt Mackall
identify: accept a revision argument
r4665 "identify|id":
(identify,
Martin Geisler
expand "rev" to "revision" in help texts
r8028 [('r', 'rev', '', _('identify the specified revision')),
Matt Mackall
identify: add support for output flags
r4666 ('n', 'num', None, _('show local revision number')),
('i', 'id', None, _('show global revision id')),
('b', 'branch', None, _('show branch')),
('t', 'tags', None, _('show tags'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-nibt] [-r REV] [SOURCE]')),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "import|patch":
(import_,
Muli Ben-Yehuda
strictly adher to 80 chars per line
r1602 [('p', 'strip', 1,
Martin Geisler
commands: removed bad linebreak in import help
r8038 _('directory strip option for patch. This has the same '
Thomas Arendsen Hein
Use string literal concatenation for optlist and import -p option
r2125 'meaning as the corresponding patch option')),
Matt Mackall
Remove deprecated old-style branch support
r3876 ('b', 'base', '', _('base path')),
Muli Ben-Yehuda
strictly adher to 80 chars per line
r1602 ('f', 'force', None,
Brendan Cully
Add import --exact....
r4263 _('skip check for outstanding uncommitted changes')),
Matt Mackall
many, many trivial check-code fixups
r10282 ('', 'no-commit', None,
_("don't commit, just update the working directory")),
Brendan Cully
Add import --exact....
r4263 ('', 'exact', None,
Eric Hopper
Add --import-branch option to hg import to pull in branch information without --exact
r4592 _('apply patch to the nodes from which it was generated')),
('', 'import-branch', None,
Martin Geisler
commands: lower-case --import-branch help text
r8034 _('use any branch information in patch (implied by --exact)'))] +
Brendan Cully
import: add similarity option (issue295)
r7402 commitopts + commitopts2 + similarityopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... PATCH...')),
Thomas Arendsen Hein
realign commands table
r5778 "incoming|in":
(incoming,
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 [('f', 'force', None,
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('run even if remote repository is unrelated')),
Vadim Gelfer
let commands that show changesets use templates....
r1907 ('n', 'newest-first', None, _('show newest record first')),
Benoit Boissinot
incoming: add support for remote repo using bundlerepo
r1944 ('', 'bundle', '', _('file to store the bundles into')),
Benoit Boissinot
Make clear that for a changegroup '-r' pulls "up to" a revision...
r6304 ('r', 'rev', [],
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('a remote changeset intended to be added')),
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 ('b', 'branch', [],
_('a specific branch you would like to pull')),
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 ] + logopts + remoteopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-p] [-n] [-M] [-f] [-r REV]...'
Thomas Arendsen Hein
Added missing space in continued string.
r2544 ' [--bundle FILENAME] [SOURCE]')),
Thomas Arendsen Hein
Add ui method to set --ssh/--remotecmd, use it in init/clone/pull/push/in/out....
r2598 "^init":
Thomas Arendsen Hein
Corrected synopsis for many commands....
r3885 (init,
remoteopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-e CMD] [--remotecmd CMD] [DEST]')),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "locate":
(locate,
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 [('r', 'rev', '', _('search the repository as it is in REV')),
Muli Ben-Yehuda
strictly adher to 80 chars per line
r1602 ('0', 'print0', None,
_('end filenames with NUL, for use with xargs')),
('f', 'fullpath', None,
_('print complete paths from the filesystem root')),
Benoit Boissinot
factor opts: walk options
r3188 ] + walkopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... [PATTERN]...')),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "^log|history":
(log,
Matt Mackall
Remove deprecated old-style branch support
r3876 [('f', 'follow', None,
Matt Mackall
many, many trivial check-code fixups
r10282 _('follow changeset history,'
' or file history across copies and renames')),
Brendan Cully
Add log option --follow-first to follow only the first parent of...
r2784 ('', 'follow-first', None,
_('only follow the first parent of merge changesets')),
Martin Geisler
expand "rev" to "revision" in help texts
r8028 ('d', 'date', '', _('show revisions matching date spec')),
Brendan Cully
Show copies in hg log....
r3197 ('C', 'copies', None, _('show copied files')),
TK Soh
help: log --keyword is case-insensitive
r4324 ('k', 'keyword', [], _('do case-insensitive search for a keyword')),
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 ('r', 'rev', [], _('show the specified revision or range')),
Martin Geisler
expand "rev" to "revision" in help texts
r8028 ('', 'removed', None, _('include revisions where files were removed')),
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 ('m', 'only-merges', None, _('show only merges')),
Martin Geisler
expand "rev" to "revision" in help texts
r8028 ('u', 'user', [], _('revisions committed by user')),
Dustin Sallings
Option to log to only show changesets within a specified branch.
r6067 ('b', 'only-branch', [],
_('show only changesets within the given named branch')),
Matt Mackall
many, many trivial check-code fixups
r10282 ('P', 'prune', [],
_('do not display revision or any of its ancestors')),
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 ] + logopts + walkopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... [FILE]')),
Thomas Arendsen Hein
realign commands table
r5778 "manifest":
(manifest,
[('r', 'rev', '', _('revision to display'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-r REV]')),
Benoit Boissinot
various doc fixes...
r4014 "^merge":
Thomas Arendsen Hein
Don't allow --style and --template for hg update and hg merge....
r2044 (merge,
Daniel Holth
accept -r REV in more places...
r4450 [('f', 'force', None, _('force a merge with outstanding changes')),
('r', 'rev', '', _('revision to merge')),
Dirkjan Ochtman
merge: rename -S/--show option to -P/--preview
r8834 ('P', 'preview', None,
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
r8387 _('review revisions to merge (no merge is performed)'))],
timeless@mozdev.org
commands: add missing options in command line help
r9952 _('[-P] [-f] [[-r] REV]')),
Thomas Arendsen Hein
realign commands table
r5778 "outgoing|out":
(outgoing,
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 [('f', 'force', None,
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('run even when the destination is unrelated')),
Benoit Boissinot
Make clear that for a changegroup '-r' pulls "up to" a revision...
r6304 ('r', 'rev', [],
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('a changeset intended to be included in the destination')),
Vadim Gelfer
let commands that show changesets use templates....
r1907 ('n', 'newest-first', None, _('show newest record first')),
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 ('b', 'branch', [],
_('a specific branch you would like to push')),
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 ] + logopts + remoteopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
Matt Mackall
Remove parents from default help in favor of summary
r9606 "parents":
Benoit Boissinot
add a -b/--branch option to 'hg parents'
r1724 (parents,
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 [('r', 'rev', '', _('show parents of the specified revision')),
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 ] + templateopts,
Ori Avtalion
commands: standardize parents command meta data
r8544 _('[-r REV] [FILE]')),
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 "paths": (paths, [], _('[NAME]')),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "^pull":
(pull,
Muli Ben-Yehuda
strictly adher to 80 chars per line
r1602 [('u', 'update', None,
Greg Ward
commands: fix help string for pull -u and unbundle -u....
r10210 _('update to new branch head if changesets were pulled')),
Vadim Gelfer
add -f/--force to pull, incoming, outgoing, to work on unrelated repo....
r1959 ('f', 'force', None,
_('run even when remote repository is unrelated')),
Thomas Arendsen Hein
Corrected synopsis for many commands....
r3885 ('r', 'rev', [],
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('a remote changeset intended to be added')),
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 ('b', 'branch', [],
_('a specific branch you would like to pull')),
Benoit Boissinot
factor opts: remote repo access options
r3190 ] + remoteopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
mpm@selenic.com
Actually implement the -f switch for push
r818 "^push":
(push,
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 [('f', 'force', None, _('force push')),
Benoit Boissinot
Make clear that for a changegroup '-r' pulls "up to" a revision...
r6304 ('r', 'rev', [],
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 _('a changeset intended to be included in the destination')),
Sune Foldager
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
r10379 ('b', 'branch', [],
_('a specific branch you would like to push')),
Benoit Boissinot
factor opts: remote repo access options
r3190 ] + remoteopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
"recover": (recover, []),
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 "^remove|rm":
(remove,
Dirkjan Ochtman
improved semantics for remove (issue438)...
r6346 [('A', 'after', None, _('record delete for missing files')),
('f', 'force', None,
Dirkjan Ochtman
tiny tab cleanup
r6347 _('remove (and delete) file even if added or modified')),
Benoit Boissinot
factor opts: walk options
r3188 ] + walkopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... FILE...')),
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 "rename|mv":
(rename,
Thomas Arendsen Hein
Updated help synopsises and reordered some options. Dropped [-n] from revert.
r1816 [('A', 'after', None, _('record a rename that has already occurred')),
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 ('f', 'force', None,
Thomas Arendsen Hein
Updated help synopsises and reordered some options. Dropped [-n] from revert.
r1816 _('forcibly copy over an existing managed file')),
Benoit Boissinot
factor opts: --dry-run option
r3189 ] + walkopts + dryrunopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... SOURCE... DEST')),
Matt Mackall
resolve: new command...
r6518 "resolve":
(resolve,
timeless@mozdev.org
hg help resolve grossly mischaracterizes the --all switch
r9747 [('a', 'all', None, _('select all unresolved files')),
Matt Mackall
resolve: require -a switch to resolve all files...
r7527 ('l', 'list', None, _('list state of files needing merge')),
Matt Mackall
resolve: new command...
r6518 ('m', 'mark', None, _('mark files as resolved')),
timeless
commands: adding --no-status to resolve to match status
r9646 ('u', 'unmark', None, _('unmark files as resolved')),
('n', 'no-status', None, _('hide status prefix'))]
Simon Heimberg
resolve: accepts walkopts (-I and -X)
r7765 + walkopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... [FILE]...')),
Matt Mackall
imported patch rev-help
r5574 "revert":
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 (revert,
Vadim Gelfer
revert: add -a as alias for --all
r2983 [('a', 'all', None, _('revert all changes when no arguments given')),
Matt Mackall
Add --date support to update and revert...
r3814 ('d', 'date', '', _('tipmost revision matching date')),
timeless@mozdev.org
commands: Try to improve help options text for basic commands...
r10375 ('r', 'rev', '', _('revert to the specified revision')),
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029 ('', 'no-backup', None, _('do not save backup copies of files')),
Benoit Boissinot
factor opts: --dry-run option
r3189 ] + walkopts + dryrunopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... [-r REV] [NAME]...')),
"rollback": (rollback, []),
"root": (root, []),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "^serve":
(serve,
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 [('A', 'accesslog', '', _('name of access log file to write to')),
Vadim Gelfer
add --daemon option to serve command. for issue 45....
r1740 ('d', 'daemon', None, _('run server in background')),
Thomas Arendsen Hein
Added help string for --daemon-pipefds
r1742 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
Benoit Boissinot
import docstring from doc/hg.1.txt
r1437 ('E', 'errorlog', '', _('name of error log file to write to')),
Stephen Deasey
hgweb: clarify which address and port can/cannot be bound at startup (bug 769)...
r6262 ('p', 'port', 0, _('port to listen on (default: 8000)')),
Matt Mackall
many, many trivial check-code fixups
r10282 ('a', 'address', '',
_('address to listen on (default: all interfaces)')),
('', 'prefix', '',
_('prefix path to serve from (default: server root)')),
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 ('n', 'name', '',
Martin Geisler
expand "dir" to "directory" in help texts
r8026 _('name to show in web pages (default: working directory)')),
Alexander Schremmer <alex AT alexanderweb DOT de>
Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf.
r2124 ('', 'webdir-conf', '', _('name of the webdir config file'
Martin Geisler
expand "repo" to "repository" in help texts
r8027 ' (serve more than one repository)')),
Vadim Gelfer
add --daemon option to serve command. for issue 45....
r1740 ('', 'pid-file', '', _('name of file to write process ID to')),
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ('', 'stdio', None, _('for remote clients')),
Thomas Arendsen Hein
Cleanup of indentation, spacing, newlines, strings and line length
r1615 ('t', 'templates', '', _('web templates to use')),
('', 'style', '', _('template style to use')),
Brendan Cully
Add SSL support to hg serve, activated via --certificate option
r4860 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
('', 'certificate', '', _('SSL certificate file'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]...')),
Thomas Arendsen Hein
Sort commands table again and add some missing 'hg' in synopsises.
r5781 "showconfig|debugconfig":
(showconfig,
[('u', 'untrusted', None, _('show untrusted configuration options'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-u] [NAME]...')),
Matt Mackall
Introduce summary command
r9603 "^summary|sum":
Matt Mackall
summary: add --remote
r9620 (summary,
Matt Mackall
summary: remove reference to -p
r9625 [('', 'remote', None, _('check for push and pull'))], '[--remote]'),
Matt Mackall
Add explicit 'st' alias for status
r1507 "^status|st":
tksoh@users.sourceforge.net
hg status: added options to select files by status....
r840 (status,
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661 [('A', 'all', None, _('show status of all files')),
('m', 'modified', None, _('show only modified files')),
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ('a', 'added', None, _('show only added files')),
('r', 'removed', None, _('show only removed files')),
Thomas Arendsen Hein
Distinguish removed and deleted files. Tests are not fixed yet....
r1619 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
Vadim Gelfer
status: add -c (clean) and -A (all files) options...
r2661 ('c', 'clean', None, _('show only files without changes')),
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
Thomas Arendsen Hein
Fix help text for hg status -i
r4156 ('i', 'ignored', None, _('show only ignored files')),
Benoit Boissinot
i18n part2: use '_' for all strings who are part of the user interface
r1402 ('n', 'no-status', None, _('hide status prefix')),
Brendan Cully
Add an option '-C|--copies' to hg status to show the source of copied files....
r2639 ('C', 'copies', None, _('show source of copied files')),
Muli Ben-Yehuda
strictly adher to 80 chars per line
r1602 ('0', 'print0', None,
_('end filenames with NUL, for use with xargs')),
Brendan Cully
Add --rev option to status
r3467 ('', 'rev', [], _('show difference from revision')),
Gilles Moris
status: add the --change option to display files changed in a revision...
r10014 ('', 'change', '', _('list the changed files of a revision')),
Benoit Boissinot
factor opts: walk options
r3188 ] + walkopts,
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[OPTION]... [FILE]...')),
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 "tag":
(tag,
Matt Mackall
tags: require -f to replace an existing tag...
r4267 [('f', 'force', None, _('replace existing tag')),
('l', 'local', None, _('make the tag local')),
Matt Mackall
tags: add --remove
r4213 ('r', 'rev', '', _('revision to tag')),
Benoit Boissinot
refactor options from cmdtable...
r5147 ('', 'remove', None, _('remove a tag')),
# -l/--local is already there, commitopts cannot be used
('m', 'message', '', _('use <text> as commit message')),
] + commitopts2,
timeless@mozdev.org
commands: add missing options in command line help
r9952 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
Matt Mackall
commands: fix missing empty synopses
r9604 "tags": (tags, [], ''),
Thomas Arendsen Hein
Add option -b/--branch to hg tip (as done for hg parents).
r1762 "tip":
(tip,
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 [('p', 'patch', None, _('show patch')),
Jim Correia
log-like commands now use -G for --graph, -g for --git
r7763 ('g', 'git', None, _('use git extended diff format')),
Thomas Arendsen Hein
Introduce templateopts and logopts to reduce duplicate option definitions.
r6192 ] + templateopts,
timeless@mozdev.org
commands: add missing options in command line help
r9952 _('[-p] [-g]')),
mpm@selenic.com
Add preliminary support for the bundle and unbundle commands
r1218 "unbundle":
(unbundle,
Matt Mackall
Error handling for unbundle, fix option line wrapping
r1601 [('u', 'update', None,
Greg Ward
commands: fix help string for pull -u and unbundle -u....
r10210 _('update to new branch head if changesets were unbundled'))],
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 _('[-u] FILE...')),
mpm@selenic.com
Shorten help...
r593 "^update|up|checkout|co":
Thomas Arendsen Hein
Multiple cleanups of things detected by pylint....
r697 (update,
Stuart W Marks
help: describe new cross-branch behavior in update help text, plus cleanups
r9718 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
Matt Mackall
update: add --check option
r8855 ('c', 'check', None, _('check for uncommitted changes')),
Daniel Holth
accept -r REV in more places...
r4450 ('d', 'date', '', _('tipmost revision matching date')),
('r', 'rev', '', _('revision'))],
Stuart W Marks
help: describe new cross-branch behavior in update help text, plus cleanups
r9718 _('[-c] [-C] [-d DATE] [[-r] REV]')),
Matt Mackall
help: remove redundant 'hg <command>' from command synopses
r7364 "verify": (verify, []),
"version": (version_, []),
Thomas Arendsen Hein
Sort global options by topic: directories, ui, timing, other...
r1046 }
mpm@selenic.com
Beginning of new command parsing interface...
r209
Dirkjan Ochtman
add debugcommands command: an easy to parse command + option index
r7880 norepo = ("clone init version help debugcommands debugcomplete debugdata"
Matt Mackall
add debugfsinfo to check fs capabilities
r5741 " debugindex debugindexdot debugdate debuginstall debugfsinfo")
Thomas Arendsen Hein
Make hg debugancestor accept -R by making it an optionalrepo command.
r6189 optionalrepo = ("identify paths serve showconfig debugancestor")