--- a/Makefile Mon Oct 05 22:01:08 2009 +0200
+++ b/Makefile Mon Oct 05 22:17:39 2009 +0200
@@ -79,16 +79,16 @@
update-pot: i18n/hg.pot
-i18n/hg.pot: $(PYTHON_FILES)
+i18n/hg.pot: $(PYTHON_FILES) help/*.txt
$(PYTHON) i18n/hggettext mercurial/commands.py \
- hgext/*.py hgext/*/__init__.py > i18n/hg.pot
+ hgext/*.py hgext/*/__init__.py help/*.txt > i18n/hg.pot
# All strings marked for translation in Mercurial contain
# ASCII characters only. But some files contain string
# literals like this '\037\213'. xgettext thinks it has to
# parse them even though they are not marked for translation.
# Extracting with an explicit encoding of ISO-8859-1 will make
# xgettext "parse" and ignore them.
- echo $^ | xargs \
+ echo $(PYTHON_FILES) | xargs \
xgettext --package-name "Mercurial" \
--msgid-bugs-address "<mercurial-devel@selenic.com>" \
--copyright-holder "Matt Mackall <mpm@selenic.com> and others" \
--- a/contrib/bash_completion Mon Oct 05 22:01:08 2009 +0200
+++ b/contrib/bash_completion Mon Oct 05 22:17:39 2009 +0200
@@ -530,3 +530,20 @@
return
}
+# shelve
+_hg_shelves()
+{
+ local shelves="$("$hg" unshelve -l . 2>/dev/null)"
+ local IFS=$'\n'
+ COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$shelves' -- "$cur"))
+}
+
+_hg_cmd_shelve()
+{
+ _hg_status "mard"
+}
+
+_hg_cmd_unshelve()
+{
+ _hg_shelves
+}
--- a/contrib/hgdiff Mon Oct 05 22:01:08 2009 +0200
+++ b/contrib/hgdiff Mon Oct 05 22:17:39 2009 +0200
@@ -38,13 +38,13 @@
def diff_files(file1, file2):
if file1 is None:
- b = file(file2).read().splitlines(1)
+ b = file(file2).read().splitlines(True)
l1 = "--- %s\n" % (file2)
l2 = "+++ %s\n" % (file2)
l3 = "@@ -0,0 +1,%d @@\n" % len(b)
l = [l1, l2, l3] + ["+" + e for e in b]
elif file2 is None:
- a = file(file1).read().splitlines(1)
+ a = file(file1).read().splitlines(True)
l1 = "--- %s\n" % (file1)
l2 = "+++ %s\n" % (file1)
l3 = "@@ -1,%d +0,0 @@\n" % len(a)
@@ -52,8 +52,8 @@
else:
t1 = file(file1).read()
t2 = file(file2).read()
- l1 = t1.splitlines(1)
- l2 = t2.splitlines(1)
+ l1 = t1.splitlines(True)
+ l2 = t2.splitlines(True)
if options.difflib:
l = difflib.unified_diff(l1, l2, file1, file2)
else:
--- a/contrib/perf.py Mon Oct 05 22:01:08 2009 +0200
+++ b/contrib/perf.py Mon Oct 05 22:17:39 2009 +0200
@@ -51,7 +51,7 @@
def t():
repo.changelog = mercurial.changelog.changelog(repo.sopener)
repo.manifest = mercurial.manifest.manifest(repo.sopener)
- repo.tagscache = None
+ repo._tags = None
return len(repo.tags())
timer(t)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/shrink-revlog.py Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,218 @@
+#!/usr/bin/env python
+
+"""\
+Reorder a revlog (by default the the manifest file in the current
+repository) to save space. Specifically, this topologically sorts the
+revisions in the revlog so that revisions on the same branch are adjacent
+as much as possible. This is a workaround for the fact that Mercurial
+computes deltas relative to the previous revision rather than relative to a
+parent revision. This is *not* safe to run on a changelog.
+"""
+
+# Originally written by Benoit Boissinot <benoit.boissinot at ens-lyon.org>
+# as a patch to rewrite-log. Cleaned up, refactored, documented, and
+# renamed by Greg Ward <greg at gerg.ca>.
+
+# XXX would be nice to have a way to verify the repository after shrinking,
+# e.g. by comparing "before" and "after" states of random changesets
+# (maybe: export before, shrink, export after, diff).
+
+import sys, os, tempfile
+import optparse
+from mercurial import ui as ui_, hg, revlog, transaction, node, util
+
+def toposort(rl):
+ write = sys.stdout.write
+
+ children = {}
+ root = []
+ # build children and roots
+ write('reading %d revs ' % len(rl))
+ try:
+ for i in rl:
+ children[i] = []
+ parents = [p for p in rl.parentrevs(i) if p != node.nullrev]
+ # in case of duplicate parents
+ if len(parents) == 2 and parents[0] == parents[1]:
+ del parents[1]
+ for p in parents:
+ assert p in children
+ children[p].append(i)
+
+ if len(parents) == 0:
+ root.append(i)
+
+ if i % 1000 == 0:
+ write('.')
+ finally:
+ write('\n')
+
+ # XXX this is a reimplementation of the 'branchsort' topo sort
+ # algorithm in hgext.convert.convcmd... would be nice not to duplicate
+ # the algorithm
+ write('sorting ...')
+ visit = root
+ ret = []
+ while visit:
+ i = visit.pop(0)
+ ret.append(i)
+ if i not in children:
+ # This only happens if some node's p1 == p2, which can
+ # happen in the manifest in certain circumstances.
+ continue
+ next = []
+ for c in children.pop(i):
+ parents_unseen = [p for p in rl.parentrevs(c)
+ if p != node.nullrev and p in children]
+ if len(parents_unseen) == 0:
+ next.append(c)
+ visit = next + visit
+ write('\n')
+ return ret
+
+def writerevs(r1, r2, order, tr):
+ write = sys.stdout.write
+ write('writing %d revs ' % len(order))
+ try:
+ count = 0
+ for rev in order:
+ n = r1.node(rev)
+ p1, p2 = r1.parents(n)
+ l = r1.linkrev(rev)
+ t = r1.revision(n)
+ n2 = r2.addrevision(t, tr, l, p1, p2)
+
+ if count % 1000 == 0:
+ write('.')
+ count += 1
+ finally:
+ write('\n')
+
+def report(olddatafn, newdatafn):
+ oldsize = float(os.stat(olddatafn).st_size)
+ newsize = float(os.stat(newdatafn).st_size)
+
+ # argh: have to pass an int to %d, because a float >= 2^32
+ # blows up under Python 2.5 or earlier
+ sys.stdout.write('old file size: %12d bytes (%6.1f MiB)\n'
+ % (int(oldsize), oldsize/1024/1024))
+ sys.stdout.write('new file size: %12d bytes (%6.1f MiB)\n'
+ % (int(newsize), newsize/1024/1024))
+
+ shrink_percent = (oldsize - newsize) / oldsize * 100
+ shrink_factor = oldsize / newsize
+ sys.stdout.write('shrinkage: %.1f%% (%.1fx)\n'
+ % (shrink_percent, shrink_factor))
+
+def main():
+
+ # Unbuffer stdout for nice progress output.
+ sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
+ write = sys.stdout.write
+
+ parser = optparse.OptionParser(description=__doc__)
+ parser.add_option('-R', '--repository',
+ default=os.path.curdir,
+ metavar='REPO',
+ help='repository root directory [default: current dir]')
+ parser.add_option('--revlog',
+ metavar='FILE',
+ help='shrink FILE [default: REPO/hg/store/00manifest.i]')
+ (options, args) = parser.parse_args()
+ if args:
+ parser.error('too many arguments')
+
+ # Open the specified repository.
+ ui = ui_.ui()
+ repo = hg.repository(ui, options.repository)
+ if not repo.local():
+ parser.error('not a local repository: %s' % options.repository)
+
+ if options.revlog is None:
+ indexfn = repo.sjoin('00manifest.i')
+ else:
+ if not options.revlog.endswith('.i'):
+ parser.error('--revlog option must specify the revlog index file '
+ '(*.i), not %s' % options.revlog)
+
+ indexfn = os.path.realpath(options.revlog)
+ store = repo.sjoin('')
+ if not indexfn.startswith(store):
+ parser.error('--revlog option must specify a revlog in %s, not %s'
+ % (store, indexfn))
+
+ datafn = indexfn[:-2] + '.d'
+ if not os.path.exists(indexfn):
+ parser.error('no such file: %s' % indexfn)
+ if '00changelog' in indexfn:
+ parser.error('shrinking the changelog will corrupt your repository')
+ if not os.path.exists(datafn):
+ # This is just a lazy shortcut because I can't be bothered to
+ # handle all the special cases that entail from no .d file.
+ parser.error('%s does not exist: revlog not big enough '
+ 'to be worth shrinking' % datafn)
+
+ oldindexfn = indexfn + '.old'
+ olddatafn = datafn + '.old'
+ if os.path.exists(oldindexfn) or os.path.exists(olddatafn):
+ parser.error('one or both of\n'
+ ' %s\n'
+ ' %s\n'
+ 'exists from a previous run; please clean up before '
+ 'running again'
+ % (oldindexfn, olddatafn))
+
+ write('shrinking %s\n' % indexfn)
+ prefix = os.path.basename(indexfn)[:-1]
+ (tmpfd, tmpindexfn) = tempfile.mkstemp(dir=os.path.dirname(indexfn),
+ prefix=prefix,
+ suffix='.i')
+ tmpdatafn = tmpindexfn[:-2] + '.d'
+ os.close(tmpfd)
+
+ r1 = revlog.revlog(util.opener(os.getcwd(), audit=False), indexfn)
+ r2 = revlog.revlog(util.opener(os.getcwd(), audit=False), tmpindexfn)
+
+ # Don't use repo.transaction(), because then things get hairy with
+ # paths: some need to be relative to .hg, and some need to be
+ # absolute. Doing it this way keeps things simple: everything is an
+ # absolute path.
+ lock = repo.lock(wait=False)
+ tr = transaction.transaction(sys.stderr.write,
+ open,
+ repo.sjoin('journal'))
+
+ try:
+ try:
+ order = toposort(r1)
+ writerevs(r1, r2, order, tr)
+ report(datafn, tmpdatafn)
+ tr.close()
+ except:
+ # Abort transaction first, so we truncate the files before
+ # deleting them.
+ tr.abort()
+ if os.path.exists(tmpindexfn):
+ os.unlink(tmpindexfn)
+ if os.path.exists(tmpdatafn):
+ os.unlink(tmpdatafn)
+ raise
+ finally:
+ lock.release()
+
+ os.link(indexfn, oldindexfn)
+ os.link(datafn, olddatafn)
+ os.rename(tmpindexfn, indexfn)
+ os.rename(tmpdatafn, datafn)
+ write('note: old revlog saved in:\n'
+ ' %s\n'
+ ' %s\n'
+ '(You can delete those files when you are satisfied that your\n'
+ 'repository is still sane. '
+ 'Running \'hg verify\' is strongly recommended.)\n'
+ % (oldindexfn, olddatafn))
+
+try:
+ main()
+except KeyboardInterrupt:
+ sys.exit("interrupted")
--- a/contrib/win32/mercurial.ini Mon Oct 05 22:01:08 2009 +0200
+++ b/contrib/win32/mercurial.ini Mon Oct 05 22:17:39 2009 +0200
@@ -1,30 +1,71 @@
-; System-wide Mercurial config file. To override these settings on a
-; per-user basis, please edit the following file instead, where
-; USERNAME is your Windows user name:
-; C:\Documents and Settings\USERNAME\Mercurial.ini
+; System-wide Mercurial config file.
+;
+; !!! Do Not Edit This File !!!
+;
+; This file will be replaced by the installer on every upgrade.
+; Editing this file can cause strange side effects on Vista.
+;
+; http://bitbucket.org/tortoisehg/stable/issue/135
+;
+; To change settings you see in this file, override (or enable) them in
+; your user Mercurial.ini file, where USERNAME is your Windows user name:
+;
+; XP or older - C:\Documents and Settings\USERNAME\Mercurial.ini
+; Vista or later - C:\Users\USERNAME\Mercurial.ini
+
[ui]
+; editor used to enter commit logs, etc. Most text editors will work.
editor = notepad
; show changed files and be a bit more verbose if True
; verbose = True
-
+
; username data to appear in commits
; it usually takes the form: Joe User <joe.user@host.com>
; username = Joe User <j.user@example.com>
-
-; By default, we try to encode and decode all files that do not
-; contain ASCII NUL characters. What this means is that we try to set
-; line endings to Windows style on update, and to Unix style on
-; commit. This lets us cooperate with Linux and Unix users, so
-; everybody sees files with their native line endings.
+; In order to push/pull over ssh you must specify an ssh tool
+;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2
+;ssh = C:\cygwin\bin\ssh
+;
+; For more information about mercurial extensions, start here
+; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions
+;
+; Extensions shipped with Mercurial
+;
[extensions]
-; The win32text extension is available and installed by default. It
-; provides built-in Python hooks to perform line ending conversions.
-; This is normally much faster than running an external program.
-hgext.win32text =
+;acl =
+;alias =
+;bookmarks =
+;bugzilla =
+;children =
+;churn =
+;color =
+;convert =
+;extdiff =
+;fetch =
+;gpg =
+;graphlog =
+;hgcia =
+;hgk =
+;highlight =
+;interhg =
+;keyword =
+;mq =
+;notify =
+;pager =
+;parentrevspec =
+;patchbomb =
+;purge =
+;rebase =
+;record =
+;transplant =
+;win32mbcs =
+;win32text =
+;zeroconf =
+; To use cleverencode/cleverdecode, you must enable win32text extension
[encode]
; Encode files that don't contain NUL characters.
@@ -44,10 +85,40 @@
; Alternatively, you can explicitly specify each file extension that
; you want decoded (any you omit will be left untouched), like this:
+
; **.txt = dumbdecode:
+
+[patch]
+; If you enable win32text filtering, you will want to enable this
+; line as well to allow patching to work correctly.
+
+; eol = crlf
+
+
+;
+; Define external diff commands
+;
+[extdiff]
+;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
+;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
+;cmd.vimdiff = gvim.exe
+;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)'
+
+
[hgk]
; Replace the following with your path to hgk, uncomment it and
-; install ActiveTcl (or another win32 port)
+; install ActiveTcl (or another win32 port like tclkit)
; path="C:\Program Files\Mercurial\Contrib\hgk.tcl"
+; vdiff=vdiff
+
+;
+; The git extended diff format can represent binary files, file
+; permission changes, and rename information that the normal patch format
+; cannot describe. However it is also not compatible with tools which
+; expect normal patches. so enable git patches at your own risk.
+;
+[diff]
+;git = false
+;nodates = false
--- a/contrib/win32/win32-build.txt Mon Oct 05 22:01:08 2009 +0200
+++ b/contrib/win32/win32-build.txt Mon Oct 05 22:17:39 2009 +0200
@@ -36,8 +36,8 @@
add_path (you need only add_path.exe in the zip file)
http://www.barisione.org/apps.html#add_path
- Asciidoc - optional
- http://www.methods.co.nz/asciidoc/
+ Docutils
+ http://docutils.sourceforge.net/
And, of course, Mercurial itself.
@@ -82,11 +82,16 @@
Microsoft.VC90.MFC.manifest)
Before building the installer, you have to build Mercurial HTML documentation
-(or fix mercurial.iss to not reference the doc directory). Assuming you have an
-"asciidoc.bat" batch file somewhere in your PATH:
+(or fix mercurial.iss to not reference the doc directory). Docutils does not
+come with a ready-made script for rst2html.py, so you will have to write your
+own and put it in %PATH% like:
+
+ @python c:\pythonXX\scripts\rst2html.py %*
+
+Then build the documentation with:
cd doc
- mingw32-make ASCIIDOC=asciidoc.bat html
+ mingw32-make RST2HTML=rst2html.bat html
cd ..
If you use ISTool, you open the C:\hg\hg-release\contrib\win32\mercurial.iss
@@ -108,7 +113,7 @@
echo compiler=mingw32 >> setup.cfg
python setup.py py2exe -b 1
cd doc
- mingw32-make ASCIIDOC=asciidoc.bat html
+ mingw32-make RST2HTML=rst2html.bat html
cd ..
iscc contrib\win32\mercurial.iss /DVERSION=snapshot
--- a/doc/Makefile Mon Oct 05 22:01:08 2009 +0200
+++ b/doc/Makefile Mon Oct 05 22:17:39 2009 +0200
@@ -5,7 +5,7 @@
MANDIR=$(PREFIX)/share/man
INSTALL=install -c -m 644
PYTHON=python
-ASCIIDOC=asciidoc
+RST2HTML=$(shell which rst2html 2> /dev/null || which rst2html.py)
all: man html
@@ -16,22 +16,19 @@
hg.1.txt: hg.1.gendoc.txt
touch hg.1.txt
-hg.1.gendoc.txt: ../mercurial/commands.py ../mercurial/help.py
- ${PYTHON} gendoc.py > $@
+hg.1.gendoc.txt: gendoc.py ../mercurial/commands.py ../mercurial/help.py
+ ${PYTHON} gendoc.py > $@.tmp
+ mv $@.tmp $@
-%: %.xml
- xmlto man $*.xml && \
- sed -e 's/^\.hg/\\\&.hg/' $* > $*~ && \
- mv $*~ $*
+%: %.txt common.txt
+ $(PYTHON) rst2man.py --halt warning \
+ --strip-elements-with-class htmlonly $*.txt $*
-%.xml: %.txt
- $(ASCIIDOC) -d manpage -b docbook $*.txt
-
-%.html: %.txt
- $(ASCIIDOC) -b html4 $*.txt || $(ASCIIDOC) -b html $*.txt
+%.html: %.txt common.txt
+ $(RST2HTML) --halt warning $*.txt $*.html
MANIFEST: man html
- # tracked files are already in the main MANIFEST
+# tracked files are already in the main MANIFEST
$(RM) $@
for i in $(MAN) $(HTML) hg.1.gendoc.txt; do \
echo "doc/$$i" >> $@ ; \
@@ -45,4 +42,4 @@
done
clean:
- $(RM) $(MAN) $(MAN:%=%.xml) $(MAN:%=%.html) *.[0-9].gendoc.txt MANIFEST
+ $(RM) $(MAN) $(MAN:%=%.html) *.[0-9].gendoc.txt MANIFEST
--- a/doc/README Mon Oct 05 22:01:08 2009 +0200
+++ b/doc/README Mon Oct 05 22:17:39 2009 +0200
@@ -1,23 +1,11 @@
-Mercurial's documentation is currently kept in ASCIIDOC format, which
-is a simple plain text format that's easy to read and edit. It's also
-convertible to a variety of other formats including standard UNIX man
-page format and HTML.
+Mercurial's documentation is kept in reStructuredText format, which is
+a simple plain text format that's easy to read and edit:
-To do this, you'll need to install ASCIIDOC:
-
- http://www.methods.co.nz/asciidoc/
-
-To generate the man page:
+ http://docutils.sourceforge.net/rst.html
- asciidoc -d manpage -b docbook hg.1.txt
- xmlto man hg.1.xml
-
-To display:
+It's also convertible to a variety of other formats including standard
+UNIX man page format and HTML. You'll need to install Docutils:
- groff -mandoc -Tascii hg.1 | more
-
-To create the html page (without stylesheets):
+ http://docutils.sourceforge.net/
- asciidoc -b html4 hg.1.txt
-
-(older asciidoc may want html instead of html4 above)
+Use the Makefile in this directory to generate the man and HTML pages.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/common.txt Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,8 @@
+.. Common link and substitution definitions.
+
+.. |hg(1)| replace:: **hg**\ (1)
+.. _hg(1): hg.1.html
+.. |hgrc(5)| replace:: **hgrc**\ (5)
+.. _hgrc(5): hgrc.5.html
+.. |hgignore(5)| replace:: **hgignore**\ (5)
+.. _hgignore(5): hgignore.5.html
--- a/doc/gendoc.py Mon Oct 05 22:01:08 2009 +0200
+++ b/doc/gendoc.py Mon Oct 05 22:17:39 2009 +0200
@@ -1,9 +1,10 @@
-import os, sys, textwrap
+import os, sys
# import from the live mercurial repo
sys.path.insert(0, "..")
# fall back to pure modules if required C extensions are not available
sys.path.append(os.path.join('..', 'mercurial', 'pure'))
from mercurial import demandimport; demandimport.enable()
+from mercurial import encoding
from mercurial.commands import table, globalopts
from mercurial.i18n import _
from mercurial.help import helptable
@@ -54,18 +55,18 @@
return d
def show_doc(ui):
- def bold(s, text=""):
- ui.write("%s\n%s\n%s\n" % (s, "="*len(s), text))
- def underlined(s, text=""):
- ui.write("%s\n%s\n%s\n" % (s, "-"*len(s), text))
+ def section(s):
+ ui.write("%s\n%s\n\n" % (s, "-" * encoding.colwidth(s)))
+ def subsection(s):
+ ui.write("%s\n%s\n\n" % (s, '"' * encoding.colwidth(s)))
# print options
- underlined(_("OPTIONS"))
+ section(_("OPTIONS"))
for optstr, desc in get_opts(globalopts):
- ui.write("%s::\n %s\n\n" % (optstr, desc))
+ ui.write("%s\n %s\n\n" % (optstr, desc))
# print cmds
- underlined(_("COMMANDS"))
+ section(_("COMMANDS"))
h = {}
for c, attr in table.items():
f = c.split("|")[0]
@@ -78,31 +79,32 @@
if f.startswith("debug"): continue
d = get_cmd(h[f])
# synopsis
- ui.write("[[%s]]\n" % d['cmd'])
- ui.write("%s::\n" % d['synopsis'].replace("hg ","", 1))
+ ui.write(".. _%s:\n\n" % d['cmd'])
+ ui.write("``%s``\n" % d['synopsis'].replace("hg ","", 1))
# description
ui.write("%s\n\n" % d['desc'][1])
# options
opt_output = list(d['opts'])
if opt_output:
opts_len = max([len(line[0]) for line in opt_output])
- ui.write(_(" options:\n"))
+ ui.write(_(" options:\n\n"))
for optstr, desc in opt_output:
if desc:
s = "%-*s %s" % (opts_len, optstr, desc)
else:
s = optstr
- s = textwrap.fill(s, initial_indent=4 * " ",
- subsequent_indent=(6 + opts_len) * " ")
- ui.write("%s\n" % s)
+ ui.write(" %s\n" % s)
ui.write("\n")
# aliases
if d['aliases']:
ui.write(_(" aliases: %s\n\n") % " ".join(d['aliases']))
# print topics
- for names, section, doc in helptable:
- underlined(section.upper())
+ for names, sec, doc in helptable:
+ for name in names:
+ ui.write(".. _%s:\n" % name)
+ ui.write("\n")
+ section(sec.upper())
if callable(doc):
doc = doc()
ui.write(doc)
--- a/doc/hg.1.txt Mon Oct 05 22:01:08 2009 +0200
+++ b/doc/hg.1.txt Mon Oct 05 22:17:39 2009 +0200
@@ -1,64 +1,74 @@
-HG(1)
-=====
-Matt Mackall <mpm@selenic.com>
-:man source: Mercurial
-:man manual: Mercurial Manual
+====
+ hg
+====
+
+---------------------------------------
+Mercurial source code management system
+---------------------------------------
-NAME
-----
-hg - Mercurial source code management system
+:Author: Matt Mackall <mpm@selenic.com>
+:Organization: Mercurial
+:Manual section: 1
+:Manual group: Mercurial Manual
+
+.. contents::
+ :backlinks: top
+ :class: htmlonly
+
SYNOPSIS
--------
-*hg* 'command' ['option']... ['argument']...
+**hg** *command* [*option*]... [*argument*]...
DESCRIPTION
-----------
-The *hg* command provides a command line interface to the Mercurial
+The **hg** command provides a command line interface to the Mercurial
system.
COMMAND ELEMENTS
----------------
-files ...::
+files...
indicates one or more filename or relative path filenames; see
"FILE NAME PATTERNS" for information on pattern matching
-path::
+path
indicates a path on the local machine
-revision::
+revision
indicates a changeset which can be specified as a changeset
revision number, a tag, or a unique substring of the changeset
hash value
-repository path::
+repository path
either the pathname of a local repository or the URI of a remote
repository.
-include::hg.1.gendoc.txt[]
+.. include:: hg.1.gendoc.txt
FILES
-----
- `.hgignore`::
+
+``.hgignore``
This file contains regular expressions (one per line) that
- describe file names that should be ignored by *hg*. For details,
- see *hgignore(5)*.
+ describe file names that should be ignored by **hg**. For details,
+ see |hgignore(5)|_.
- `.hgtags`::
+``.hgtags``
This file contains changeset hash values and text tag names (one
of each separated by spaces) that correspond to tagged versions of
the repository contents.
- `/etc/mercurial/hgrc`, `$HOME/.hgrc`, `.hg/hgrc`::
- This file contains defaults and configuration. Values in `.hg/hgrc`
- override those in `$HOME/.hgrc`, and these override settings made in
- the global `/etc/mercurial/hgrc` configuration. See *hgrc(5)* for
- details of the contents and format of these files.
+``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc``
+ This file contains defaults and configuration. Values in
+ ``.hg/hgrc`` override those in ``$HOME/.hgrc``, and these override
+ settings made in the global ``/etc/mercurial/hgrc`` configuration.
+ See |hgrc(5)|_ for details of the contents and format of these
+ files.
-Some commands (e.g. revert) produce backup files ending in `.orig`, if
-the `.orig` file already exists and is not tracked by Mercurial, it will
-be overwritten.
+Some commands (e.g. revert) produce backup files ending in ``.orig``,
+if the ``.orig`` file already exists and is not tracked by Mercurial,
+it will be overwritten.
BUGS
----
@@ -67,7 +77,7 @@
SEE ALSO
--------
-*hgignore(5)*, *hgrc(5)*
+|hgignore(5)|_, |hgrc(5)|_
AUTHOR
------
@@ -75,14 +85,16 @@
RESOURCES
---------
-http://mercurial.selenic.com/[Main Web Site]
+Main Web Site: http://mercurial.selenic.com/
-http://selenic.com/hg[Source code repository]
+Source code repository: http://selenic.com/hg
-http://selenic.com/mailman/listinfo/mercurial[Mailing list]
+Mailing list: http://selenic.com/mailman/listinfo/mercurial
COPYING
-------
Copyright \(C) 2005-2009 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
-Public License (GPL).
+Public License version 2.
+
+.. include:: common.txt
--- a/doc/hgignore.5.txt Mon Oct 05 22:01:08 2009 +0200
+++ b/doc/hgignore.5.txt Mon Oct 05 22:17:39 2009 +0200
@@ -1,17 +1,20 @@
-HGIGNORE(5)
-===========
-Vadim Gelfer <vadim.gelfer@gmail.com>
-:man source: Mercurial
-:man manual: Mercurial Manual
+==========
+ hgignore
+==========
-NAME
-----
-hgignore - syntax for Mercurial ignore files
+---------------------------------
+syntax for Mercurial ignore files
+---------------------------------
+
+:Author: Vadim Gelfer <vadim.gelfer@gmail.com>
+:Organization: Mercurial
+:Manual section: 5
+:Manual group: Mercurial Manual
SYNOPSIS
--------
-The Mercurial system uses a file called `.hgignore` in the root
+The Mercurial system uses a file called ``.hgignore`` in the root
directory of a repository to control its behavior when it searches
for files that it is not currently tracking.
@@ -21,61 +24,61 @@
The working directory of a Mercurial repository will often contain
files that should not be tracked by Mercurial. These include backup
files created by editors and build products created by compilers.
-These files can be ignored by listing them in a `.hgignore` file in
-the root of the working directory. The `.hgignore` file must be
+These files can be ignored by listing them in a ``.hgignore`` file in
+the root of the working directory. The ``.hgignore`` file must be
created manually. It is typically put under version control, so that
the settings will propagate to other repositories with push and pull.
An untracked file is ignored if its path relative to the repository
root directory, or any prefix path of that path, is matched against
-any pattern in `.hgignore`.
+any pattern in ``.hgignore``.
-For example, say we have an an untracked file, `file.c`, at
-`a/b/file.c` inside our repository. Mercurial will ignore `file.c` if
-any pattern in `.hgignore` matches `a/b/file.c`, `a/b` or `a`.
+For example, say we have an an untracked file, ``file.c``, at
+``a/b/file.c`` inside our repository. Mercurial will ignore ``file.c``
+if any pattern in ``.hgignore`` matches ``a/b/file.c``, ``a/b`` or ``a``.
In addition, a Mercurial configuration file can reference a set of
-per-user or global ignore files. See the hgrc(5) man page for details
+per-user or global ignore files. See the |hgrc(5)|_ man page for details
of how to configure these files. Look for the "ignore" entry in the
"ui" section.
To control Mercurial's handling of files that it manages, see the
-hg(1) man page. Look for the "-I" and "-X" options.
+|hg(1)|_ man page. Look for the "``-I``" and "``-X``" options.
SYNTAX
------
An ignore file is a plain text file consisting of a list of patterns,
-with one pattern per line. Empty lines are skipped. The "`#`"
-character is treated as a comment character, and the "`\`" character
+with one pattern per line. Empty lines are skipped. The "``#``"
+character is treated as a comment character, and the "``\``" character
is treated as an escape character.
Mercurial supports several pattern syntaxes. The default syntax used
is Python/Perl-style regular expressions.
-To change the syntax used, use a line of the following form:
+To change the syntax used, use a line of the following form::
-syntax: NAME
+ syntax: NAME
-where NAME is one of the following:
+where ``NAME`` is one of the following:
-regexp::
+``regexp``
Regular expression, Python/Perl syntax.
-glob::
+``glob``
Shell-style glob.
The chosen syntax stays in effect when parsing all patterns that
follow, until another syntax is selected.
Neither glob nor regexp patterns are rooted. A glob-syntax pattern of
-the form "`*.c`" will match a file ending in "`.c`" in any directory,
-and a regexp pattern of the form "`\.c$`" will do the same. To root a
-regexp pattern, start it with "`^`".
+the form "``*.c``" will match a file ending in "``.c``" in any directory,
+and a regexp pattern of the form "``\.c$``" will do the same. To root a
+regexp pattern, start it with "``^``".
EXAMPLE
-------
-Here is an example ignore file.
+Here is an example ignore file. ::
# use glob syntax.
syntax: glob
@@ -96,11 +99,13 @@
SEE ALSO
--------
-hg(1), hgrc(5)
+|hg(1)|_, |hgrc(5)|_
COPYING
-------
This manual page is copyright 2006 Vadim Gelfer.
Mercurial is copyright 2005-2009 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
-Public License (GPL).
+Public License version 2.
+
+.. include:: common.txt
--- a/doc/hgrc.5.txt Mon Oct 05 22:01:08 2009 +0200
+++ b/doc/hgrc.5.txt Mon Oct 05 22:17:39 2009 +0200
@@ -1,12 +1,20 @@
-HGRC(5)
-=======
-Bryan O'Sullivan <bos@serpentine.com>
-:man source: Mercurial
-:man manual: Mercurial Manual
+======
+ hgrc
+======
+
+---------------------------------
+configuration files for Mercurial
+---------------------------------
-NAME
-----
-hgrc - configuration files for Mercurial
+:Author: Bryan O'Sullivan <bos@serpentine.com>
+:Organization: Mercurial
+:Manual section: 5
+:Manual group: Mercurial Manual
+
+.. contents::
+ :backlinks: top
+ :class: htmlonly
+
SYNOPSIS
--------
@@ -19,51 +27,54 @@
Mercurial reads configuration data from several files, if they exist.
The names of these files depend on the system on which Mercurial is
-installed. `*.rc` files from a single directory are read in
+installed. ``*.rc`` files from a single directory are read in
alphabetical order, later ones overriding earlier ones. Where multiple
paths are given below, settings from later paths override earlier
ones.
-(Unix) `<install-root>/etc/mercurial/hgrc.d/*.rc`::
-(Unix) `<install-root>/etc/mercurial/hgrc`::
+| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``
+| (Unix) ``<install-root>/etc/mercurial/hgrc``
+
Per-installation configuration files, searched for in the
- directory where Mercurial is installed. `<install-root>` is the
- parent directory of the hg executable (or symlink) being run. For
- example, if installed in `/shared/tools/bin/hg`, Mercurial will look
- in `/shared/tools/etc/mercurial/hgrc`. Options in these files apply
+ directory where Mercurial is installed. ``<install-root>`` is the
+ parent directory of the **hg** executable (or symlink) being run. For
+ example, if installed in ``/shared/tools/bin/hg``, Mercurial will look
+ in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply
to all Mercurial commands executed by any user in any directory.
-(Unix) `/etc/mercurial/hgrc.d/*.rc`::
-(Unix) `/etc/mercurial/hgrc`::
+| (Unix) ``/etc/mercurial/hgrc.d/*.rc``
+| (Unix) ``/etc/mercurial/hgrc``
+
Per-system configuration files, for the system on which Mercurial
is running. Options in these files apply to all Mercurial commands
executed by any user in any directory. Options in these files
override per-installation options.
-(Windows) `<install-dir>\Mercurial.ini`::
- or else::
-(Windows) `HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`::
- or else::
-(Windows) `C:\Mercurial\Mercurial.ini`::
+| (Windows) ``<install-dir>\Mercurial.ini`` or else
+| (Windows) ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` or else
+| (Windows) ``C:\Mercurial\Mercurial.ini``
+
Per-installation/system configuration files, for the system on
which Mercurial is running. Options in these files apply to all
Mercurial commands executed by any user in any directory. Registry
keys contain PATH-like strings, every part of which must reference
- a `Mercurial.ini` file or be a directory where `*.rc` files will
+ a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
be read.
-(Unix) `$HOME/.hgrc`::
-(Windows) `%HOME%\Mercurial.ini`::
-(Windows) `%HOME%\.hgrc`::
-(Windows) `%USERPROFILE%\Mercurial.ini`::
-(Windows) `%USERPROFILE%\.hgrc`::
+| (Unix) ``$HOME/.hgrc``
+| (Windows) ``%HOME%\Mercurial.ini``
+| (Windows) ``%HOME%\.hgrc``
+| (Windows) ``%USERPROFILE%\Mercurial.ini``
+| (Windows) ``%USERPROFILE%\.hgrc``
+
Per-user configuration file(s), for the user running Mercurial. On
- Windows 9x, `%HOME%` is replaced by `%APPDATA%`. Options in these
+ Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these
files apply to all Mercurial commands executed by this user in any
directory. Options in these files override per-installation and
per-system options.
-(Unix, Windows) `<repo>/.hg/hgrc`::
+| (Unix, Windows) ``<repo>/.hg/hgrc``
+
Per-repository configuration options that only apply in a
particular repository. This file is not version-controlled, and
will not get transferred during a "clone" operation. Options in
@@ -75,8 +86,10 @@
SYNTAX
------
-A configuration file consists of sections, led by a "`[section]`" header
-and followed by "`name: value`" entries; "`name=value`" is also accepted.
+A configuration file consists of sections, led by a "``[section]``" header
+and followed by "``name: value``" entries; "``name=value``" is also accepted.
+
+::
[spam]
eggs=ham
@@ -88,15 +101,15 @@
Leading whitespace is removed from values. Empty lines are skipped.
-Lines beginning with "`#`" or "`;`" are ignored and may be used to provide
+Lines beginning with "``#``" or "``;``" are ignored and may be used to provide
comments.
-A line of the form "`%include file`" will include `file` into the
+A line of the form "``%include file``" will include ``file`` into the
current configuration file. The inclusion is recursive, which means
that included files can include other files. Filenames are relative to
-the configuration file in which the `%include` directive is found.
+the configuration file in which the ``%include`` directive is found.
-A line with "`%unset name`" will remove `name` from the current
+A line with "``%unset name``" will remove ``name`` from the current
section, if it has been set previously.
@@ -107,41 +120,39 @@
Mercurial "hgrc" file, the purpose of each section, its possible keys,
and their possible values.
-[[alias]]
-alias::
- Defines command aliases.
- Aliases allow you to define your own commands in terms of other
- commands (or aliases), optionally including arguments.
-+
---
-Alias definitions consist of lines of the form:
+``alias``
+"""""""""
+Defines command aliases.
+Aliases allow you to define your own commands in terms of other
+commands (or aliases), optionally including arguments.
+
+Alias definitions consist of lines of the form::
<alias> = <command> [<argument]...
-For example, this definition:
+For example, this definition::
latest = log --limit 5
-creates a new command `latest` that shows only the five most recent
-changesets. You can define subsequent aliases using earlier ones:
+creates a new command ``latest`` that shows only the five most recent
+changesets. You can define subsequent aliases using earlier ones::
stable5 = latest -b stable
NOTE: It is possible to create aliases with the same names as existing
commands, which will then override the original definitions. This is
almost always a bad idea!
---
+
-[[auth]]
-auth::
+``auth``
+""""""""
Authentication credentials for HTTP authentication. Each line has
-the following format:
+the following format::
<name>.<argument> = <value>
-+
---
+
where <name> is used to group arguments into authentication entries.
-Example:
+Example::
foo.prefix = hg.intevation.org/mercurial
foo.username = foo
@@ -155,26 +166,26 @@
Supported arguments:
- prefix;;
- Either "\*" or a URI prefix with or without the scheme part.
+``prefix``
+ Either "``*``" or a URI prefix with or without the scheme part.
The authentication entry with the longest matching prefix is used
- (where "*" matches everything and counts as a match of length
+ (where "``*``" matches everything and counts as a match of length
1). If the prefix doesn't include a scheme, the match is performed
against the URI with its scheme stripped as well, and the schemes
argument, q.v., is then subsequently consulted.
- username;;
+``username``
Optional. Username to authenticate with. If not given, and the
remote site requires basic or digest authentication, the user
will be prompted for it.
- password;;
+``password``
Optional. Password to authenticate with. If not given, and the
remote site requires basic or digest authentication, the user
will be prompted for it.
- key;;
+``key``
Optional. PEM encoded client certificate key file.
- cert;;
+``cert``
Optional. PEM encoded client certificate chain file.
- schemes;;
+``schemes``
Optional. Space separated list of URI schemes to use this
authentication entry with. Only used if the prefix doesn't include
a scheme. Supported schemes are http and https. They will match
@@ -183,20 +194,19 @@
If no suitable authentication entry is found, the user is prompted
for credentials as usual if required by the remote.
---
+
-[[decode]]
-decode/encode::
- Filters for transforming files on checkout/checkin. This would
- typically be used for newline processing or other
- localization/canonicalization of files.
-+
---
+``decode/encode``
+"""""""""""""""""
+Filters for transforming files on checkout/checkin. This would
+typically be used for newline processing or other
+localization/canonicalization of files.
+
Filters consist of a filter pattern followed by a filter command.
Filter patterns are globs by default, rooted at the repository root.
-For example, to match any file ending in "`.txt`" in the root
-directory only, use the pattern "\*.txt". To match any file ending
-in "`.c`" anywhere in the repository, use the pattern "**`.c`".
+For example, to match any file ending in "``.txt``" in the root
+directory only, use the pattern "``*.txt``". To match any file ending
+in "``.c``" anywhere in the repository, use the pattern "``**.c``".
The filter command can start with a specifier, either "pipe:" or
"tempfile:". If no specifier is given, "pipe:" is used by default.
@@ -204,7 +214,7 @@
A "pipe:" command must accept data on stdin and return the transformed
data on stdout.
-Pipe example:
+Pipe example::
[encode]
# uncompress gzip files on checkin to improve delta compression
@@ -227,7 +237,7 @@
effects and may corrupt the contents of your files.
The most common usage is for LF <-> CRLF translation on Windows. For
-this, use the "smart" converters which check for binary files:
+this, use the "smart" converters which check for binary files::
[extensions]
hgext.win32text =
@@ -236,7 +246,7 @@
[decode]
** = cleverdecode:
-or if you only want to translate certain files:
+or if you only want to translate certain files::
[extensions]
hgext.win32text =
@@ -244,16 +254,16 @@
**.txt = dumbencode:
[decode]
**.txt = dumbdecode:
---
+
+
+``defaults``
+""""""""""""
-[[defaults]]
-defaults::
- Use the [defaults] section to define command defaults, i.e. the
- default options/arguments to pass to the specified commands.
-+
---
+Use the [defaults] section to define command defaults, i.e. the
+default options/arguments to pass to the specified commands.
+
The following example makes 'hg log' run in verbose mode, and 'hg
-status' show only the modified files, by default.
+status' show only the modified files, by default::
[defaults]
log = -v
@@ -262,57 +272,59 @@
The actual commands, instead of their aliases, must be used when
defining command defaults. The command defaults will also be applied
to the aliases of the commands defined.
---
+
+
+``diff``
+""""""""
-[[diff]]
-diff::
- Settings used when displaying diffs. They are all Boolean and
- defaults to False.
- git;;
+Settings used when displaying diffs. They are all Boolean and
+defaults to False.
+
+``git``
Use git extended diff format.
- nodates;;
+``nodates``
Don't include dates in diff headers.
- showfunc;;
+``showfunc``
Show which function each change is in.
- ignorews;;
+``ignorews``
Ignore white space when comparing lines.
- ignorewsamount;;
+``ignorewsamount``
Ignore changes in the amount of white space.
- ignoreblanklines;;
+``ignoreblanklines``
Ignore changes whose lines are all blank.
-[[email]]
-email::
- Settings for extensions that send email messages.
- from;;
+``email``
+"""""""""
+Settings for extensions that send email messages.
+
+``from``
Optional. Email address to use in "From" header and SMTP envelope
of outgoing messages.
- to;;
+``to``
Optional. Comma-separated list of recipients' email addresses.
- cc;;
+``cc``
Optional. Comma-separated list of carbon copy recipients'
email addresses.
- bcc;;
+``bcc``
Optional. Comma-separated list of blind carbon copy recipients'
email addresses. Cannot be set interactively.
- method;;
+``method``
Optional. Method to use to send email messages. If value is "smtp"
(default), use SMTP (see section "[smtp]" for configuration).
Otherwise, use as name of program to run that acts like sendmail
(takes "-f" option for sender, list of recipients on command line,
message on stdin). Normally, setting this to "sendmail" or
"/usr/sbin/sendmail" is enough to use sendmail to send messages.
- charsets;;
+``charsets``
Optional. Comma-separated list of character sets considered
convenient for recipients. Addresses, headers, and parts not
containing patches of outgoing messages will be encoded in the
first character set to which conversion from local encoding
- (`$HGENCODING`, `ui.fallbackencoding`) succeeds. If correct
+ (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct
conversion fails, the text in question is sent as is. Defaults to
empty (explicit) list.
-+
---
-Order of outgoing email character sets:
+
+Order of outgoing email character sets::
us-ascii always first, regardless of settings
email.charsets in order given by user
@@ -320,7 +332,7 @@
$HGENCODING if not in email.charsets
utf-8 always last, regardless of settings
-Email example:
+Email example::
[email]
from = Joseph User <joe.user@example.com>
@@ -328,40 +340,40 @@
# charsets for western Europeans
# us-ascii, utf-8 omitted, as they are tried first and last
charsets = iso-8859-1, iso-8859-15, windows-1252
---
+
+
+``extensions``
+""""""""""""""
-[[extensions]]
-extensions::
- Mercurial has an extension mechanism for adding new features. To
- enable an extension, create an entry for it in this section.
-+
---
+Mercurial has an extension mechanism for adding new features. To
+enable an extension, create an entry for it in this section.
+
If you know that the extension is already in Python's search path,
-you can give the name of the module, followed by "`=`", with nothing
-after the "`=`".
+you can give the name of the module, followed by "``=``", with nothing
+after the "``=``".
-Otherwise, give a name that you choose, followed by "`=`", followed by
-the path to the "`.py`" file (including the file name extension) that
+Otherwise, give a name that you choose, followed by "``=``", followed by
+the path to the "``.py``" file (including the file name extension) that
defines the extension.
To explicitly disable an extension that is enabled in an hgrc of
-broader scope, prepend its path with "`!`", as in
-"`hgext.foo = !/ext/path`" or "`hgext.foo = !`" when path is not
+broader scope, prepend its path with "``!``", as in
+"``hgext.foo = !/ext/path``" or "``hgext.foo = !``" when path is not
supplied.
-Example for `~/.hgrc`:
+Example for ``~/.hgrc``::
[extensions]
# (the mq extension will get loaded from Mercurial's path)
hgext.mq =
# (this extension will get loaded from the file specified)
myfeature = ~/.hgext/myfeature.py
---
+
-[[format]]
-format::
+``format``
+""""""""""
- usestore;;
+``usestore``
Enable or disable the "store" repository format which improves
compatibility with systems that fold case or otherwise mangle
filenames. Enabled by default. Disabling this option will allow
@@ -369,7 +381,7 @@
compatibility and ensures that the on-disk format of newly created
repositories will be compatible with Mercurial before version 0.9.4.
- usefncache;;
+``usefncache``
Enable or disable the "fncache" repository format which enhances
the "store" repository format (which has to be enabled to use
fncache) to allow longer filenames and avoids using Windows
@@ -377,26 +389,27 @@
option ensures that the on-disk format of newly created
repositories will be compatible with Mercurial before version 1.1.
-[[merge-patterns]]
-merge-patterns::
- This section specifies merge tools to associate with particular file
- patterns. Tools matched here will take precedence over the default
- merge tool. Patterns are globs by default, rooted at the repository
- root.
-+
-Example:
-+
+``merge-patterns``
+""""""""""""""""""
+
+This section specifies merge tools to associate with particular file
+patterns. Tools matched here will take precedence over the default
+merge tool. Patterns are globs by default, rooted at the repository
+root.
+
+Example::
+
[merge-patterns]
**.c = kdiff3
**.jpg = myimgmerge
-[[merge-tools]]
-merge-tools::
- This section configures external merge tools to use for file-level
- merges.
-+
---
-Example `~/.hgrc`:
+``merge-tools``
+"""""""""""""""
+
+This section configures external merge tools to use for file-level
+merges.
+
+Example ``~/.hgrc``::
[merge-tools]
# Override stock tool location
@@ -413,64 +426,63 @@
Supported arguments:
-priority;;
+``priority``
The priority in which to evaluate this tool.
Default: 0.
-executable;;
+``executable``
Either just the name of the executable or its pathname.
Default: the tool name.
-args;;
+``args``
The arguments to pass to the tool executable. You can refer to the
files being merged as well as the output file through these
- variables: `$base`, `$local`, `$other`, `$output`.
- Default: `$local $base $other`
-premerge;;
+ variables: ``$base``, ``$local``, ``$other``, ``$output``.
+ Default: ``$local $base $other``
+``premerge``
Attempt to run internal non-interactive 3-way merge tool before
launching external tool.
Default: True
-binary;;
+``binary``
This tool can merge binary files. Defaults to False, unless tool
was selected by file pattern match.
-symlink;;
+``symlink``
This tool can merge symlinks. Defaults to False, even if tool was
selected by file pattern match.
-checkconflicts;;
+``checkconflicts``
Check whether there are conflicts even though the tool reported
success.
Default: False
-checkchanged;;
+``checkchanged``
Check whether outputs were written even though the tool reported
success.
Default: False
-fixeol;;
+``fixeol``
Attempt to fix up EOL changes caused by the merge tool.
Default: False
-gui;;
+``gui``
This tool requires a graphical interface to run. Default: False
-regkey;;
+``regkey``
Windows registry key which describes install location of this
tool. Mercurial will search for this key first under
- `HKEY_CURRENT_USER` and then under `HKEY_LOCAL_MACHINE`.
+ ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
Default: None
-regname;;
+``regname``
Name of value to read from specified registry key. Defaults to the
unnamed (default) value.
-regappend;;
+``regappend``
String to append to the value read from the registry, typically
the executable name of the tool.
Default: None
---
+
-[[hooks]]
-hooks::
- Commands or Python functions that get automatically executed by
- various actions such as starting or finishing a commit. Multiple
- hooks can be run for the same action by appending a suffix to the
- action. Overriding a site-wide hook can be done by changing its
- value or setting it to an empty string.
-+
---
-Example `.hg/hgrc`:
+``hooks``
+"""""""""
+Commands or Python functions that get automatically executed by
+various actions such as starting or finishing a commit. Multiple
+hooks can be run for the same action by appending a suffix to the
+action. Overriding a site-wide hook can be done by changing its
+value or setting it to an empty string.
+
+Example ``.hg/hgrc``::
[hooks]
# do not use the site-wide hook
@@ -482,84 +494,84 @@
additional information. For each hook below, the environment
variables it is passed are listed with names of the form "$HG_foo".
-changegroup;;
+``changegroup``
Run after a changegroup has been added via push, pull or unbundle.
- ID of the first new changeset is in `$HG_NODE`. URL from which
- changes came is in `$HG_URL`.
-commit;;
+ ID of the first new changeset is in ``$HG_NODE``. URL from which
+ changes came is in ``$HG_URL``.
+``commit``
Run after a changeset has been created in the local repository. ID
- of the newly created changeset is in `$HG_NODE`. Parent changeset
- IDs are in `$HG_PARENT1` and `$HG_PARENT2`.
-incoming;;
+ of the newly created changeset is in ``$HG_NODE``. Parent changeset
+ IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
+``incoming``
Run after a changeset has been pulled, pushed, or unbundled into
the local repository. The ID of the newly arrived changeset is in
- `$HG_NODE`. URL that was source of changes came is in `$HG_URL`.
-outgoing;;
+ ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``.
+``outgoing``
Run after sending changes from local repository to another. ID of
- first changeset sent is in `$HG_NODE`. Source of operation is in
- `$HG_SOURCE`; see "preoutgoing" hook for description.
-post-<command>;;
+ first changeset sent is in ``$HG_NODE``. Source of operation is in
+ ``$HG_SOURCE``; see "preoutgoing" hook for description.
+``post-<command>``
Run after successful invocations of the associated command. The
- contents of the command line are passed as `$HG_ARGS` and the result
- code in `$HG_RESULT`. Hook failure is ignored.
-pre-<command>;;
+ contents of the command line are passed as ``$HG_ARGS`` and the result
+ code in ``$HG_RESULT``. Hook failure is ignored.
+``pre-<command>``
Run before executing the associated command. The contents of the
- command line are passed as `$HG_ARGS`. If the hook returns failure,
+ command line are passed as ``$HG_ARGS``. If the hook returns failure,
the command doesn't execute and Mercurial returns the failure
code.
-prechangegroup;;
+``prechangegroup``
Run before a changegroup is added via push, pull or unbundle. Exit
status 0 allows the changegroup to proceed. Non-zero status will
cause the push, pull or unbundle to fail. URL from which changes
- will come is in `$HG_URL`.
-precommit;;
+ will come is in ``$HG_URL``.
+``precommit``
Run before starting a local commit. Exit status 0 allows the
commit to proceed. Non-zero status will cause the commit to fail.
- Parent changeset IDs are in `$HG_PARENT1` and `$HG_PARENT2`.
-preoutgoing;;
+ Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
+``preoutgoing``
Run before collecting changes to send from the local repository to
another. Non-zero status will cause failure. This lets you prevent
pull over HTTP or SSH. Also prevents against local pull, push
(outbound) or bundle commands, but not effective, since you can
just copy files instead then. Source of operation is in
- `$HG_SOURCE`. If "serve", operation is happening on behalf of remote
+ ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote
SSH or HTTP repository. If "push", "pull" or "bundle", operation
is happening on behalf of repository on same system.
-pretag;;
+``pretag``
Run before creating a tag. Exit status 0 allows the tag to be
created. Non-zero status will cause the tag to fail. ID of
- changeset to tag is in `$HG_NODE`. Name of tag is in `$HG_TAG`. Tag is
- local if `$HG_LOCAL=1`, in repository if `$HG_LOCAL=0`.
-pretxnchangegroup;;
+ changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is
+ local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``.
+``pretxnchangegroup``
Run after a changegroup has been added via push, pull or unbundle,
but before the transaction has been committed. Changegroup is
visible to hook program. This lets you validate incoming changes
before accepting them. Passed the ID of the first new changeset in
- `$HG_NODE`. Exit status 0 allows the transaction to commit. Non-zero
+ ``$HG_NODE``. Exit status 0 allows the transaction to commit. Non-zero
status will cause the transaction to be rolled back and the push,
pull or unbundle will fail. URL that was source of changes is in
- `$HG_URL`.
-pretxncommit;;
+ ``$HG_URL``.
+``pretxncommit``
Run after a changeset has been created but the transaction not yet
committed. Changeset is visible to hook program. This lets you
validate commit message and changes. Exit status 0 allows the
commit to proceed. Non-zero status will cause the transaction to
- be rolled back. ID of changeset is in `$HG_NODE`. Parent changeset
- IDs are in `$HG_PARENT1` and `$HG_PARENT2`.
-preupdate;;
+ be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset
+ IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``.
+``preupdate``
Run before updating the working directory. Exit status 0 allows
the update to proceed. Non-zero status will prevent the update.
- Changeset ID of first new parent is in `$HG_PARENT1`. If merge, ID
- of second new parent is in `$HG_PARENT2`.
-tag;;
- Run after a tag is created. ID of tagged changeset is in `$HG_NODE`.
- Name of tag is in `$HG_TAG`. Tag is local if `$HG_LOCAL=1`, in
- repository if `$HG_LOCAL=0`.
-update;;
+ Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID
+ of second new parent is in ``$HG_PARENT2``.
+``tag``
+ Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.
+ Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in
+ repository if ``$HG_LOCAL=0``.
+``update``
Run after updating the working directory. Changeset ID of first
- new parent is in `$HG_PARENT1`. If merge, ID of second new parent is
- in `$HG_PARENT2`. If the update succeeded, `$HG_ERROR=0`. If the
- update failed (e.g. because conflicts not resolved), `$HG_ERROR=1`.
+ new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is
+ in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the
+ update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``.
NOTE: it is generally better to use standard hooks rather than the
generic pre- and post- command hooks as they are guaranteed to be
@@ -568,11 +580,11 @@
generate a commit (e.g. tag) and not just the commit command.
NOTE: Environment variables with empty values may not be passed to
-hooks on platforms such as Windows. As an example, `$HG_PARENT2` will
+hooks on platforms such as Windows. As an example, ``$HG_PARENT2`` will
have an empty value under Unix-like platforms for non-merge
changesets, while it will not be available at all under Windows.
-The syntax for Python hooks is as follows:
+The syntax for Python hooks is as follows::
hookname = python:modulename.submodule.callable
hookname = python:/path/to/python/module.py:callable
@@ -582,101 +594,111 @@
"ui"), a repository object (keyword "repo"), and a "hooktype"
keyword that tells what kind of hook is used. Arguments listed as
environment variables above are passed as keyword arguments, with no
-"HG_" prefix, and names in lower case.
+"``HG_``" prefix, and names in lower case.
If a Python hook returns a "true" value or raises an exception, this
is treated as a failure.
---
+
-[[http_proxy]]
-http_proxy::
- Used to access web-based Mercurial repositories through a HTTP
- proxy.
- host;;
+``http_proxy``
+""""""""""""""
+Used to access web-based Mercurial repositories through a HTTP
+proxy.
+
+``host``
Host name and (optional) port of the proxy server, for example
"myproxy:8000".
- no;;
+``no``
Optional. Comma-separated list of host names that should bypass
the proxy.
- passwd;;
+``passwd``
Optional. Password to authenticate with at the proxy server.
- user;;
+``user``
Optional. User name to authenticate with at the proxy server.
-[[smtp]]
-smtp::
- Configuration for extensions that need to send email messages.
- host;;
+``smtp``
+""""""""
+Configuration for extensions that need to send email messages.
+
+``host``
Host name of mail server, e.g. "mail.example.com".
- port;;
+``port``
Optional. Port to connect to on mail server. Default: 25.
- tls;;
+``tls``
Optional. Whether to connect to mail server using TLS. True or
False. Default: False.
- username;;
+``username``
Optional. User name to authenticate to SMTP server with. If
username is specified, password must also be specified.
Default: none.
- password;;
+``password``
Optional. Password to authenticate to SMTP server with. If
username is specified, password must also be specified.
Default: none.
- local_hostname;;
+``local_hostname``
Optional. It's the hostname that the sender can use to identify
itself to the MTA.
-[[patch]]
-patch::
- Settings used when applying patches, for instance through the 'import'
- command or with Mercurial Queues extension.
- eol;;
+
+``patch``
+"""""""""
+Settings used when applying patches, for instance through the 'import'
+command or with Mercurial Queues extension.
+
+``eol``
When set to 'strict' patch content and patched files end of lines
are preserved. When set to 'lf' or 'crlf', both files end of lines
are ignored when patching and the result line endings are
normalized to either LF (Unix) or CRLF (Windows).
Default: strict.
-[[paths]]
-paths::
- Assigns symbolic names to repositories. The left side is the
- symbolic name, and the right gives the directory or URL that is the
- location of the repository. Default paths can be declared by setting
- the following entries.
- default;;
+
+``paths``
+"""""""""
+Assigns symbolic names to repositories. The left side is the
+symbolic name, and the right gives the directory or URL that is the
+location of the repository. Default paths can be declared by setting
+the following entries.
+
+``default``
Directory or URL to use when pulling if no source is specified.
Default is set to repository from which the current repository was
cloned.
- default-push;;
+``default-push``
Optional. Directory or URL to use when pushing if no destination
is specified.
-[[profiling]]
-profiling::
- Specifies profiling format and file output. In this section
- description, 'profiling data' stands for the raw data collected
- during profiling, while 'profiling report' stands for a statistical
- text report generated from the profiling data. The profiling is done
- using lsprof.
- format;;
+
+``profiling``
+"""""""""""""
+Specifies profiling format and file output. In this section
+description, 'profiling data' stands for the raw data collected
+during profiling, while 'profiling report' stands for a statistical
+text report generated from the profiling data. The profiling is done
+using lsprof.
+
+``format``
Profiling format.
Default: text.
- text;;
+
+ ``text``
Generate a profiling report. When saving to a file, it should be
noted that only the report is saved, and the profiling data is
not kept.
- kcachegrind;;
+ ``kcachegrind``
Format profiling data for kcachegrind use: when saving to a
file, the generated file can directly be loaded into
kcachegrind.
- output;;
+``output``
File path where profiling data or report should be saved. If the
file exists, it is replaced. Default: None, data is printed on
stderr
-[[server]]
-server::
- Controls generic server settings.
- uncompressed;;
+``server``
+""""""""""
+Controls generic server settings.
+
+``uncompressed``
Whether to allow clients to clone a repository using the
uncompressed streaming protocol. This transfers about 40% more
data than a regular clone, but uses less memory and CPU on both
@@ -686,174 +708,175 @@
about 6 Mbps), uncompressed streaming is slower, because of the
extra data transfer overhead. Default is False.
-[[trusted]]
-trusted::
- For security reasons, Mercurial will not use the settings in the
- `.hg/hgrc` file from a repository if it doesn't belong to a trusted
- user or to a trusted group. The main exception is the web interface,
- which automatically uses some safe settings, since it's common to
- serve repositories from different users.
-+
---
+
+``trusted``
+"""""""""""
+For security reasons, Mercurial will not use the settings in the
+``.hg/hgrc`` file from a repository if it doesn't belong to a trusted
+user or to a trusted group. The main exception is the web interface,
+which automatically uses some safe settings, since it's common to
+serve repositories from different users.
+
This section specifies what users and groups are trusted. The
current user is always trusted. To trust everybody, list a user or a
-group with name "`*`".
+group with name "``*``".
-users;;
+``users``
Comma-separated list of trusted users.
-groups;;
+``groups``
Comma-separated list of trusted groups.
---
+
-[[ui]]
-ui::
- User interface controls.
-+
---
- archivemeta;;
+``ui``
+""""""
+
+User interface controls.
+
+``archivemeta``
Whether to include the .hg_archival.txt file containing meta data
(hashes for the repository base and for tip) in archives created
by the hg archive command or downloaded via hgweb.
Default is true.
- askusername;;
+``askusername``
Whether to prompt for a username when committing. If True, and
- neither `$HGUSER` nor `$EMAIL` has been specified, then the user will
+ neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will
be prompted to enter a username. If no username is entered, the
default USER@HOST is used instead.
Default is False.
- debug;;
+``debug``
Print debugging information. True or False. Default is False.
- editor;;
- The editor to use during a commit. Default is `$EDITOR` or "vi".
- fallbackencoding;;
+``editor``
+ The editor to use during a commit. Default is ``$EDITOR`` or "vi".
+``fallbackencoding``
Encoding to try if it's not possible to decode the changelog using
UTF-8. Default is ISO-8859-1.
- ignore;;
+``ignore``
A file to read per-user ignore patterns from. This file should be
in the same format as a repository-wide .hgignore file. This
option supports hook syntax, so if you want to specify multiple
ignore files, you can do so by setting something like
- "ignore.other = ~/.hgignore2". For details of the ignore file
- format, see the hgignore(5) man page.
- interactive;;
+ "``ignore.other = ~/.hgignore2``". For details of the ignore file
+ format, see the |hgignore(5)|_ man page.
+``interactive``
Allow to prompt the user. True or False. Default is True.
- logtemplate;;
+``logtemplate``
Template string for commands that print changesets.
- merge;;
+``merge``
The conflict resolution program to use during a manual merge.
There are some internal tools available:
-+
- internal:local;;
+
+ ``internal:local``
keep the local version
- internal:other;;
+ ``internal:other``
use the other version
- internal:merge;;
+ ``internal:merge``
use the internal non-interactive merge tool
- internal:fail;;
+ ``internal:fail``
fail to merge
-+
+
For more information on configuring merge tools see the
merge-tools section.
- patch;;
+``patch``
command to use to apply patches. Look for 'gpatch' or 'patch' in
PATH if unset.
- quiet;;
+``quiet``
Reduce the amount of output printed. True or False. Default is False.
- remotecmd;;
+``remotecmd``
remote command to use for clone/push/pull operations. Default is 'hg'.
- report_untrusted;;
- Warn if a `.hg/hgrc` file is ignored due to not being owned by a
+``report_untrusted``
+ Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
trusted user or group. True or False. Default is True.
- slash;;
- Display paths using a slash ("`/`") as the path separator. This
+``slash``
+ Display paths using a slash ("``/``") as the path separator. This
only makes a difference on systems where the default path
separator is not the slash character (e.g. Windows uses the
- backslash character ("`\`")).
+ backslash character ("``\``")).
Default is False.
- ssh;;
+``ssh``
command to use for SSH connections. Default is 'ssh'.
- strict;;
+``strict``
Require exact command names, instead of allowing unambiguous
abbreviations. True or False. Default is False.
- style;;
+``style``
Name of style to use for command output.
- timeout;;
+``timeout``
The timeout used when a lock is held (in seconds), a negative value
means no timeout. Default is 600.
- username;;
+``username``
The committer of a changeset created when running "commit".
Typically a person's name and email address, e.g. "Fred Widget
- <fred@example.com>". Default is `$EMAIL` or username@hostname. If
+ <fred@example.com>". Default is ``$EMAIL`` or username@hostname. If
the username in hgrc is empty, it has to be specified manually or
- in a different hgrc file (e.g. `$HOME/.hgrc`, if the admin set
+ in a different hgrc file (e.g. ``$HOME/.hgrc``, if the admin set
"username =" in the system hgrc).
- verbose;;
+``verbose``
Increase the amount of output printed. True or False. Default is False.
---
+
-[[web]]
-web::
- Web interface configuration.
- accesslog;;
+``web``
+"""""""
+Web interface configuration.
+
+``accesslog``
Where to output the access log. Default is stdout.
- address;;
+``address``
Interface address to bind to. Default is all.
- allow_archive;;
+``allow_archive``
List of archive format (bz2, gz, zip) allowed for downloading.
Default is empty.
- allowbz2;;
+``allowbz2``
(DEPRECATED) Whether to allow .tar.bz2 downloading of repository
revisions.
Default is false.
- allowgz;;
+``allowgz``
(DEPRECATED) Whether to allow .tar.gz downloading of repository
revisions.
Default is false.
- allowpull;;
+``allowpull``
Whether to allow pulling from the repository. Default is true.
- allow_push;;
+``allow_push``
Whether to allow pushing to the repository. If empty or not set,
- push is not allowed. If the special value "`*`", any remote user can
+ push is not allowed. If the special value "``*``", any remote user can
push, including unauthenticated users. Otherwise, the remote user
must have been authenticated, and the authenticated user name must
be present in this list (separated by whitespace or ","). The
contents of the allow_push list are examined after the deny_push
list.
- allow_read;;
+``allow_read``
If the user has not already been denied repository access due to
the contents of deny_read, this list determines whether to grant
repository access to the user. If this list is not empty, and the
user is unauthenticated or not present in the list (separated by
whitespace or ","), then access is denied for the user. If the
list is empty or not set, then access is permitted to all users by
- default. Setting allow_read to the special value "`*`" is equivalent
+ default. Setting allow_read to the special value "``*``" is equivalent
to it not being set (i.e. access is permitted to all users). The
contents of the allow_read list are examined after the deny_read
list.
- allowzip;;
+``allowzip``
(DEPRECATED) Whether to allow .zip downloading of repository
revisions. Default is false. This feature creates temporary files.
- baseurl;;
+``baseurl``
Base URL to use when publishing URLs in other locations, so
third-party tools like email notification hooks can construct
URLs. Example: "http://hgserver/repos/"
- contact;;
+``contact``
Name or email address of the person in charge of the repository.
- Defaults to ui.username or `$EMAIL` or "unknown" if unset or empty.
- deny_push;;
+ Defaults to ui.username or ``$EMAIL`` or "unknown" if unset or empty.
+``deny_push``
Whether to deny pushing to the repository. If empty or not set,
- push is not denied. If the special value "`*`", all remote users are
+ push is not denied. If the special value "``*``", all remote users are
denied push. Otherwise, unauthenticated users are all denied, and
any authenticated user name present in this list (separated by
whitespace or ",") is also denied. The contents of the deny_push
list are examined before the allow_push list.
- deny_read;;
+``deny_read``
Whether to deny reading/viewing of the repository. If this list is
not empty, unauthenticated users are all denied, and any
authenticated user name present in this list (separated by
whitespace or ",") is also denied access to the repository. If set
- to the special value "`*`", all remote users are denied access
+ to the special value "``*``", all remote users are denied access
(rarely needed ;). If deny_read is empty or not set, the
determination of repository access depends on the presence and
content of the allow_read list (see description). If both
@@ -863,44 +886,48 @@
the list of repositories. The contents of the deny_read list have
priority over (are examined before) the contents of the allow_read
list.
- description;;
+``descend``
+ hgwebdir indexes will not descend into subdirectories. Only repositories
+ directly in the current path will be shown (other repositories are still
+ available from the index corresponding to their containing path).
+``description``
Textual description of the repository's purpose or contents.
Default is "unknown".
- encoding;;
+``encoding``
Character encoding name.
Example: "UTF-8"
- errorlog;;
+``errorlog``
Where to output the error log. Default is stderr.
- hidden;;
+``hidden``
Whether to hide the repository in the hgwebdir index.
Default is false.
- ipv6;;
+``ipv6``
Whether to use IPv6. Default is false.
- name;;
+``name``
Repository name to use in the web interface. Default is current
working directory.
- maxchanges;;
+``maxchanges``
Maximum number of changes to list on the changelog. Default is 10.
- maxfiles;;
+``maxfiles``
Maximum number of files to list per changeset. Default is 10.
- port;;
+``port``
Port to listen on. Default is 8000.
- prefix;;
+``prefix``
Prefix path to serve from. Default is '' (server root).
- push_ssl;;
+``push_ssl``
Whether to require that inbound pushes be transported over SSL to
prevent password sniffing. Default is true.
- staticurl;;
+``staticurl``
Base URL to use for static files. If unset, static files (e.g. the
hgicon.png favicon) will be served by the CGI script itself. Use
this setting to serve them directly with the HTTP server.
Example: "http://hgserver/static/"
- stripes;;
+``stripes``
How many lines a "zebra stripe" should span in multiline output.
Default is 1; set to 0 to disable.
- style;;
+``style``
Which template map style to use.
- templates;;
+``templates``
Where to find the HTML templates. Default is install path.
@@ -912,11 +939,13 @@
SEE ALSO
--------
-hg(1), hgignore(5)
+|hg(1)|_, |hgignore(5)|_
COPYING
-------
This manual page is copyright 2005 Bryan O'Sullivan.
Mercurial is copyright 2005-2009 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
-Public License (GPL).
+Public License version 2.
+
+.. include:: common.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/rst2man.py Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,1112 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# $Id: manpage.py 6110 2009-08-31 14:40:33Z grubert $
+# Author: Engelbert Gruber <grubert@users.sourceforge.net>
+# Copyright: This module is put into the public domain.
+
+"""
+Simple man page writer for reStructuredText.
+
+Man pages (short for "manual pages") contain system documentation on unix-like
+systems. The pages are grouped in numbered sections:
+
+ 1 executable programs and shell commands
+ 2 system calls
+ 3 library functions
+ 4 special files
+ 5 file formats
+ 6 games
+ 7 miscellaneous
+ 8 system administration
+
+Man pages are written *troff*, a text file formatting system.
+
+See http://www.tldp.org/HOWTO/Man-Page for a start.
+
+Man pages have no subsection only parts.
+Standard parts
+
+ NAME ,
+ SYNOPSIS ,
+ DESCRIPTION ,
+ OPTIONS ,
+ FILES ,
+ SEE ALSO ,
+ BUGS ,
+
+and
+
+ AUTHOR .
+
+A unix-like system keeps an index of the DESCRIPTIONs, which is accesable
+by the command whatis or apropos.
+
+"""
+
+__docformat__ = 'reStructuredText'
+
+import sys
+import os
+import time
+import re
+from types import ListType
+
+import docutils
+from docutils import nodes, utils, writers, languages
+import roman
+
+FIELD_LIST_INDENT = 7
+DEFINITION_LIST_INDENT = 7
+OPTION_LIST_INDENT = 7
+BLOCKQOUTE_INDENT = 3.5
+
+# Define two macros so man/roff can calculate the
+# indent/unindent margins by itself
+MACRO_DEF = (r""".
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+""")
+
+class Writer(writers.Writer):
+
+ supported = ('manpage')
+ """Formats this writer supports."""
+
+ output = None
+ """Final translated form of `document`."""
+
+ def __init__(self):
+ writers.Writer.__init__(self)
+ self.translator_class = Translator
+
+ def translate(self):
+ visitor = self.translator_class(self.document)
+ self.document.walkabout(visitor)
+ self.output = visitor.astext()
+
+
+class Table:
+ def __init__(self):
+ self._rows = []
+ self._options = ['center', ]
+ self._tab_char = '\t'
+ self._coldefs = []
+ def new_row(self):
+ self._rows.append([])
+ def append_separator(self, separator):
+ """Append the separator for table head."""
+ self._rows.append([separator])
+ def append_cell(self, cell_lines):
+ """cell_lines is an array of lines"""
+ start = 0
+ if len(cell_lines)>0 and cell_lines[0] == '.sp\n':
+ start = 1
+ self._rows[-1].append(cell_lines[start:])
+ if len(self._coldefs) < len(self._rows[-1]):
+ self._coldefs.append('l')
+ def _minimize_cell(self, cell_lines):
+ """Remove leading and trailing blank and ``.sp`` lines"""
+ while (cell_lines and cell_lines[0] in ('\n', '.sp\n')):
+ del cell_lines[0]
+ while (cell_lines and cell_lines[-1] in ('\n', '.sp\n')):
+ del cell_lines[-1]
+ def as_list(self):
+ text = ['.TS\n']
+ text.append(' '.join(self._options) + ';\n')
+ text.append('|%s|.\n' % ('|'.join(self._coldefs)))
+ for row in self._rows:
+ # row = array of cells. cell = array of lines.
+ text.append('_\n') # line above
+ text.append('T{\n')
+ for i in range(len(row)):
+ cell = row[i]
+ self._minimize_cell(cell)
+ text.extend(cell)
+ if not text[-1].endswith('\n'):
+ text[-1] += '\n'
+ if i < len(row)-1:
+ text.append('T}'+self._tab_char+'T{\n')
+ else:
+ text.append('T}\n')
+ text.append('_\n')
+ text.append('.TE\n')
+ return text
+
+class Translator(nodes.NodeVisitor):
+ """"""
+
+ words_and_spaces = re.compile(r'\S+| +|\n')
+ document_start = """Man page generated from reStructeredText."""
+
+ def __init__(self, document):
+ nodes.NodeVisitor.__init__(self, document)
+ self.settings = settings = document.settings
+ lcode = settings.language_code
+ self.language = languages.get_language(lcode)
+ self.head = []
+ self.body = []
+ self.foot = []
+ self.section_level = 0
+ self.context = []
+ self.topic_class = ''
+ self.colspecs = []
+ self.compact_p = 1
+ self.compact_simple = None
+ # the list style "*" bullet or "#" numbered
+ self._list_char = []
+ # writing the header .TH and .SH NAME is postboned after
+ # docinfo.
+ self._docinfo = {
+ "title" : "", "title_upper": "",
+ "subtitle" : "",
+ "manual_section" : "", "manual_group" : "",
+ "author" : [],
+ "date" : "",
+ "copyright" : "",
+ "version" : "",
+ }
+ self._docinfo_keys = [] # a list to keep the sequence as in source.
+ self._docinfo_names = {} # to get name from text not normalized.
+ self._in_docinfo = None
+ self._active_table = None
+ self._in_literal = False
+ self.header_written = 0
+ self._line_block = 0
+ self.authors = []
+ self.section_level = 0
+ self._indent = [0]
+ # central definition of simple processing rules
+ # what to output on : visit, depart
+ # Do not use paragraph requests ``.PP`` because these set indentation.
+ # use ``.sp``. Remove superfluous ``.sp`` in ``astext``.
+ #
+ # Fonts are put on a stack, the top one is used.
+ # ``.ft P`` or ``\\fP`` pop from stack.
+ # ``B`` bold, ``I`` italic, ``R`` roman should be available.
+ # Hopefully ``C`` courier too.
+ self.defs = {
+ 'indent' : ('.INDENT %.1f\n', '.UNINDENT\n'),
+ 'definition_list_item' : ('.TP', ''),
+ 'field_name' : ('.TP\n.B ', '\n'),
+ 'literal' : ('\\fC', '\\fP'),
+ 'literal_block' : ('.sp\n.nf\n.ft C\n', '\n.ft P\n.fi\n'),
+
+ 'option_list_item' : ('.TP\n', ''),
+
+ 'reference' : (r'\fI\%', r'\fP'),
+ 'emphasis': ('\\fI', '\\fP'),
+ 'strong' : ('\\fB', '\\fP'),
+ 'term' : ('\n.B ', '\n'),
+ 'title_reference' : ('\\fI', '\\fP'),
+
+ 'topic-title' : ('.SS ', ),
+ 'sidebar-title' : ('.SS ', ),
+
+ 'problematic' : ('\n.nf\n', '\n.fi\n'),
+ }
+ # NOTE dont specify the newline before a dot-command, but ensure
+ # it is there.
+
+ def comment_begin(self, text):
+ """Return commented version of the passed text WITHOUT end of
+ line/comment."""
+ prefix = '.\\" '
+ out_text = ''.join(
+ [(prefix + in_line + '\n')
+ for in_line in text.split('\n')])
+ return out_text
+
+ def comment(self, text):
+ """Return commented version of the passed text."""
+ return self.comment_begin(text)+'.\n'
+
+ def ensure_eol(self):
+ """Ensure the last line in body is terminated by new line."""
+ if self.body[-1][-1] != '\n':
+ self.body.append('\n')
+
+ def astext(self):
+ """Return the final formatted document as a string."""
+ if not self.header_written:
+ # ensure we get a ".TH" as viewers require it.
+ self.head.append(self.header())
+ # filter body
+ for i in xrange(len(self.body)-1,0,-1):
+ # remove superfluous vertical gaps.
+ if self.body[i] == '.sp\n':
+ if self.body[i-1][:4] in ('.BI ','.IP '):
+ self.body[i] = '.\n'
+ elif (self.body[i-1][:3] == '.B ' and
+ self.body[i-2][:4] == '.TP\n'):
+ self.body[i] = '.\n'
+ elif (self.body[i-1] == '\n' and
+ self.body[i-2][0] != '.' and
+ (self.body[i-3][:7] == '.TP\n.B '
+ or self.body[i-3][:4] == '\n.B ')
+ ):
+ self.body[i] = '.\n'
+ return ''.join(self.head + self.body + self.foot)
+
+ def deunicode(self, text):
+ text = text.replace(u'\xa0', '\\ ')
+ text = text.replace(u'\u2020', '\\(dg')
+ return text
+
+ def visit_Text(self, node):
+ text = node.astext()
+ text = text.replace('\\','\\e')
+ replace_pairs = [
+ (u'-', ur'\-'),
+ (u'\'', ur'\(aq'),
+ (u'´', ur'\''),
+ (u'`', ur'\(ga'),
+ ]
+ for (in_char, out_markup) in replace_pairs:
+ text = text.replace(in_char, out_markup)
+ # unicode
+ text = self.deunicode(text)
+ if self._in_literal:
+ # prevent interpretation of "." at line start
+ if text[0] == '.':
+ text = '\\&' + text
+ text = text.replace('\n.', '\n\\&.')
+ self.body.append(text)
+
+ def depart_Text(self, node):
+ pass
+
+ def list_start(self, node):
+ class enum_char:
+ enum_style = {
+ 'bullet' : '\\(bu',
+ 'emdash' : '\\(em',
+ }
+
+ def __init__(self, style):
+ self._style = style
+ if node.has_key('start'):
+ self._cnt = node['start'] - 1
+ else:
+ self._cnt = 0
+ self._indent = 2
+ if style == 'arabic':
+ # indentation depends on number of childrens
+ # and start value.
+ self._indent = len(str(len(node.children)))
+ self._indent += len(str(self._cnt)) + 1
+ elif style == 'loweralpha':
+ self._cnt += ord('a') - 1
+ self._indent = 3
+ elif style == 'upperalpha':
+ self._cnt += ord('A') - 1
+ self._indent = 3
+ elif style.endswith('roman'):
+ self._indent = 5
+
+ def next(self):
+ if self._style == 'bullet':
+ return self.enum_style[self._style]
+ elif self._style == 'emdash':
+ return self.enum_style[self._style]
+ self._cnt += 1
+ # TODO add prefix postfix
+ if self._style == 'arabic':
+ return "%d." % self._cnt
+ elif self._style in ('loweralpha', 'upperalpha'):
+ return "%c." % self._cnt
+ elif self._style.endswith('roman'):
+ res = roman.toRoman(self._cnt) + '.'
+ if self._style.startswith('upper'):
+ return res.upper()
+ return res.lower()
+ else:
+ return "%d." % self._cnt
+ def get_width(self):
+ return self._indent
+ def __repr__(self):
+ return 'enum_style-%s' % list(self._style)
+
+ if node.has_key('enumtype'):
+ self._list_char.append(enum_char(node['enumtype']))
+ else:
+ self._list_char.append(enum_char('bullet'))
+ if len(self._list_char) > 1:
+ # indent nested lists
+ self.indent(self._list_char[-2].get_width())
+ else:
+ self.indent(self._list_char[-1].get_width())
+
+ def list_end(self):
+ self.dedent()
+ self._list_char.pop()
+
+ def header(self):
+ tmpl = (".TH %(title_upper)s %(manual_section)s"
+ " \"%(date)s\" \"%(version)s\" \"%(manual_group)s\"\n"
+ ".SH NAME\n"
+ "%(title)s \- %(subtitle)s\n")
+ return tmpl % self._docinfo
+
+ def append_header(self):
+ """append header with .TH and .SH NAME"""
+ # NOTE before everything
+ # .TH title_upper section date source manual
+ if self.header_written:
+ return
+ self.body.append(self.header())
+ self.body.append(MACRO_DEF)
+ self.header_written = 1
+
+ def visit_address(self, node):
+ self.visit_docinfo_item(node, 'address')
+
+ def depart_address(self, node):
+ pass
+
+ def visit_admonition(self, node, name=None):
+ if name:
+ self.body.append('.IP %s\n' %
+ self.language.labels.get(name, name))
+
+ def depart_admonition(self, node):
+ self.body.append('.RE\n')
+
+ def visit_attention(self, node):
+ self.visit_admonition(node, 'attention')
+
+ depart_attention = depart_admonition
+
+ def visit_docinfo_item(self, node, name):
+ if name == 'author':
+ self._docinfo[name].append(node.astext())
+ else:
+ self._docinfo[name] = node.astext()
+ self._docinfo_keys.append(name)
+ raise nodes.SkipNode
+
+ def depart_docinfo_item(self, node):
+ pass
+
+ def visit_author(self, node):
+ self.visit_docinfo_item(node, 'author')
+
+ depart_author = depart_docinfo_item
+
+ def visit_authors(self, node):
+ # _author is called anyway.
+ pass
+
+ def depart_authors(self, node):
+ pass
+
+ def visit_block_quote(self, node):
+ # BUG/HACK: indent alway uses the _last_ indention,
+ # thus we need two of them.
+ self.indent(BLOCKQOUTE_INDENT)
+ self.indent(0)
+
+ def depart_block_quote(self, node):
+ self.dedent()
+ self.dedent()
+
+ def visit_bullet_list(self, node):
+ self.list_start(node)
+
+ def depart_bullet_list(self, node):
+ self.list_end()
+
+ def visit_caption(self, node):
+ pass
+
+ def depart_caption(self, node):
+ pass
+
+ def visit_caution(self, node):
+ self.visit_admonition(node, 'caution')
+
+ depart_caution = depart_admonition
+
+ def visit_citation(self, node):
+ num,text = node.astext().split(None,1)
+ num = num.strip()
+ self.body.append('.IP [%s] 5\n' % num)
+
+ def depart_citation(self, node):
+ pass
+
+ def visit_citation_reference(self, node):
+ self.body.append('['+node.astext()+']')
+ raise nodes.SkipNode
+
+ def visit_classifier(self, node):
+ pass
+
+ def depart_classifier(self, node):
+ pass
+
+ def visit_colspec(self, node):
+ self.colspecs.append(node)
+
+ def depart_colspec(self, node):
+ pass
+
+ def write_colspecs(self):
+ self.body.append("%s.\n" % ('L '*len(self.colspecs)))
+
+ def visit_comment(self, node,
+ sub=re.compile('-(?=-)').sub):
+ self.body.append(self.comment(node.astext()))
+ raise nodes.SkipNode
+
+ def visit_contact(self, node):
+ self.visit_docinfo_item(node, 'contact')
+
+ depart_contact = depart_docinfo_item
+
+ def visit_container(self, node):
+ pass
+
+ def depart_container(self, node):
+ pass
+
+ def visit_compound(self, node):
+ pass
+
+ def depart_compound(self, node):
+ pass
+
+ def visit_copyright(self, node):
+ self.visit_docinfo_item(node, 'copyright')
+
+ def visit_danger(self, node):
+ self.visit_admonition(node, 'danger')
+
+ depart_danger = depart_admonition
+
+ def visit_date(self, node):
+ self.visit_docinfo_item(node, 'date')
+
+ def visit_decoration(self, node):
+ pass
+
+ def depart_decoration(self, node):
+ pass
+
+ def visit_definition(self, node):
+ pass
+
+ def depart_definition(self, node):
+ pass
+
+ def visit_definition_list(self, node):
+ self.indent(DEFINITION_LIST_INDENT)
+
+ def depart_definition_list(self, node):
+ self.dedent()
+
+ def visit_definition_list_item(self, node):
+ self.body.append(self.defs['definition_list_item'][0])
+
+ def depart_definition_list_item(self, node):
+ self.body.append(self.defs['definition_list_item'][1])
+
+ def visit_description(self, node):
+ pass
+
+ def depart_description(self, node):
+ pass
+
+ def visit_docinfo(self, node):
+ self._in_docinfo = 1
+
+ def depart_docinfo(self, node):
+ self._in_docinfo = None
+ # NOTE nothing should be written before this
+ self.append_header()
+
+ def visit_doctest_block(self, node):
+ self.body.append(self.defs['literal_block'][0])
+ self._in_literal = True
+
+ def depart_doctest_block(self, node):
+ self._in_literal = False
+ self.body.append(self.defs['literal_block'][1])
+
+ def visit_document(self, node):
+ # no blank line between comment and header.
+ self.body.append(self.comment(self.document_start).rstrip()+'\n')
+ # writing header is postboned
+ self.header_written = 0
+
+ def depart_document(self, node):
+ if self._docinfo['author']:
+ self.body.append('.SH AUTHOR\n%s\n'
+ % ', '.join(self._docinfo['author']))
+ skip = ('author', 'copyright', 'date',
+ 'manual_group', 'manual_section',
+ 'subtitle',
+ 'title', 'title_upper', 'version')
+ for name in self._docinfo_keys:
+ if name == 'address':
+ self.body.append("\n%s:\n%s%s.nf\n%s\n.fi\n%s%s" % (
+ self.language.labels.get(name, name),
+ self.defs['indent'][0] % 0,
+ self.defs['indent'][0] % BLOCKQOUTE_INDENT,
+ self._docinfo[name],
+ self.defs['indent'][1],
+ self.defs['indent'][1],
+ ) )
+ elif not name in skip:
+ if name in self._docinfo_names:
+ label = self._docinfo_names[name]
+ else:
+ label = self.language.labels.get(name, name)
+ self.body.append("\n%s: %s\n" % (label, self._docinfo[name]) )
+ if self._docinfo['copyright']:
+ self.body.append('.SH COPYRIGHT\n%s\n'
+ % self._docinfo['copyright'])
+ self.body.append( self.comment(
+ 'Generated by docutils manpage writer.\n' ) )
+
+ def visit_emphasis(self, node):
+ self.body.append(self.defs['emphasis'][0])
+
+ def depart_emphasis(self, node):
+ self.body.append(self.defs['emphasis'][1])
+
+ def visit_entry(self, node):
+ # a cell in a table row
+ if 'morerows' in node:
+ self.document.reporter.warning('"table row spanning" not supported',
+ base_node=node)
+ if 'morecols' in node:
+ self.document.reporter.warning(
+ '"table cell spanning" not supported', base_node=node)
+ self.context.append(len(self.body))
+
+ def depart_entry(self, node):
+ start = self.context.pop()
+ self._active_table.append_cell(self.body[start:])
+ del self.body[start:]
+
+ def visit_enumerated_list(self, node):
+ self.list_start(node)
+
+ def depart_enumerated_list(self, node):
+ self.list_end()
+
+ def visit_error(self, node):
+ self.visit_admonition(node, 'error')
+
+ depart_error = depart_admonition
+
+ def visit_field(self, node):
+ pass
+
+ def depart_field(self, node):
+ pass
+
+ def visit_field_body(self, node):
+ if self._in_docinfo:
+ name_normalized = self._field_name.lower().replace(" ","_")
+ self._docinfo_names[name_normalized] = self._field_name
+ self.visit_docinfo_item(node, name_normalized)
+ raise nodes.SkipNode
+
+ def depart_field_body(self, node):
+ pass
+
+ def visit_field_list(self, node):
+ self.indent(FIELD_LIST_INDENT)
+
+ def depart_field_list(self, node):
+ self.dedent()
+
+ def visit_field_name(self, node):
+ if self._in_docinfo:
+ self._field_name = node.astext()
+ raise nodes.SkipNode
+ else:
+ self.body.append(self.defs['field_name'][0])
+
+ def depart_field_name(self, node):
+ self.body.append(self.defs['field_name'][1])
+
+ def visit_figure(self, node):
+ self.indent(2.5)
+ self.indent(0)
+
+ def depart_figure(self, node):
+ self.dedent()
+ self.dedent()
+
+ def visit_footer(self, node):
+ self.document.reporter.warning('"footer" not supported',
+ base_node=node)
+
+ def depart_footer(self, node):
+ pass
+
+ def visit_footnote(self, node):
+ num,text = node.astext().split(None,1)
+ num = num.strip()
+ self.body.append('.IP [%s] 5\n' % self.deunicode(num))
+
+ def depart_footnote(self, node):
+ pass
+
+ def footnote_backrefs(self, node):
+ self.document.reporter.warning('"footnote_backrefs" not supported',
+ base_node=node)
+
+ def visit_footnote_reference(self, node):
+ self.body.append('['+self.deunicode(node.astext())+']')
+ raise nodes.SkipNode
+
+ def depart_footnote_reference(self, node):
+ pass
+
+ def visit_generated(self, node):
+ pass
+
+ def depart_generated(self, node):
+ pass
+
+ def visit_header(self, node):
+ raise NotImplementedError, node.astext()
+
+ def depart_header(self, node):
+ pass
+
+ def visit_hint(self, node):
+ self.visit_admonition(node, 'hint')
+
+ depart_hint = depart_admonition
+
+ def visit_subscript(self, node):
+ self.body.append('\\s-2\\d')
+
+ def depart_subscript(self, node):
+ self.body.append('\\u\\s0')
+
+ def visit_superscript(self, node):
+ self.body.append('\\s-2\\u')
+
+ def depart_superscript(self, node):
+ self.body.append('\\d\\s0')
+
+ def visit_attribution(self, node):
+ self.body.append('\\(em ')
+
+ def depart_attribution(self, node):
+ self.body.append('\n')
+
+ def visit_image(self, node):
+ self.document.reporter.warning('"image" not supported',
+ base_node=node)
+ text = []
+ if 'alt' in node.attributes:
+ text.append(node.attributes['alt'])
+ if 'uri' in node.attributes:
+ text.append(node.attributes['uri'])
+ self.body.append('[image: %s]\n' % ('/'.join(text)))
+ raise nodes.SkipNode
+
+ def visit_important(self, node):
+ self.visit_admonition(node, 'important')
+
+ depart_important = depart_admonition
+
+ def visit_label(self, node):
+ # footnote and citation
+ if (isinstance(node.parent, nodes.footnote)
+ or isinstance(node.parent, nodes.citation)):
+ raise nodes.SkipNode
+ self.document.reporter.warning('"unsupported "label"',
+ base_node=node)
+ self.body.append('[')
+
+ def depart_label(self, node):
+ self.body.append(']\n')
+
+ def visit_legend(self, node):
+ pass
+
+ def depart_legend(self, node):
+ pass
+
+ # WHAT should we use .INDENT, .UNINDENT ?
+ def visit_line_block(self, node):
+ self._line_block += 1
+ if self._line_block == 1:
+ self.body.append('.nf\n')
+ else:
+ self.body.append('.in +2\n')
+
+ def depart_line_block(self, node):
+ self._line_block -= 1
+ if self._line_block == 0:
+ self.body.append('.fi\n')
+ self.body.append('.sp\n')
+ else:
+ self.body.append('.in -2\n')
+
+ def visit_line(self, node):
+ pass
+
+ def depart_line(self, node):
+ self.body.append('\n')
+
+ def visit_list_item(self, node):
+ # man 7 man argues to use ".IP" instead of ".TP"
+ self.body.append('.IP %s %d\n' % (
+ self._list_char[-1].next(),
+ self._list_char[-1].get_width(),) )
+
+ def depart_list_item(self, node):
+ pass
+
+ def visit_literal(self, node):
+ self.body.append(self.defs['literal'][0])
+
+ def depart_literal(self, node):
+ self.body.append(self.defs['literal'][1])
+
+ def visit_literal_block(self, node):
+ self.body.append(self.defs['literal_block'][0])
+ self._in_literal = True
+
+ def depart_literal_block(self, node):
+ self._in_literal = False
+ self.body.append(self.defs['literal_block'][1])
+
+ def visit_meta(self, node):
+ raise NotImplementedError, node.astext()
+
+ def depart_meta(self, node):
+ pass
+
+ def visit_note(self, node):
+ self.visit_admonition(node, 'note')
+
+ depart_note = depart_admonition
+
+ def indent(self, by=0.5):
+ # if we are in a section ".SH" there already is a .RS
+ step = self._indent[-1]
+ self._indent.append(by)
+ self.body.append(self.defs['indent'][0] % step)
+
+ def dedent(self):
+ self._indent.pop()
+ self.body.append(self.defs['indent'][1])
+
+ def visit_option_list(self, node):
+ self.indent(OPTION_LIST_INDENT)
+
+ def depart_option_list(self, node):
+ self.dedent()
+
+ def visit_option_list_item(self, node):
+ # one item of the list
+ self.body.append(self.defs['option_list_item'][0])
+
+ def depart_option_list_item(self, node):
+ self.body.append(self.defs['option_list_item'][1])
+
+ def visit_option_group(self, node):
+ # as one option could have several forms it is a group
+ # options without parameter bold only, .B, -v
+ # options with parameter bold italic, .BI, -f file
+ #
+ # we do not know if .B or .BI
+ self.context.append('.B') # blind guess
+ self.context.append(len(self.body)) # to be able to insert later
+ self.context.append(0) # option counter
+
+ def depart_option_group(self, node):
+ self.context.pop() # the counter
+ start_position = self.context.pop()
+ text = self.body[start_position:]
+ del self.body[start_position:]
+ self.body.append('%s%s\n' % (self.context.pop(), ''.join(text)))
+
+ def visit_option(self, node):
+ # each form of the option will be presented separately
+ if self.context[-1]>0:
+ self.body.append(', ')
+ if self.context[-3] == '.BI':
+ self.body.append('\\')
+ self.body.append(' ')
+
+ def depart_option(self, node):
+ self.context[-1] += 1
+
+ def visit_option_string(self, node):
+ # do not know if .B or .BI
+ pass
+
+ def depart_option_string(self, node):
+ pass
+
+ def visit_option_argument(self, node):
+ self.context[-3] = '.BI' # bold/italic alternate
+ if node['delimiter'] != ' ':
+ self.body.append('\\fB%s ' % node['delimiter'] )
+ elif self.body[len(self.body)-1].endswith('='):
+ # a blank only means no blank in output, just changing font
+ self.body.append(' ')
+ else:
+ # blank backslash blank, switch font then a blank
+ self.body.append(' \\ ')
+
+ def depart_option_argument(self, node):
+ pass
+
+ def visit_organization(self, node):
+ self.visit_docinfo_item(node, 'organization')
+
+ def depart_organization(self, node):
+ pass
+
+ def visit_paragraph(self, node):
+ # ``.PP`` : Start standard indented paragraph.
+ # ``.LP`` : Start block paragraph, all except the first.
+ # ``.P [type]`` : Start paragraph type.
+ # NOTE dont use paragraph starts because they reset indentation.
+ # ``.sp`` is only vertical space
+ self.ensure_eol()
+ self.body.append('.sp\n')
+
+ def depart_paragraph(self, node):
+ self.body.append('\n')
+
+ def visit_problematic(self, node):
+ self.body.append(self.defs['problematic'][0])
+
+ def depart_problematic(self, node):
+ self.body.append(self.defs['problematic'][1])
+
+ def visit_raw(self, node):
+ if node.get('format') == 'manpage':
+ self.body.append(node.astext() + "\n")
+ # Keep non-manpage raw text out of output:
+ raise nodes.SkipNode
+
+ def visit_reference(self, node):
+ """E.g. link or email address."""
+ self.body.append(self.defs['reference'][0])
+
+ def depart_reference(self, node):
+ self.body.append(self.defs['reference'][1])
+
+ def visit_revision(self, node):
+ self.visit_docinfo_item(node, 'revision')
+
+ depart_revision = depart_docinfo_item
+
+ def visit_row(self, node):
+ self._active_table.new_row()
+
+ def depart_row(self, node):
+ pass
+
+ def visit_section(self, node):
+ self.section_level += 1
+
+ def depart_section(self, node):
+ self.section_level -= 1
+
+ def visit_status(self, node):
+ self.visit_docinfo_item(node, 'status')
+
+ depart_status = depart_docinfo_item
+
+ def visit_strong(self, node):
+ self.body.append(self.defs['strong'][0])
+
+ def depart_strong(self, node):
+ self.body.append(self.defs['strong'][1])
+
+ def visit_substitution_definition(self, node):
+ """Internal only."""
+ raise nodes.SkipNode
+
+ def visit_substitution_reference(self, node):
+ self.document.reporter.warning('"substitution_reference" not supported',
+ base_node=node)
+
+ def visit_subtitle(self, node):
+ if isinstance(node.parent, nodes.sidebar):
+ self.body.append(self.defs['strong'][0])
+ elif isinstance(node.parent, nodes.document):
+ self.visit_docinfo_item(node, 'subtitle')
+ elif isinstance(node.parent, nodes.section):
+ self.body.append(self.defs['strong'][0])
+
+ def depart_subtitle(self, node):
+ # document subtitle calls SkipNode
+ self.body.append(self.defs['strong'][1]+'\n.PP\n')
+
+ def visit_system_message(self, node):
+ # TODO add report_level
+ #if node['level'] < self.document.reporter['writer'].report_level:
+ # Level is too low to display:
+ # raise nodes.SkipNode
+ attr = {}
+ backref_text = ''
+ if node.hasattr('id'):
+ attr['name'] = node['id']
+ if node.hasattr('line'):
+ line = ', line %s' % node['line']
+ else:
+ line = ''
+ self.body.append('.IP "System Message: %s/%s (%s:%s)"\n'
+ % (node['type'], node['level'], node['source'], line))
+
+ def depart_system_message(self, node):
+ pass
+
+ def visit_table(self, node):
+ self._active_table = Table()
+
+ def depart_table(self, node):
+ self.ensure_eol()
+ self.body.extend(self._active_table.as_list())
+ self._active_table = None
+
+ def visit_target(self, node):
+ # targets are in-document hyper targets, without any use for man-pages.
+ raise nodes.SkipNode
+
+ def visit_tbody(self, node):
+ pass
+
+ def depart_tbody(self, node):
+ pass
+
+ def visit_term(self, node):
+ self.body.append(self.defs['term'][0])
+
+ def depart_term(self, node):
+ self.body.append(self.defs['term'][1])
+
+ def visit_tgroup(self, node):
+ pass
+
+ def depart_tgroup(self, node):
+ pass
+
+ def visit_thead(self, node):
+ # MAYBE double line '='
+ pass
+
+ def depart_thead(self, node):
+ # MAYBE double line '='
+ pass
+
+ def visit_tip(self, node):
+ self.visit_admonition(node, 'tip')
+
+ depart_tip = depart_admonition
+
+ def visit_title(self, node):
+ if isinstance(node.parent, nodes.topic):
+ self.body.append(self.defs['topic-title'][0])
+ elif isinstance(node.parent, nodes.sidebar):
+ self.body.append(self.defs['sidebar-title'][0])
+ elif isinstance(node.parent, nodes.admonition):
+ self.body.append('.IP "')
+ elif self.section_level == 0:
+ self._docinfo['title'] = node.astext()
+ # document title for .TH
+ self._docinfo['title_upper'] = node.astext().upper()
+ raise nodes.SkipNode
+ elif self.section_level == 1:
+ self.body.append('.SH ')
+ else:
+ self.body.append('.SS ')
+
+ def depart_title(self, node):
+ if isinstance(node.parent, nodes.admonition):
+ self.body.append('"')
+ self.body.append('\n')
+
+ def visit_title_reference(self, node):
+ """inline citation reference"""
+ self.body.append(self.defs['title_reference'][0])
+
+ def depart_title_reference(self, node):
+ self.body.append(self.defs['title_reference'][1])
+
+ def visit_topic(self, node):
+ pass
+
+ def depart_topic(self, node):
+ pass
+
+ def visit_sidebar(self, node):
+ pass
+
+ def depart_sidebar(self, node):
+ pass
+
+ def visit_rubric(self, node):
+ pass
+
+ def depart_rubric(self, node):
+ pass
+
+ def visit_transition(self, node):
+ # .PP Begin a new paragraph and reset prevailing indent.
+ # .sp N leaves N lines of blank space.
+ # .ce centers the next line
+ self.body.append('\n.sp\n.ce\n----\n')
+
+ def depart_transition(self, node):
+ self.body.append('\n.ce 0\n.sp\n')
+
+ def visit_version(self, node):
+ self.visit_docinfo_item(node, 'version')
+
+ def visit_warning(self, node):
+ self.visit_admonition(node, 'warning')
+
+ depart_warning = depart_admonition
+
+ def unimplemented_visit(self, node):
+ raise NotImplementedError('visiting unimplemented node type: %s'
+ % node.__class__.__name__)
+
+# The following part is taken from the Docutils rst2man.py script:
+if __name__ == "__main__":
+ from docutils.core import publish_cmdline, default_description
+ description = ("Generates plain unix manual documents. " +
+ default_description)
+ publish_cmdline(writer=Writer(), description=description)
+
+# vim: set fileencoding=utf-8 et ts=4 ai :
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/dates.txt Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,36 @@
+Some commands allow the user to specify a date, e.g.:
+
+- backout, commit, import, tag: Specify the commit date.
+- log, revert, update: Select revision(s) by date.
+
+Many date formats are valid. Here are some examples::
+
+ "Wed Dec 6 13:18:29 2006" (local timezone assumed)
+ "Dec 6 13:18 -0600" (year assumed, time offset provided)
+ "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
+ "Dec 6" (midnight)
+ "13:18" (today assumed)
+ "3:39" (3:39AM assumed)
+ "3:39pm" (15:39)
+ "2006-12-06 13:18:29" (ISO 8601 format)
+ "2006-12-6 13:18"
+ "2006-12-6"
+ "12-6"
+ "12/6"
+ "12/6/6" (Dec 6 2006)
+
+Lastly, there is Mercurial's internal format::
+
+ "1165432709 0" (Wed Dec 6 13:18:29 2006 UTC)
+
+This is the internal representation format for dates. unixtime is the
+number of seconds since the epoch (1970-01-01 00:00 UTC). offset is
+the offset of the local timezone, in seconds west of UTC (negative if
+the timezone is east of UTC).
+
+The log command also accepts date ranges::
+
+ "<{datetime}" - at or before a given date/time
+ ">{datetime}" - on or after a given date/time
+ "{datetime} to {datetime}" - a date range, inclusive
+ "-{days}" - within a given number of days of today
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/diffs.txt Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,29 @@
+Mercurial's default format for showing changes between two versions of
+a file is compatible with the unified format of GNU diff, which can be
+used by GNU patch and many other standard tools.
+
+While this standard format is often enough, it does not encode the
+following information:
+
+- executable status and other permission bits
+- copy or rename information
+- changes in binary files
+- creation or deletion of empty files
+
+Mercurial also supports the extended diff format from the git VCS
+which addresses these limitations. The git diff format is not produced
+by default because a few widespread tools still do not understand this
+format.
+
+This means that when generating diffs from a Mercurial repository
+(e.g. with "hg export"), you should be careful about things like file
+copies and renames or other things mentioned above, because when
+applying a standard diff to a different repository, this extra
+information is lost. Mercurial's internal operations (like push and
+pull) are not affected by this, because they use an internal binary
+format for communicating changes.
+
+To make Mercurial produce the git extended diff format, use the --git
+option available for many commands, or set 'git = True' in the [diff]
+section of your hgrc. You do not need to set this option when
+importing diffs in this format or using them in the mq extension.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/environment.txt Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,76 @@
+HG
+ Path to the 'hg' executable, automatically passed when running
+ hooks, extensions or external tools. If unset or empty, this is
+ the hg executable's name if it's frozen, or an executable named
+ 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
+ Windows) is searched.
+
+HGEDITOR
+ This is the name of the editor to run when committing. See EDITOR.
+
+ (deprecated, use .hgrc)
+
+HGENCODING
+ This overrides the default locale setting detected by Mercurial.
+ This setting is used to convert data including usernames,
+ changeset descriptions, tag names, and branches. This setting can
+ be overridden with the --encoding command-line option.
+
+HGENCODINGMODE
+ This sets Mercurial's behavior for handling unknown characters
+ while transcoding user input. The default is "strict", which
+ causes Mercurial to abort if it can't map a character. Other
+ settings include "replace", which replaces unknown characters, and
+ "ignore", which drops them. This setting can be overridden with
+ the --encodingmode command-line option.
+
+HGMERGE
+ An executable to use for resolving merge conflicts. The program
+ will be executed with three arguments: local file, remote file,
+ ancestor file.
+
+ (deprecated, use .hgrc)
+
+HGRCPATH
+ A list of files or directories to search for hgrc files. Item
+ separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set,
+ platform default search path is used. If empty, only the .hg/hgrc
+ from the current repository is read.
+
+ For each element in HGRCPATH:
+
+ - if it's a directory, all files ending with .rc are added
+ - otherwise, the file itself will be added
+
+HGUSER
+ This is the string used as the author of a commit. If not set,
+ available values will be considered in this order:
+
+ - HGUSER (deprecated)
+ - hgrc files from the HGRCPATH
+ - EMAIL
+ - interactive prompt
+ - LOGNAME (with '@hostname' appended)
+
+ (deprecated, use .hgrc)
+
+EMAIL
+ May be used as the author of a commit; see HGUSER.
+
+LOGNAME
+ May be used as the author of a commit; see HGUSER.
+
+VISUAL
+ This is the name of the editor to use when committing. See EDITOR.
+
+EDITOR
+ Sometimes Mercurial needs to open a text file in an editor for a
+ user to modify, for example when writing commit messages. The
+ editor it uses is determined by looking at the environment
+ variables HGEDITOR, VISUAL and EDITOR, in that order. The first
+ non-empty one is chosen. If all of them are empty, the editor
+ defaults to 'vi'.
+
+PYTHONPATH
+ This is used by Python to find imported modules and may need to be
+ set appropriately if this Mercurial is not installed system-wide.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/extensions.txt Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,33 @@
+Mercurial has the ability to add new features through the use of
+extensions. Extensions may add new commands, add options to
+existing commands, change the default behavior of commands, or
+implement hooks.
+
+Extensions are not loaded by default for a variety of reasons:
+they can increase startup overhead; they may be meant for advanced
+usage only; they may provide potentially dangerous abilities (such
+as letting you destroy or modify history); they might not be ready
+for prime time; or they may alter some usual behaviors of stock
+Mercurial. It is thus up to the user to activate extensions as
+needed.
+
+To enable the "foo" extension, either shipped with Mercurial or in
+the Python search path, create an entry for it in your hgrc, like
+this::
+
+ [extensions]
+ foo =
+
+You may also specify the full path to an extension::
+
+ [extensions]
+ myfeature = ~/.hgext/myfeature.py
+
+To explicitly disable an extension enabled in an hgrc of broader
+scope, prepend its path with !::
+
+ [extensions]
+ # disabling extension bar residing in /path/to/extension/bar.py
+ hgext.bar = !/path/to/extension/bar.py
+ # ditto, but no path was supplied for extension baz
+ hgext.baz = !
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/multirevs.txt Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,13 @@
+When Mercurial accepts more than one revision, they may be specified
+individually, or provided as a topologically continuous range,
+separated by the ":" character.
+
+The syntax of range notation is [BEGIN]:[END], where BEGIN and END are
+revision identifiers. Both BEGIN and END are optional. If BEGIN is not
+specified, it defaults to revision number 0. If END is not specified,
+it defaults to the tip. The range ":" thus means "all revisions".
+
+If BEGIN is greater than END, revisions are treated in reverse order.
+
+A range acts as a closed interval. This means that a range of 3:5
+gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/patterns.txt Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,41 @@
+Mercurial accepts several notations for identifying one or more files
+at a time.
+
+By default, Mercurial treats filenames as shell-style extended glob
+patterns.
+
+Alternate pattern notations must be specified explicitly.
+
+To use a plain path name without any pattern matching, start it with
+"path:". These path names must completely match starting at the
+current repository root.
+
+To use an extended glob, start a name with "glob:". Globs are rooted
+at the current directory; a glob such as "``*.c``" will only match
+files in the current directory ending with ".c".
+
+The supported glob syntax extensions are "``**``" to match any string
+across path separators and "{a,b}" to mean "a or b".
+
+To use a Perl/Python regular expression, start a name with "re:".
+Regexp pattern matching is anchored at the root of the repository.
+
+Plain examples::
+
+ path:foo/bar a name bar in a directory named foo in the root
+ of the repository
+ path:path:name a file or directory named "path:name"
+
+Glob examples::
+
+ glob:*.c any name ending in ".c" in the current directory
+ *.c any name ending in ".c" in the current directory
+ **.c any name ending in ".c" in any subdirectory of the
+ current directory including itself.
+ foo/*.c any name ending in ".c" in the directory foo
+ foo/**.c any name ending in ".c" in any subdirectory of foo
+ including itself.
+
+Regexp examples::
+
+ re:.*\.c$ any name ending in ".c", anywhere in the repository
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/revisions.txt Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,29 @@
+Mercurial supports several ways to specify individual revisions.
+
+A plain integer is treated as a revision number. Negative integers are
+treated as sequential offsets from the tip, with -1 denoting the tip,
+-2 denoting the revision prior to the tip, and so forth.
+
+A 40-digit hexadecimal string is treated as a unique revision
+identifier.
+
+A hexadecimal string less than 40 characters long is treated as a
+unique revision identifier and is referred to as a short-form
+identifier. A short-form identifier is only valid if it is the prefix
+of exactly one full-length identifier.
+
+Any other string is treated as a tag or branch name. A tag name is a
+symbolic name associated with a revision identifier. A branch name
+denotes the tipmost revision of that branch. Tag and branch names must
+not contain the ":" character.
+
+The reserved name "tip" is a special tag that always identifies the
+most recent revision.
+
+The reserved name "null" indicates the null revision. This is the
+revision of an empty repository, and the parent of revision 0.
+
+The reserved name "." indicates the working directory parent. If no
+working directory is checked out, it is equivalent to null. If an
+uncommitted merge is in progress, "." is the revision of the first
+parent.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/templates.txt Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,113 @@
+Mercurial allows you to customize output of commands through
+templates. You can either pass in a template from the command
+line, via the --template option, or select an existing
+template-style (--style).
+
+You can customize output for any "log-like" command: log,
+outgoing, incoming, tip, parents, heads and glog.
+
+Three styles are packaged with Mercurial: default (the style used
+when no explicit preference is passed), compact and changelog.
+Usage::
+
+ $ hg log -r1 --style changelog
+
+A template is a piece of text, with markup to invoke variable
+expansion::
+
+ $ hg log -r1 --template "{node}\n"
+ b56ce7b07c52de7d5fd79fb89701ea538af65746
+
+Strings in curly braces are called keywords. The availability of
+keywords depends on the exact context of the templater. These
+keywords are usually available for templating a log-like command:
+
+:author: String. The unmodified author of the changeset.
+:branches: String. The name of the branch on which the changeset
+ was committed. Will be empty if the branch name was
+ default.
+:date: Date information. The date when the changeset was
+ committed.
+:desc: String. The text of the changeset description.
+:diffstat: String. Statistics of changes with the following
+ format: "modified files: +added/-removed lines"
+:files: List of strings. All files modified, added, or removed
+ by this changeset.
+:file_adds: List of strings. Files added by this changeset.
+:file_mods: List of strings. Files modified by this changeset.
+:file_dels: List of strings. Files removed by this changeset.
+:node: String. The changeset identification hash, as a
+ 40-character hexadecimal string.
+:parents: List of strings. The parents of the changeset.
+:rev: Integer. The repository-local changeset revision
+ number.
+:tags: List of strings. Any tags associated with the
+ changeset.
+:latesttag: String. Most recent global tag in the ancestors of this
+ changeset.
+:latesttagdistance: Integer. Longest path to the latest tag.
+
+The "date" keyword does not produce human-readable output. If you
+want to use a date in your output, you can use a filter to process
+it. Filters are functions which return a string based on the input
+variable. You can also use a chain of filters to get the desired
+output::
+
+ $ hg tip --template "{date|isodate}\n"
+ 2008-08-21 18:22 +0000
+
+List of filters:
+
+:addbreaks: Any text. Add an XHTML "<br />" tag before the end of
+ every line except the last.
+:age: Date. Returns a human-readable date/time difference
+ between the given date/time and the current
+ date/time.
+:basename: Any text. Treats the text as a path, and returns the
+ last component of the path after splitting by the
+ path separator (ignoring trailing separators). For
+ example, "foo/bar/baz" becomes "baz" and "foo/bar//"
+ becomes "bar".
+:stripdir: Treat the text as path and strip a directory level,
+ if possible. For example, "foo" and "foo/bar" becomes
+ "foo".
+:date: Date. Returns a date in a Unix date format, including
+ the timezone: "Mon Sep 04 15:13:13 2006 0700".
+:domain: Any text. Finds the first string that looks like an
+ email address, and extracts just the domain
+ component. Example: 'User <user@example.com>' becomes
+ 'example.com'.
+:email: Any text. Extracts the first string that looks like
+ an email address. Example: 'User <user@example.com>'
+ becomes 'user@example.com'.
+:escape: Any text. Replaces the special XML/XHTML characters
+ "&", "<" and ">" with XML entities.
+:fill68: Any text. Wraps the text to fit in 68 columns.
+:fill76: Any text. Wraps the text to fit in 76 columns.
+:firstline: Any text. Returns the first line of text.
+:nonempty: Any text. Returns '(none)' if the string is empty.
+:hgdate: Date. Returns the date as a pair of numbers:
+ "1157407993 25200" (Unix timestamp, timezone offset).
+:isodate: Date. Returns the date in ISO 8601 format:
+ "2009-08-18 13:00 +0200".
+:isodatesec: Date. Returns the date in ISO 8601 format, including
+ seconds: "2009-08-18 13:00:13 +0200". See also the
+ rfc3339date filter.
+:localdate: Date. Converts a date to local date.
+:obfuscate: Any text. Returns the input text rendered as a
+ sequence of XML entities.
+:person: Any text. Returns the text before an email address.
+:rfc822date: Date. Returns a date using the same format used in
+ email headers: "Tue, 18 Aug 2009 13:00:13 +0200".
+:rfc3339date: Date. Returns a date using the Internet date format
+ specified in RFC 3339: "2009-08-18T13:00:13+02:00".
+:short: Changeset hash. Returns the short form of a changeset
+ hash, i.e. a 12-byte hexadecimal string.
+:shortdate: Date. Returns a date like "2006-09-18".
+:strip: Any text. Strips all leading and trailing whitespace.
+:tabindent: Any text. Returns the text, with every line except
+ the first starting with a tab character.
+:urlescape: Any text. Escapes all "special" characters. For
+ example, "foo bar" becomes "foo%20bar".
+:user: Any text. Returns the user portion of an email
+ address.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/urls.txt Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,63 @@
+Valid URLs are of the form::
+
+ local/filesystem/path[#revision]
+ file://local/filesystem/path[#revision]
+ http://[user[:pass]@]host[:port]/[path][#revision]
+ https://[user[:pass]@]host[:port]/[path][#revision]
+ ssh://[user[:pass]@]host[:port]/[path][#revision]
+
+Paths in the local filesystem can either point to Mercurial
+repositories or to bundle files (as created by 'hg bundle' or 'hg
+incoming --bundle').
+
+An optional identifier after # indicates a particular branch, tag, or
+changeset to use from the remote repository. See also 'hg help
+revisions'.
+
+Some features, such as pushing to http:// and https:// URLs are only
+possible if the feature is explicitly enabled on the remote Mercurial
+server.
+
+Some notes about using SSH with Mercurial:
+
+- SSH requires an accessible shell account on the destination machine
+ and a copy of hg in the remote path or specified with as remotecmd.
+- path is relative to the remote user's home directory by default. Use
+ an extra slash at the start of a path to specify an absolute path::
+
+ ssh://example.com//tmp/repository
+
+- Mercurial doesn't use its own compression via SSH; the right thing
+ to do is to configure it in your ~/.ssh/config, e.g.::
+
+ Host *.mylocalnetwork.example.com
+ Compression no
+ Host *
+ Compression yes
+
+ Alternatively specify "ssh -C" as your ssh command in your hgrc or
+ with the --ssh command line option.
+
+These URLs can all be stored in your hgrc with path aliases under the
+[paths] section like so::
+
+ [paths]
+ alias1 = URL1
+ alias2 = URL2
+ ...
+
+You can then use the alias for any command that uses a URL (for
+example 'hg pull alias1' would pull from the 'alias1' path).
+
+Two path aliases are special because they are used as defaults when
+you do not provide the URL to a command:
+
+default:
+ When you create a repository with hg clone, the clone command saves
+ the location of the source repository as the new repository's
+ 'default' path. This is then used when you omit path from push- and
+ pull-like commands (including incoming and outgoing).
+
+default-push:
+ The push command will look for a path named 'default-push', and
+ prefer it over 'default' if both are defined.
--- a/hgext/acl.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/acl.py Mon Oct 05 22:17:39 2009 +0200
@@ -22,7 +22,7 @@
Nor is it safe if remote users share an account, because then there
is no way to distinguish them.
-To use this hook, configure the acl extension in your hgrc like this:
+To use this hook, configure the acl extension in your hgrc like this::
[extensions]
hgext.acl =
@@ -35,10 +35,10 @@
# ("serve" == ssh or http, "push", "pull", "bundle")
sources = serve
-The allow and deny sections take a subtree pattern as key (with a
-glob syntax by default), and a comma separated list of users as
-the corresponding value. The deny list is checked before the allow
-list is.
+The allow and deny sections take a subtree pattern as key (with a glob
+syntax by default), and a comma separated list of users as the
+corresponding value. The deny list is checked before the allow list
+is. ::
[acl.allow]
# If acl.allow is not present, all users are allowed by default.
@@ -60,12 +60,12 @@
def buildmatch(ui, repo, user, key):
'''return tuple of (match function, list enabled).'''
if not ui.has_section(key):
- ui.debug(_('acl: %s not enabled\n') % key)
+ ui.debug('acl: %s not enabled\n' % key)
return None
pats = [pat for pat, users in ui.configitems(key)
if user in users.replace(',', ' ').split()]
- ui.debug(_('acl: %s enabled, %d entries for user %s\n') %
+ ui.debug('acl: %s enabled, %d entries for user %s\n' %
(key, len(pats), user))
if pats:
return match.match(repo.root, '', pats)
@@ -77,7 +77,7 @@
raise util.Abort(_('config error - hook type "%s" cannot stop '
'incoming changesets') % hooktype)
if source not in ui.config('acl', 'sources', 'serve').split():
- ui.debug(_('acl: changes have source "%s" - skipping\n') % source)
+ ui.debug('acl: changes have source "%s" - skipping\n' % source)
return
user = None
@@ -99,9 +99,9 @@
ctx = repo[rev]
for f in ctx.files():
if deny and deny(f):
- ui.debug(_('acl: user %s denied on %s\n') % (user, f))
+ ui.debug('acl: user %s denied on %s\n' % (user, f))
raise util.Abort(_('acl: access denied for changeset %s') % ctx)
if allow and not allow(f):
- ui.debug(_('acl: user %s not allowed on %s\n') % (user, f))
+ ui.debug('acl: user %s not allowed on %s\n' % (user, f))
raise util.Abort(_('acl: access denied for changeset %s') % ctx)
- ui.debug(_('acl: allowing changeset %s\n') % ctx)
+ ui.debug('acl: allowing changeset %s\n' % ctx)
--- a/hgext/bookmarks.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/bookmarks.py Mon Oct 05 22:17:39 2009 +0200
@@ -9,16 +9,16 @@
Bookmarks are local movable markers to changesets. Every bookmark
points to a changeset identified by its hash. If you commit a
-changeset that is based on a changeset that has a bookmark on it,
-the bookmark shifts to the new changeset.
+changeset that is based on a changeset that has a bookmark on it, the
+bookmark shifts to the new changeset.
-It is possible to use bookmark names in every revision lookup
-(e.g. hg merge, hg update).
+It is possible to use bookmark names in every revision lookup (e.g. hg
+merge, hg update).
By default, when several bookmarks point to the same changeset, they
will all move forward together. It is possible to obtain a more
git-like experience by adding the following configuration option to
-your .hgrc:
+your .hgrc::
[bookmarks]
track.current = True
@@ -249,12 +249,12 @@
key = self._bookmarks[key]
return super(bookmark_repo, self).lookup(key)
- def commit(self, *k, **kw):
+ def commitctx(self, ctx, error=False):
"""Add a revision to the repository and
move the bookmark"""
wlock = self.wlock() # do both commit and bookmark with lock held
try:
- node = super(bookmark_repo, self).commit(*k, **kw)
+ node = super(bookmark_repo, self).commitctx(ctx, error)
if node is None:
return None
parents = self.changelog.parents(node)
@@ -262,12 +262,13 @@
parents = (parents[0],)
marks = parse(self)
update = False
- for mark, n in marks.items():
- if ui.configbool('bookmarks', 'track.current'):
- if mark == current(self) and n in parents:
- marks[mark] = node
- update = True
- else:
+ if ui.configbool('bookmarks', 'track.current'):
+ mark = current(self)
+ if mark and marks[mark] in parents:
+ marks[mark] = node
+ update = True
+ else:
+ for mark, n in marks.items():
if n in parents:
marks[mark] = node
update = True
@@ -288,22 +289,25 @@
node = self.changelog.tip()
marks = parse(self)
update = False
- for mark, n in marks.items():
- if n in parents:
+ if ui.configbool('bookmarks', 'track.current'):
+ mark = current(self)
+ if mark and marks[mark] in parents:
marks[mark] = node
update = True
+ else:
+ for mark, n in marks.items():
+ if n in parents:
+ marks[mark] = node
+ update = True
if update:
write(self, marks)
return result
- def tags(self):
+ def _findtags(self):
"""Merge bookmarks with normal tags"""
- if self.tagscache:
- return self.tagscache
-
- tagscache = super(bookmark_repo, self).tags()
- tagscache.update(parse(self))
- return tagscache
+ (tags, tagtypes) = super(bookmark_repo, self)._findtags()
+ tags.update(parse(self))
+ return (tags, tagtypes)
repo.__class__ = bookmark_repo
--- a/hgext/bugzilla.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/bugzilla.py Mon Oct 05 22:17:39 2009 +0200
@@ -21,65 +21,86 @@
be run by Mercurial as the user pushing the change; you will need to
ensure the Bugzilla install file permissions are set appropriately.
-Configuring the extension:
+The extension is configured through three different configuration
+sections. These keys are recognized in the [bugzilla] section:
+
+host
+ Hostname of the MySQL server holding the Bugzilla database.
+
+db
+ Name of the Bugzilla database in MySQL. Default 'bugs'.
+
+user
+ Username to use to access MySQL server. Default 'bugs'.
+
+password
+ Password to use to access MySQL server.
+
+timeout
+ Database connection timeout (seconds). Default 5.
- [bugzilla]
+version
+ Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,
+ '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior
+ to 2.18.
+
+bzuser
+ Fallback Bugzilla user name to record comments with, if changeset
+ committer cannot be found as a Bugzilla user.
+
+bzdir
+ Bugzilla install directory. Used by default notify. Default
+ '/var/www/html/bugzilla'.
+
+notify
+ The command to run to get Bugzilla to send bug change notification
+ emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)
+ and 'user' (committer bugzilla email). Default depends on version;
+ from 2.18 it is "cd %(bzdir)s && perl -T contrib/sendbugmail.pl
+ %(id)s %(user)s".
- host Hostname of the MySQL server holding the Bugzilla
- database.
- db Name of the Bugzilla database in MySQL. Default 'bugs'.
- user Username to use to access MySQL server. Default 'bugs'.
- password Password to use to access MySQL server.
- timeout Database connection timeout (seconds). Default 5.
- version Bugzilla version. Specify '3.0' for Bugzilla versions
- 3.0 and later, '2.18' for Bugzilla versions from 2.18
- and '2.16' for versions prior to 2.18.
- bzuser Fallback Bugzilla user name to record comments with, if
- changeset committer cannot be found as a Bugzilla user.
- bzdir Bugzilla install directory. Used by default notify.
- Default '/var/www/html/bugzilla'.
- notify The command to run to get Bugzilla to send bug change
- notification emails. Substitutes from a map with 3
- keys, 'bzdir', 'id' (bug id) and 'user' (committer
- bugzilla email). Default depends on version; from 2.18
- it is "cd %(bzdir)s && perl -T contrib/sendbugmail.pl
- %(id)s %(user)s".
- regexp Regular expression to match bug IDs in changeset commit
- message. Must contain one "()" group. The default
- expression matches 'Bug 1234', 'Bug no. 1234', 'Bug
- number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and
- variations thereof. Matching is case insensitive.
- style The style file to use when formatting comments.
- template Template to use when formatting comments. Overrides
- style if specified. In addition to the usual Mercurial
- keywords, the extension specifies:
- {bug} The Bugzilla bug ID.
- {root} The full pathname of the Mercurial
- repository.
- {webroot} Stripped pathname of the Mercurial
- repository.
- {hgweb} Base URL for browsing Mercurial
- repositories.
- Default 'changeset {node|short} in repo {root} refers '
- 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'
- strip The number of slashes to strip from the front of {root}
- to produce {webroot}. Default 0.
- usermap Path of file containing Mercurial committer ID to
- Bugzilla user ID mappings. If specified, the file
- should contain one mapping per line,
- "committer"="Bugzilla user". See also the [usermap]
- section.
+regexp
+ Regular expression to match bug IDs in changeset commit message.
+ Must contain one "()" group. The default expression matches 'Bug
+ 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug
+ 1234 and 5678' and variations thereof. Matching is case insensitive.
+
+style
+ The style file to use when formatting comments.
+
+template
+ Template to use when formatting comments. Overrides style if
+ specified. In addition to the usual Mercurial keywords, the
+ extension specifies::
+
+ {bug} The Bugzilla bug ID.
+ {root} The full pathname of the Mercurial repository.
+ {webroot} Stripped pathname of the Mercurial repository.
+ {hgweb} Base URL for browsing Mercurial repositories.
- [usermap]
- Any entries in this section specify mappings of Mercurial
- committer ID to Bugzilla user ID. See also [bugzilla].usermap.
- "committer"="Bugzilla user"
+ Default 'changeset {node|short} in repo {root} refers '
+ 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'
+
+strip
+ The number of slashes to strip from the front of {root} to produce
+ {webroot}. Default 0.
+
+usermap
+ Path of file containing Mercurial committer ID to Bugzilla user ID
+ mappings. If specified, the file should contain one mapping per
+ line, "committer"="Bugzilla user". See also the [usermap] section.
- [web]
- baseurl Base URL for browsing Mercurial repositories. Reference
- from templates as {hgweb}.
+The [usermap] section is used to specify mappings of Mercurial
+committer ID to Bugzilla user ID. See also [bugzilla].usermap.
+"committer"="Bugzilla user"
+
+Finally, the [web] section supports one entry:
-Activating the extension:
+baseurl
+ Base URL for browsing Mercurial repositories. Reference from
+ templates as {hgweb}.
+
+Activating the extension::
[extensions]
hgext.bugzilla =
@@ -92,7 +113,7 @@
This example configuration is for a collection of Mercurial
repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2
-installation in /opt/bugzilla-3.2.
+installation in /opt/bugzilla-3.2. ::
[bugzilla]
host=localhost
@@ -100,7 +121,9 @@
version=3.0
bzuser=unknown@domain.com
bzdir=/opt/bugzilla-3.2
- template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/rev/{node|short}\\n\\n{desc}\\n
+ template=Changeset {node|short} in {root|basename}.
+ {hgweb}/{webroot}/rev/{node|short}\\n
+ {desc}\\n
strip=5
[web]
@@ -109,7 +132,7 @@
[usermap]
user@emaildomain.com=user.name@bugzilladomain.com
-Commits add a comment to the Bugzilla bug record of the form:
+Commits add a comment to the Bugzilla bug record of the form::
Changeset 3b16791d6642 in repository-name.
http://dev.domain.com/hg/repository-name/rev/3b16791d6642
--- a/hgext/churn.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/churn.py Mon Oct 05 22:17:39 2009 +0200
@@ -24,7 +24,7 @@
def changedlines(ui, repo, ctx1, ctx2, fns):
lines = 0
- fmatch = cmdutil.match(repo, pats=fns)
+ fmatch = cmdutil.matchfiles(repo, fns)
diff = ''.join(patch.diff(repo, ctx1.node(), ctx2.node(), fmatch))
for l in diff.split('\n'):
if (l.startswith("+") and not l.startswith("+++ ") or
@@ -53,15 +53,17 @@
if opts.get('date'):
df = util.matchdate(opts['date'])
- get = util.cachefunc(lambda r: repo[r].changeset())
+ get = util.cachefunc(lambda r: repo[r])
changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
for st, rev, fns in changeiter:
+
if not st == 'add':
continue
- if df and not df(get(rev)[2][0]): # doesn't match date format
+
+ ctx = get(rev)
+ if df and not df(ctx.date()[0]): # doesn't match date format
continue
- ctx = repo[rev]
key = getkey(ctx)
key = amap.get(key, key) # alias remap
if opts.get('changesets'):
@@ -104,7 +106,7 @@
alternatively the number of matching revisions if the
--changesets option is specified.
- Examples:
+ Examples::
# display count of changed lines for every committer
hg churn -t '{author|email}'
@@ -119,12 +121,12 @@
hg churn -f '%Y' -s
It is possible to map alternate email addresses to a main address
- by providing a file using the following format:
+ by providing a file using the following format::
- <alias email> <actual email>
+ <alias email> <actual email>
- Such a file may be specified with the --aliases option, otherwise a
- .hgchurn file will be looked for in the working directory root.
+ Such a file may be specified with the --aliases option, otherwise
+ a .hgchurn file will be looked for in the working directory root.
'''
def pad(s, l):
return (s + " " * l)[:l]
@@ -143,15 +145,15 @@
if not rate:
return
- sortfn = ((not opts.get('sort')) and (lambda a, b: cmp(b[1], a[1])) or None)
- rate.sort(sortfn)
+ sortkey = ((not opts.get('sort')) and (lambda x: -x[1]) or None)
+ rate.sort(key=sortkey)
# Be careful not to have a zero maxcount (issue833)
- maxcount = float(max([v for k, v in rate])) or 1.0
- maxname = max([len(k) for k, v in rate])
+ maxcount = float(max(v for k, v in rate)) or 1.0
+ maxname = max(len(k) for k, v in rate)
ttywidth = util.termwidth()
- ui.debug(_("assuming %i character terminal\n") % ttywidth)
+ ui.debug("assuming %i character terminal\n" % ttywidth)
width = ttywidth - maxname - 2 - 6 - 2 - 2
for date, count in rate:
--- a/hgext/color.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/color.py Mon Oct 05 22:17:39 2009 +0200
@@ -29,33 +29,33 @@
function (aka ANSI escape codes). This module also provides the
render_text function, which can be used to add effects to any text.
-Default effects may be overridden from the .hgrc file:
+Default effects may be overridden from the .hgrc file::
-[color]
-status.modified = blue bold underline red_background
-status.added = green bold
-status.removed = red bold blue_background
-status.deleted = cyan bold underline
-status.unknown = magenta bold underline
-status.ignored = black bold
+ [color]
+ status.modified = blue bold underline red_background
+ status.added = green bold
+ status.removed = red bold blue_background
+ status.deleted = cyan bold underline
+ status.unknown = magenta bold underline
+ status.ignored = black bold
-# 'none' turns off all effects
-status.clean = none
-status.copied = none
+ # 'none' turns off all effects
+ status.clean = none
+ status.copied = none
-qseries.applied = blue bold underline
-qseries.unapplied = black bold
-qseries.missing = red bold
+ qseries.applied = blue bold underline
+ qseries.unapplied = black bold
+ qseries.missing = red bold
-diff.diffline = bold
-diff.extended = cyan bold
-diff.file_a = red bold
-diff.file_b = green bold
-diff.hunk = magenta
-diff.deleted = red
-diff.inserted = green
-diff.changed = white
-diff.trailingwhitespace = bold red_background
+ diff.diffline = bold
+ diff.extended = cyan bold
+ diff.file_a = red bold
+ diff.file_b = green bold
+ diff.hunk = magenta
+ diff.deleted = red
+ diff.inserted = green
+ diff.changed = white
+ diff.trailingwhitespace = bold red_background
'''
import os, sys
@@ -142,14 +142,10 @@
'''run the qseries command with colored output'''
ui.pushbuffer()
retval = orig(ui, repo, **opts)
- patches = ui.popbuffer().splitlines()
- for patch in patches:
- patchname = patch
- if opts['summary']:
- patchname = patchname.split(': ')[0]
- if ui.verbose:
- patchname = patchname.split(' ', 2)[-1]
+ patchlines = ui.popbuffer().splitlines()
+ patchnames = repo.mq.series
+ for patch, patchname in zip(patchlines, patchnames):
if opts['missing']:
effects = _patch_effects['missing']
# Determine if patch is applied.
@@ -158,13 +154,14 @@
effects = _patch_effects['applied']
else:
effects = _patch_effects['unapplied']
- ui.write(render_effects(patch, effects) + '\n')
+
+ patch = patch.replace(patchname, render_effects(patchname, effects), 1)
+ ui.write(patch + '\n')
return retval
_patch_effects = { 'applied': ['blue', 'bold', 'underline'],
- 'missing': ['red', 'bold'],
- 'unapplied': ['black', 'bold'], }
-
+ 'missing': ['red', 'bold'],
+ 'unapplied': ['black', 'bold'], }
def colorwrap(orig, s):
'''wrap ui.write for colored diff output'''
lines = s.split('\n')
@@ -220,12 +217,8 @@
'changed': ['white'],
'trailingwhitespace': ['bold', 'red_background']}
-_ui = None
-
def uisetup(ui):
'''Initialize the extension.'''
- global _ui
- _ui = ui
_setupcmd(ui, 'diff', commands.table, colordiff, _diff_effects)
_setupcmd(ui, 'incoming', commands.table, None, _diff_effects)
_setupcmd(ui, 'log', commands.table, None, _diff_effects)
@@ -233,17 +226,10 @@
_setupcmd(ui, 'tip', commands.table, None, _diff_effects)
_setupcmd(ui, 'status', commands.table, colorstatus, _status_effects)
-def extsetup():
try:
mq = extensions.find('mq')
- try:
- # If we are loaded after mq, we must wrap commands.table
- _setupcmd(_ui, 'qdiff', commands.table, colordiff, _diff_effects)
- _setupcmd(_ui, 'qseries', commands.table, colorqseries, _patch_effects)
- except error.UnknownCommand:
- # Otherwise we wrap mq.cmdtable
- _setupcmd(_ui, 'qdiff', mq.cmdtable, colordiff, _diff_effects)
- _setupcmd(_ui, 'qseries', mq.cmdtable, colorqseries, _patch_effects)
+ _setupcmd(ui, 'qdiff', mq.cmdtable, colordiff, _diff_effects)
+ _setupcmd(ui, 'qseries', mq.cmdtable, colorqseries, _patch_effects)
except KeyError:
# The mq extension is not enabled
pass
@@ -269,7 +255,7 @@
entry = extensions.wrapcommand(table, cmd, nocolor)
entry[1].extend([
('', 'color', 'auto', _("when to colorize (always, auto, or never)")),
- ('', 'no-color', None, _("don't colorize output")),
+ ('', 'no-color', None, _("don't colorize output (DEPRECATED)")),
])
for status in effectsmap:
--- a/hgext/convert/__init__.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/convert/__init__.py Mon Oct 05 22:17:39 2009 +0200
@@ -19,6 +19,7 @@
"""convert a foreign SCM repository to a Mercurial one.
Accepted source formats [identifiers]:
+
- Mercurial [hg]
- CVS [cvs]
- Darcs [darcs]
@@ -30,6 +31,7 @@
- Perforce [p4]
Accepted destination formats [identifiers]:
+
- Mercurial [hg]
- Subversion [svn] (history on branches is not preserved)
@@ -41,23 +43,28 @@
basename of the source with '-hg' appended. If the destination
repository doesn't exist, it will be created.
- By default, all sources except Mercurial will use
- --branchsort. Mercurial uses --sourcesort to preserve original
- revision numbers order. Sort modes have the following effects:
- --branchsort: convert from parent to child revision when
- possible, which means branches are usually converted one after
- the other. It generates more compact repositories.
- --datesort: sort revisions by date. Converted repositories have
- good-looking changelogs but are often an order of magnitude
- larger than the same ones generated by --branchsort.
- --sourcesort: try to preserve source revisions order, only
- supported by Mercurial sources.
+ By default, all sources except Mercurial will use --branchsort.
+ Mercurial uses --sourcesort to preserve original revision numbers
+ order. Sort modes have the following effects:
+
+ --branchsort convert from parent to child revision when possible,
+ which means branches are usually converted one after
+ the other. It generates more compact repositories.
+
+ --datesort sort revisions by date. Converted repositories have
+ good-looking changelogs but are often an order of
+ magnitude larger than the same ones generated by
+ --branchsort.
+
+ --sourcesort try to preserve source revisions order, only
+ supported by Mercurial sources.
If <REVMAP> isn't given, it will be put in a default location
(<dest>/.hg/shamap by default). The <REVMAP> is a simple text file
that maps each source commit ID to the destination ID for that
- revision, like so:
- <source ID> <destination ID>
+ revision, like so::
+
+ <source ID> <destination ID>
If the file doesn't exist, it's automatically created. It's
updated on each commit copied, so convert-repo can be interrupted
@@ -71,7 +78,7 @@
The filemap is a file that allows filtering and remapping of files
and directories. Comment lines start with '#'. Each line can
- contain one of the following directives:
+ contain one of the following directives::
include path/to/file
@@ -81,11 +88,11 @@
The 'include' directive causes a file, or all files under a
directory, to be included in the destination repository, and the
- exclusion of all other files and directories not explicitly included.
- The 'exclude' directive causes files or directories to be omitted.
- The 'rename' directive renames a file or directory. To rename from
- a subdirectory into the root of the repository, use '.' as the
- path to rename to.
+ exclusion of all other files and directories not explicitly
+ included. The 'exclude' directive causes files or directories to
+ be omitted. The 'rename' directive renames a file or directory. To
+ rename from a subdirectory into the root of the repository, use
+ '.' as the path to rename to.
The splicemap is a file that allows insertion of synthetic
history, letting you specify the parents of a revision. This is
@@ -110,7 +117,7 @@
in one repository from "default" to a named branch.
Mercurial Source
- -----------------
+ ----------------
--config convert.hg.ignoreerrors=False (boolean)
ignore integrity errors when reading. Use it to fix Mercurial
@@ -138,40 +145,43 @@
Because CVS does not have changesets, it is necessary to collect
individual commits to CVS and merge them into changesets. CVS
source uses its internal changeset merging code by default but can
- be configured to call the external 'cvsps' program by setting:
- --config convert.cvsps='cvsps -A -u --cvs-direct -q'
+ be configured to call the external 'cvsps' program by setting::
+
+ --config convert.cvsps='cvsps -A -u --cvs-direct -q'
+
This option is deprecated and will be removed in Mercurial 1.4.
The options shown are the defaults.
- Internal cvsps is selected by setting
- --config convert.cvsps=builtin
+ Internal cvsps is selected by setting ::
+
+ --config convert.cvsps=builtin
+
and has a few more configurable options:
- --config convert.cvsps.cache=True (boolean)
- Set to False to disable remote log caching, for testing and
- debugging purposes.
- --config convert.cvsps.fuzz=60 (integer)
- Specify the maximum time (in seconds) that is allowed
- between commits with identical user and log message in a
- single changeset. When very large files were checked in as
- part of a changeset then the default may not be long
- enough.
- --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'
- Specify a regular expression to which commit log messages
- are matched. If a match occurs, then the conversion
- process will insert a dummy revision merging the branch on
- which this log message occurs to the branch indicated in
- the regex.
- --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'
- Specify a regular expression to which commit log messages
- are matched. If a match occurs, then the conversion
- process will add the most recent revision on the branch
- indicated in the regex as the second parent of the
- changeset.
- The hgext/convert/cvsps wrapper script allows the builtin
+ --config convert.cvsps.cache=True (boolean)
+ Set to False to disable remote log caching, for testing and
+ debugging purposes.
+ --config convert.cvsps.fuzz=60 (integer)
+ Specify the maximum time (in seconds) that is allowed between
+ commits with identical user and log message in a single
+ changeset. When very large files were checked in as part of a
+ changeset then the default may not be long enough.
+ --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'
+ Specify a regular expression to which commit log messages are
+ matched. If a match occurs, then the conversion process will
+ insert a dummy revision merging the branch on which this log
+ message occurs to the branch indicated in the regex.
+ --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'
+ Specify a regular expression to which commit log messages are
+ matched. If a match occurs, then the conversion process will
+ add the most recent revision on the branch indicated in the
+ regex as the second parent of the changeset.
+
+ An additional "debugcvsps" Mercurial command allows the builtin
changeset merging code to be run without doing a conversion. Its
- parameters and output are similar to that of cvsps 2.1.
+ parameters and output are similar to that of cvsps 2.1. Please see
+ the command help for more details.
Subversion Source
-----------------
@@ -217,7 +227,6 @@
--config convert.p4.startrev=0 (perforce changelist number)
specify initial Perforce revision.
-
Mercurial Destination
---------------------
--- a/hgext/convert/common.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/convert/common.py Mon Oct 05 22:17:39 2009 +0200
@@ -266,7 +266,7 @@
def _run(self, cmd, *args, **kwargs):
cmdline = self._cmdline(cmd, *args, **kwargs)
- self.ui.debug(_('running: %s\n') % (cmdline,))
+ self.ui.debug('running: %s\n' % (cmdline,))
self.prerun()
try:
return util.popen(cmdline)
--- a/hgext/convert/cvs.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/convert/cvs.py Mon Oct 05 22:17:39 2009 +0200
@@ -38,8 +38,8 @@
self.lastbranch = {}
self.parent = {}
self.socket = None
- self.cvsroot = file(os.path.join(cvs, "Root")).read()[:-1]
- self.cvsrepo = file(os.path.join(cvs, "Repository")).read()[:-1]
+ self.cvsroot = open(os.path.join(cvs, "Root")).read()[:-1]
+ self.cvsrepo = open(os.path.join(cvs, "Repository")).read()[:-1]
self.encoding = locale.getpreferredencoding()
self._connect()
--- a/hgext/convert/cvsps.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/convert/cvsps.py Mon Oct 05 22:17:39 2009 +0200
@@ -12,13 +12,6 @@
from mercurial import util
from mercurial.i18n import _
-def listsort(list, key):
- "helper to sort by key in Python 2.3"
- try:
- list.sort(key=key)
- except TypeError:
- list.sort(lambda l, r: cmp(key(l), key(r)))
-
class logentry(object):
'''Class logentry has the following attributes:
.author - author name as CVS knows it
@@ -130,7 +123,7 @@
# Get the real directory in the repository
try:
- prefix = file(os.path.join('CVS','Repository')).read().strip()
+ prefix = open(os.path.join('CVS','Repository')).read().strip()
if prefix == ".":
prefix = ""
directory = prefix
@@ -142,7 +135,7 @@
# Use the Root file in the sandbox, if it exists
try:
- root = file(os.path.join('CVS','Root')).read().strip()
+ root = open(os.path.join('CVS','Root')).read().strip()
except IOError:
pass
@@ -175,7 +168,7 @@
if cache == 'update':
try:
ui.note(_('reading cvs log cache %s\n') % cachefile)
- oldlog = pickle.load(file(cachefile))
+ oldlog = pickle.load(open(cachefile))
ui.note(_('cache has %d log entries\n') % len(oldlog))
except Exception, e:
ui.note(_('error reading cache: %r\n') % e)
@@ -206,7 +199,7 @@
cmd = [util.shellquote(arg) for arg in cmd]
ui.note(_("running %s\n") % (' '.join(cmd)))
- ui.debug(_("prefix=%r directory=%r root=%r\n") % (prefix, directory, root))
+ ui.debug("prefix=%r directory=%r root=%r\n" % (prefix, directory, root))
pfp = util.popen(' '.join(cmd))
peek = pfp.readline()
@@ -385,7 +378,7 @@
e.revision[-1] == 1 and # 1.1 or 1.1.x.1
len(e.comment) == 1 and
file_added_re.match(e.comment[0])):
- ui.debug(_('found synthetic revision in %s: %r\n')
+ ui.debug('found synthetic revision in %s: %r\n'
% (e.rcs, e.comment[0]))
e.synthetic = True
@@ -419,7 +412,7 @@
if len(log) % 100 == 0:
ui.status(util.ellipsis('%d %s' % (len(log), e.file), 80)+'\n')
- listsort(log, key=lambda x:(x.rcs, x.revision))
+ log.sort(key=lambda x: (x.rcs, x.revision))
# find parent revisions of individual files
versions = {}
@@ -435,7 +428,7 @@
if cache:
if log:
# join up the old and new logs
- listsort(log, key=lambda x:x.date)
+ log.sort(key=lambda x: x.date)
if oldlog and oldlog[-1].date >= log[0].date:
raise logerror('Log cache overlaps with new log entries,'
@@ -445,7 +438,7 @@
# write the new cachefile
ui.note(_('writing cvs log cache %s\n') % cachefile)
- pickle.dump(log, file(cachefile, 'w'))
+ pickle.dump(log, open(cachefile, 'w'))
else:
log = oldlog
@@ -484,7 +477,7 @@
# Merge changesets
- listsort(log, key=lambda x:(x.comment, x.author, x.branch, x.date))
+ log.sort(key=lambda x: (x.comment, x.author, x.branch, x.date))
changesets = []
files = set()
--- a/hgext/convert/darcs.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/convert/darcs.py Mon Oct 05 22:17:39 2009 +0200
@@ -75,7 +75,7 @@
self.parents[child] = []
def after(self):
- self.ui.debug(_('cleaning up %s\n') % self.tmppath)
+ self.ui.debug('cleaning up %s\n' % self.tmppath)
shutil.rmtree(self.tmppath, ignore_errors=True)
def xml(self, cmd, **kwargs):
--- a/hgext/convert/gnuarch.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/convert/gnuarch.py Mon Oct 05 22:17:39 2009 +0200
@@ -125,7 +125,7 @@
break
def after(self):
- self.ui.debug(_('cleaning up %s\n') % self.tmppath)
+ self.ui.debug('cleaning up %s\n' % self.tmppath)
shutil.rmtree(self.tmppath, ignore_errors=True)
def getheads(self):
@@ -195,7 +195,7 @@
return os.system(cmdline)
def _update(self, rev):
- self.ui.debug(_('applying revision %s...\n') % rev)
+ self.ui.debug('applying revision %s...\n' % rev)
changeset, status = self.runlines('replay', '-d', self.tmppath,
rev)
if status:
@@ -205,7 +205,7 @@
self._obtainrevision(rev)
else:
old_rev = self.parents[rev][0]
- self.ui.debug(_('computing changeset between %s and %s...\n')
+ self.ui.debug('computing changeset between %s and %s...\n'
% (old_rev, rev))
self._parsechangeset(changeset, rev)
@@ -254,10 +254,10 @@
return changes, copies
def _obtainrevision(self, rev):
- self.ui.debug(_('obtaining revision %s...\n') % rev)
+ self.ui.debug('obtaining revision %s...\n' % rev)
output = self._execute('get', rev, self.tmppath)
self.checkexit(output)
- self.ui.debug(_('analyzing revision %s...\n') % rev)
+ self.ui.debug('analyzing revision %s...\n' % rev)
files = self._readcontents(self.tmppath)
self.changes[rev].add_files += files
@@ -284,7 +284,7 @@
self.changes[rev].summary = self.recode(self.changes[rev].summary)
# Commit revision origin when dealing with a branch or tag
- if catlog.has_key('Continuation-of'):
+ if 'Continuation-of' in catlog:
self.changes[rev].continuationof = self.recode(catlog['Continuation-of'])
except Exception:
raise util.Abort(_('could not parse cat-log of %s') % rev)
--- a/hgext/convert/hg.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/convert/hg.py Mon Oct 05 22:17:39 2009 +0200
@@ -55,12 +55,12 @@
self.filemapmode = False
def before(self):
- self.ui.debug(_('run hg sink pre-conversion action\n'))
+ self.ui.debug('run hg sink pre-conversion action\n')
self.wlock = self.repo.wlock()
self.lock = self.repo.lock()
def after(self):
- self.ui.debug(_('run hg sink post-conversion action\n'))
+ self.ui.debug('run hg sink post-conversion action\n')
self.lock.release()
self.wlock.release()
@@ -183,7 +183,7 @@
tagparent = nullid
try:
- oldlines = sorted(parentctx['.hgtags'].data().splitlines(1))
+ oldlines = sorted(parentctx['.hgtags'].data().splitlines(True))
except:
oldlines = []
@@ -348,10 +348,10 @@
self.convertfp.flush()
def before(self):
- self.ui.debug(_('run hg source pre-conversion action\n'))
+ self.ui.debug('run hg source pre-conversion action\n')
def after(self):
- self.ui.debug(_('run hg source post-conversion action\n'))
+ self.ui.debug('run hg source post-conversion action\n')
def hasnativeorder(self):
return True
--- a/hgext/convert/p4.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/convert/p4.py Mon Oct 05 22:17:39 2009 +0200
@@ -92,7 +92,7 @@
# list with depot pathnames, longest first
vieworder = views.keys()
- vieworder.sort(key=lambda x: -len(x))
+ vieworder.sort(key=len, reverse=True)
# handle revision limiting
startrev = self.ui.config('convert', 'p4.startrev', default=0)
--- a/hgext/convert/subversion.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/convert/subversion.py Mon Oct 05 22:17:39 2009 +0200
@@ -2,7 +2,6 @@
#
# Copyright(C) 2007 Daniel Holth et al
-import locale
import os
import re
import sys
@@ -23,6 +22,7 @@
from common import commandline, converter_source, converter_sink, mapfile
try:
+ raise ImportError("SVN support disabled due to license incompatibility")
from svn.core import SubversionException, Pool
import svn
import svn.client
@@ -153,11 +153,13 @@
def issvnurl(url):
try:
proto, path = url.split('://', 1)
- path = urllib.url2pathname(path)
+ if proto == 'file':
+ path = urllib.url2pathname(path)
except ValueError:
proto = 'file'
path = os.path.abspath(url)
- path = path.replace(os.sep, '/')
+ if proto == 'file':
+ path = path.replace(os.sep, '/')
check = protomap.get(proto, lambda p, p2: False)
while '/' in path:
if check(path, proto):
@@ -312,7 +314,7 @@
self.module += '/' + trunk
self.head = self.latest(self.module, self.last_changed)
if not self.head:
- raise util.Abort(_('no revision found in module %s')
+ raise util.Abort(_('no revision found in module %s')
% self.module)
# First head in the list is the module's head
@@ -455,8 +457,8 @@
# Here/tags/tag.1 discarded as well as its children.
# It happens with tools like cvs2svn. Such tags cannot
# be represented in mercurial.
- addeds = dict((p, e.copyfrom_path) for p, e
- in origpaths.iteritems()
+ addeds = dict((p, e.copyfrom_path) for p, e
+ in origpaths.iteritems()
if e.action == 'A' and e.copyfrom_path)
badroots = set()
for destroot in addeds:
@@ -532,7 +534,7 @@
"""
if not path.startswith(self.rootmodule):
# Requests on foreign branches may be forbidden at server level
- self.ui.debug(_('ignoring foreign branch %r\n') % path)
+ self.ui.debug('ignoring foreign branch %r\n' % path)
return None
if not stop:
@@ -560,7 +562,7 @@
if not path.startswith(p) or not paths[p].copyfrom_path:
continue
newpath = paths[p].copyfrom_path + path[len(p):]
- self.ui.debug(_("branch renamed from %s to %s at %d\n") %
+ self.ui.debug("branch renamed from %s to %s at %d\n" %
(path, newpath, revnum))
path = newpath
break
@@ -568,7 +570,7 @@
stream.close()
if not path.startswith(self.rootmodule):
- self.ui.debug(_('ignoring foreign branch %r\n') % path)
+ self.ui.debug('ignoring foreign branch %r\n' % path)
return None
return self.revid(dirent.created_rev, path)
@@ -580,7 +582,7 @@
prevmodule = self.prevmodule
if prevmodule is None:
prevmodule = ''
- self.ui.debug(_("reparent to %s\n") % svnurl)
+ self.ui.debug("reparent to %s\n" % svnurl)
svn.ra.reparent(self.ra, svnurl)
self.prevmodule = module
return prevmodule
@@ -613,14 +615,14 @@
copyfrom_path = self.getrelpath(ent.copyfrom_path, pmodule)
if not copyfrom_path:
continue
- self.ui.debug(_("copied to %s from %s@%s\n") %
+ self.ui.debug("copied to %s from %s@%s\n" %
(entrypath, copyfrom_path, ent.copyfrom_rev))
copies[self.recode(entrypath)] = self.recode(copyfrom_path)
elif kind == 0: # gone, but had better be a deleted *file*
- self.ui.debug(_("gone from %s\n") % ent.copyfrom_rev)
+ self.ui.debug("gone from %s\n" % ent.copyfrom_rev)
pmodule, prevnum = self.revsplit(parents[0])[1:]
parentpath = pmodule + "/" + entrypath
- self.ui.debug(_("entry %s\n") % parentpath)
+ self.ui.debug("entry %s\n" % parentpath)
# We can avoid the reparent calls if the module has
# not changed but it probably does not worth the pain.
@@ -647,7 +649,7 @@
del copies[childpath]
entries.append(childpath)
else:
- self.ui.debug(_('unknown path in revision %d: %s\n') % \
+ self.ui.debug('unknown path in revision %d: %s\n' % \
(revnum, path))
elif kind == svn.core.svn_node_dir:
# If the directory just had a prop change,
@@ -680,7 +682,7 @@
if not copyfrompath:
continue
copyfrom[path] = ent
- self.ui.debug(_("mark %s came from %s:%d\n")
+ self.ui.debug("mark %s came from %s:%d\n"
% (path, copyfrompath, ent.copyfrom_rev))
children = self._find_children(ent.copyfrom_path, ent.copyfrom_rev)
children.sort()
@@ -704,7 +706,7 @@
"""Return the parsed commit object or None, and True if
the revision is a branch root.
"""
- self.ui.debug(_("parsing revision %d (%d changes)\n") %
+ self.ui.debug("parsing revision %d (%d changes)\n" %
(revnum, len(orig_paths)))
branched = False
@@ -733,7 +735,7 @@
self.ui.note(_('found parent of branch %s at %d: %s\n') %
(self.module, prevnum, prevmodule))
else:
- self.ui.debug(_("no copyfrom path, don't know what to do.\n"))
+ self.ui.debug("no copyfrom path, don't know what to do.\n")
paths = []
# filter out unrelated paths
@@ -786,7 +788,7 @@
lastonbranch = True
break
if not paths:
- self.ui.debug(_('revision %d has no entries\n') % revnum)
+ self.ui.debug('revision %d has no entries\n' % revnum)
continue
cset, lastonbranch = parselogentry(paths, revnum, author,
date, message)
@@ -868,7 +870,7 @@
return relative
# The path is outside our tracked tree...
- self.ui.debug(_('%r is not under %r, ignoring\n') % (path, module))
+ self.ui.debug('%r is not under %r, ignoring\n' % (path, module))
return None
def _checkpath(self, path, revnum):
--- a/hgext/extdiff.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/extdiff.py Mon Oct 05 22:17:39 2009 +0200
@@ -7,14 +7,14 @@
'''command to allow external programs to compare revisions
-The `extdiff' Mercurial extension allows you to use external programs
-to compare revisions, or revision with working directory. The external diff
-programs are called with a configurable set of options and two
+The extdiff Mercurial extension allows you to use external programs
+to compare revisions, or revision with working directory. The external
+diff programs are called with a configurable set of options and two
non-option arguments: paths to directories containing snapshots of
files to compare.
-The `extdiff' extension also allows to configure new diff commands, so
-you do not need to type "hg extdiff -p kdiff3" always.
+The extdiff extension also allows to configure new diff commands, so
+you do not need to type "hg extdiff -p kdiff3" always. ::
[extdiff]
# add new command that runs GNU diff(1) in 'context diff' mode
@@ -30,21 +30,21 @@
meld =
# add new command called vimdiff, runs gvimdiff with DirDiff plugin
- # (see http://www.vim.org/scripts/script.php?script_id=102)
- # Non English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
+ # (see http://www.vim.org/scripts/script.php?script_id=102) Non
+ # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
# your .vimrc
vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)'
You can use -I/-X and list of file or directory names like normal "hg
-diff" command. The `extdiff' extension makes snapshots of only needed
+diff" command. The extdiff extension makes snapshots of only needed
files, so running the external diff program will actually be pretty
fast (at least faster than having to compare the entire tree).
'''
from mercurial.i18n import _
-from mercurial.node import short
+from mercurial.node import short, nullid
from mercurial import cmdutil, util, commands
-import os, shlex, shutil, tempfile
+import os, shlex, shutil, tempfile, re
def snapshot(ui, repo, files, node, tmproot):
'''snapshot files as of some revision
@@ -69,7 +69,7 @@
for fn in files:
wfn = util.pconvert(fn)
if not wfn in ctx:
- # skipping new file after a merge ?
+ # File doesn't exist; could be a bogus modify
continue
ui.note(' %s\n' % wfn)
dest = os.path.join(base, wfn)
@@ -96,59 +96,102 @@
revs = opts.get('rev')
change = opts.get('change')
+ args = ' '.join(diffopts)
+ do3way = '$parent2' in args
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()
+ node1a, node1b = repo.changelog.parents(node2)
else:
- node1, node2 = cmdutil.revpair(repo, revs)
+ node1a, node2 = cmdutil.revpair(repo, revs)
+ if not revs:
+ node1b = repo.dirstate.parents()[1]
+ else:
+ node1b = nullid
+
+ # Disable 3-way merge if there is only one parent
+ if do3way:
+ if node1b == nullid:
+ do3way = False
matcher = cmdutil.match(repo, pats, opts)
- modified, added, removed = repo.status(node1, node2, matcher)[:3]
- if not (modified or added or removed):
- return 0
+ mod_a, add_a, rem_a = map(set, repo.status(node1a, node2, matcher)[:3])
+ if do3way:
+ mod_b, add_b, rem_b = map(set, repo.status(node1b, node2, matcher)[:3])
+ else:
+ mod_b, add_b, rem_b = set(), set(), set()
+ modadd = mod_a | add_a | mod_b | add_b
+ common = modadd | rem_a | rem_b
+ if not common:
+ return 0
tmproot = tempfile.mkdtemp(prefix='extdiff.')
- dir2root = ''
try:
- # Always make a copy of node1
- dir1 = snapshot(ui, repo, modified + removed, node1, tmproot)[0]
- changes = len(modified) + len(removed) + len(added)
+ # Always make a copy of node1a (and node1b, if applicable)
+ dir1a_files = mod_a | rem_a | ((mod_b | add_b) - add_a)
+ dir1a = snapshot(ui, repo, dir1a_files, node1a, tmproot)[0]
+ if do3way:
+ dir1b_files = mod_b | rem_b | ((mod_a | add_a) - add_b)
+ dir1b = snapshot(ui, repo, dir1b_files, node1b, tmproot)[0]
+ else:
+ dir1b = None
+
+ fns_and_mtime = []
# If node2 in not the wc or there is >1 change, copy it
- if node2 or changes > 1:
- dir2, fns_and_mtime = snapshot(ui, repo, modified + added, node2, tmproot)
+ dir2root = ''
+ if node2:
+ dir2 = snapshot(ui, repo, modadd, node2, tmproot)[0]
+ elif len(common) > 1:
+ #we only actually need to get the files to copy back to the working
+ #dir in this case (because the other cases are: diffing 2 revisions
+ #or single file -- in which case the file is already directly passed
+ #to the diff tool).
+ dir2, fns_and_mtime = snapshot(ui, repo, modadd, None, tmproot)
else:
# This lets the diff tool open the changed file directly
dir2 = ''
dir2root = repo.root
- fns_and_mtime = []
# If only one change, diff the files instead of the directories
- if changes == 1 :
- if len(modified):
- dir1 = os.path.join(dir1, util.localpath(modified[0]))
- dir2 = os.path.join(dir2root, dir2, util.localpath(modified[0]))
- elif len(removed) :
- dir1 = os.path.join(dir1, util.localpath(removed[0]))
- dir2 = os.devnull
- else:
- dir1 = os.devnull
- dir2 = os.path.join(dir2root, dir2, util.localpath(added[0]))
+ # Handle bogus modifies correctly by checking if the files exist
+ if len(common) == 1:
+ common_file = util.localpath(common.pop())
+ dir1a = os.path.join(dir1a, common_file)
+ if not os.path.isfile(os.path.join(tmproot, dir1a)):
+ dir1a = os.devnull
+ if do3way:
+ dir1b = os.path.join(dir1b, common_file)
+ if not os.path.isfile(os.path.join(tmproot, dir1b)):
+ dir1b = os.devnull
+ dir2 = os.path.join(dir2root, dir2, common_file)
- cmdline = ('%s %s %s %s' %
- (util.shellquote(diffcmd), ' '.join(diffopts),
- util.shellquote(dir1), util.shellquote(dir2)))
- ui.debug(_('running %r in %s\n') % (cmdline, tmproot))
+ # Function to quote file/dir names in the argument string
+ # When not operating in 3-way mode, an empty string is returned for parent2
+ replace = dict(parent=dir1a, parent1=dir1a, parent2=dir1b, child=dir2)
+ def quote(match):
+ key = match.group()[1:]
+ if not do3way and key == 'parent2':
+ return ''
+ return util.shellquote(replace[key])
+
+ # Match parent2 first, so 'parent1?' will match both parent1 and parent
+ regex = '\$(parent2|parent1?|child)'
+ if not do3way and not re.search(regex, args):
+ args += ' $parent1 $child'
+ args = re.sub(regex, quote, args)
+ cmdline = util.shellquote(diffcmd) + ' ' + args
+
+ ui.debug('running %r in %s\n' % (cmdline, tmproot))
util.system(cmdline, cwd=tmproot)
for copy_fn, working_fn, mtime in fns_and_mtime:
if os.path.getmtime(copy_fn) != mtime:
- ui.debug(_('file changed while diffing. '
- 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn))
+ ui.debug('file changed while diffing. '
+ 'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn))
util.copyfile(copy_fn, working_fn)
return 1
@@ -173,11 +216,11 @@
that revision is compared to the working directory, and, when no
revisions are specified, the working directory files are compared
to its parent.'''
- program = opts['program'] or 'diff'
- if opts['program']:
- option = opts['option']
- else:
- option = opts['option'] or ['-Npru']
+ program = opts.get('program')
+ option = opts.get('option')
+ if not program:
+ program = 'diff'
+ option = option or ['-Npru']
return dodiff(ui, repo, program, option, pats, opts)
cmdtable = {
@@ -211,18 +254,17 @@
'''use closure to save diff command to use'''
def mydiff(ui, repo, *pats, **opts):
return dodiff(ui, repo, path, diffopts, pats, opts)
- mydiff.__doc__ = '''use %(path)s to diff repository (or selected files)
+ mydiff.__doc__ = _('''\
+use %(path)s to diff repository (or selected files)
- Show differences between revisions for the specified
- files, using the %(path)s program.
+ Show differences between revisions for the specified files, using the
+ %(path)s program.
- 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.''' % {
- 'path': util.uirepr(path),
- }
+ 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.\
+''') % dict(path=util.uirepr(path))
return mydiff
cmdtable[cmd] = (save(cmd, path, diffopts),
cmdtable['extdiff'][1][1:],
--- a/hgext/graphlog.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/graphlog.py Mon Oct 05 22:17:39 2009 +0200
@@ -22,48 +22,31 @@
ASCIIDATA = 'ASC'
-def asciiformat(ui, repo, revdag, opts, parentrepo=None):
- """formats a changelog DAG walk for ASCII output"""
- if parentrepo is None:
- parentrepo = repo
- showparents = [ctx.node() for ctx in parentrepo[None].parents()]
- displayer = show_changeset(ui, repo, opts, buffered=True)
- for (id, type, ctx, parentids) in revdag:
- if type != graphmod.CHANGESET:
- continue
- displayer.show(ctx)
- lines = displayer.hunk.pop(ctx.rev()).split('\n')[:-1]
- char = ctx.node() in showparents and '@' or 'o'
- yield (id, ASCIIDATA, (char, lines), parentids)
-
-def asciiedges(nodes):
+def asciiedges(seen, rev, parents):
"""adds edge info to changelog DAG walk suitable for ascii()"""
- seen = []
- for node, type, data, parents in nodes:
- if node not in seen:
- seen.append(node)
- nodeidx = seen.index(node)
+ if rev not in seen:
+ seen.append(rev)
+ nodeidx = seen.index(rev)
+
+ knownparents = []
+ newparents = []
+ for parent in parents:
+ if parent in seen:
+ knownparents.append(parent)
+ else:
+ newparents.append(parent)
- knownparents = []
- newparents = []
- for parent in parents:
- if parent in seen:
- knownparents.append(parent)
- else:
- newparents.append(parent)
+ ncols = len(seen)
+ seen[nodeidx:nodeidx + 1] = newparents
+ edges = [(nodeidx, seen.index(p)) for p in knownparents]
- ncols = len(seen)
- nextseen = seen[:]
- nextseen[nodeidx:nodeidx + 1] = newparents
- edges = [(nodeidx, nextseen.index(p)) for p in knownparents]
+ if len(newparents) > 0:
+ edges.append((nodeidx, nodeidx))
+ if len(newparents) > 1:
+ edges.append((nodeidx, nodeidx + 1))
- if len(newparents) > 0:
- edges.append((nodeidx, nodeidx))
- if len(newparents) > 1:
- edges.append((nodeidx, nodeidx + 1))
- nmorecols = len(nextseen) - ncols
- seen = nextseen
- yield (nodeidx, type, data, edges, ncols, nmorecols)
+ nmorecols = len(seen) - ncols
+ return nodeidx, edges, ncols, nmorecols
def fix_long_right_edges(edges):
for (i, (start, end)) in enumerate(edges):
@@ -95,7 +78,7 @@
else:
nodeline[2 * end] = "+"
if start > end:
- (start, end) = (end,start)
+ (start, end) = (end, start)
for i in range(2 * start + 1, 2 * end):
if nodeline[i] != "+":
nodeline[i] = "-"
@@ -117,11 +100,13 @@
line.extend(["|", " "] * (n_columns - ni - 1))
return line
-def ascii(ui, dag):
+def ascii(ui, base, type, char, text, coldata):
"""prints an ASCII graph of the DAG
- dag is a generator that emits tuples with the following elements:
+ takes the following arguments (one call per node in the graph):
+ - ui to write to
+ - A list we can keep the needed state in
- Column of the current node in the set of ongoing edges.
- Type indicator of node data == ASCIIDATA.
- Payload: (char, lines):
@@ -135,91 +120,87 @@
in the current revision. That is: -1 means one column removed;
0 means no columns added or removed; 1 means one column added.
"""
- prev_n_columns_diff = 0
- prev_node_index = 0
- for (node_index, type, (node_ch, node_lines), edges, n_columns, n_columns_diff) in dag:
- assert -2 < n_columns_diff < 2
- if n_columns_diff == -1:
- # Transform
- #
- # | | | | | |
- # o | | into o---+
- # |X / |/ /
- # | | | |
- fix_long_right_edges(edges)
-
- # add_padding_line says whether to rewrite
+ idx, edges, ncols, coldiff = coldata
+ assert -2 < coldiff < 2
+ if coldiff == -1:
+ # Transform
#
- # | | | | | | | |
- # | o---+ into | o---+
- # | / / | | | # <--- padding line
- # o | | | / /
- # o | |
- add_padding_line = (len(node_lines) > 2 and
- n_columns_diff == -1 and
- [x for (x, y) in edges if x + 1 < y])
+ # | | | | | |
+ # o | | into o---+
+ # |X / |/ /
+ # | | | |
+ fix_long_right_edges(edges)
+
+ # add_padding_line says whether to rewrite
+ #
+ # | | | | | | | |
+ # | o---+ into | o---+
+ # | / / | | | # <--- padding line
+ # o | | | / /
+ # o | |
+ add_padding_line = (len(text) > 2 and coldiff == -1 and
+ [x for (x, y) in edges if x + 1 < y])
- # fix_nodeline_tail says whether to rewrite
- #
- # | | o | | | | o | |
- # | | |/ / | | |/ /
- # | o | | into | o / / # <--- fixed nodeline tail
- # | |/ / | |/ /
- # o | | o | |
- fix_nodeline_tail = len(node_lines) <= 2 and not add_padding_line
+ # fix_nodeline_tail says whether to rewrite
+ #
+ # | | o | | | | o | |
+ # | | |/ / | | |/ /
+ # | o | | into | o / / # <--- fixed nodeline tail
+ # | |/ / | |/ /
+ # o | | o | |
+ fix_nodeline_tail = len(text) <= 2 and not add_padding_line
- # nodeline is the line containing the node character (typically o)
- nodeline = ["|", " "] * node_index
- nodeline.extend([node_ch, " "])
+ # nodeline is the line containing the node character (typically o)
+ nodeline = ["|", " "] * idx
+ nodeline.extend([char, " "])
- nodeline.extend(
- get_nodeline_edges_tail(
- node_index, prev_node_index, n_columns, n_columns_diff,
- prev_n_columns_diff, fix_nodeline_tail))
+ nodeline.extend(
+ get_nodeline_edges_tail(idx, base[1], ncols, coldiff,
+ base[0], fix_nodeline_tail))
- # shift_interline is the line containing the non-vertical
- # edges between this entry and the next
- shift_interline = ["|", " "] * node_index
- if n_columns_diff == -1:
- n_spaces = 1
- edge_ch = "/"
- elif n_columns_diff == 0:
- n_spaces = 2
- edge_ch = "|"
- else:
- n_spaces = 3
- edge_ch = "\\"
- shift_interline.extend(n_spaces * [" "])
- shift_interline.extend([edge_ch, " "] * (n_columns - node_index - 1))
+ # shift_interline is the line containing the non-vertical
+ # edges between this entry and the next
+ shift_interline = ["|", " "] * idx
+ if coldiff == -1:
+ n_spaces = 1
+ edge_ch = "/"
+ elif coldiff == 0:
+ n_spaces = 2
+ edge_ch = "|"
+ else:
+ n_spaces = 3
+ edge_ch = "\\"
+ shift_interline.extend(n_spaces * [" "])
+ shift_interline.extend([edge_ch, " "] * (ncols - idx - 1))
- # draw edges from the current node to its parents
- draw_edges(edges, nodeline, shift_interline)
+ # draw edges from the current node to its parents
+ draw_edges(edges, nodeline, shift_interline)
- # lines is the list of all graph lines to print
- lines = [nodeline]
- if add_padding_line:
- lines.append(get_padding_line(node_index, n_columns, edges))
- lines.append(shift_interline)
+ # lines is the list of all graph lines to print
+ lines = [nodeline]
+ if add_padding_line:
+ lines.append(get_padding_line(idx, ncols, edges))
+ lines.append(shift_interline)
- # make sure that there are as many graph lines as there are
- # log strings
- while len(node_lines) < len(lines):
- node_lines.append("")
- if len(lines) < len(node_lines):
- extra_interline = ["|", " "] * (n_columns + n_columns_diff)
- while len(lines) < len(node_lines):
- lines.append(extra_interline)
+ # make sure that there are as many graph lines as there are
+ # log strings
+ while len(text) < len(lines):
+ text.append("")
+ if len(lines) < len(text):
+ extra_interline = ["|", " "] * (ncols + coldiff)
+ while len(lines) < len(text):
+ lines.append(extra_interline)
- # print lines
- indentation_level = max(n_columns, n_columns + n_columns_diff)
- for (line, logstr) in zip(lines, node_lines):
- ln = "%-*s %s" % (2 * indentation_level, "".join(line), logstr)
- ui.write(ln.rstrip() + '\n')
+ # print lines
+ indentation_level = max(ncols, ncols + coldiff)
+ for (line, logstr) in zip(lines, text):
+ ln = "%-*s %s" % (2 * indentation_level, "".join(line), logstr)
+ ui.write(ln.rstrip() + '\n')
- # ... and start over
- prev_node_index = node_index
- prev_n_columns_diff = n_columns_diff
+ # ... and start over
+ base[0] = coldiff
+ base[1] = idx
def get_revs(repo, rev_opt):
if rev_opt:
@@ -235,6 +216,14 @@
if op in opts and opts[op]:
raise util.Abort(_("--graph option is incompatible with --%s") % op)
+def generate(ui, dag, displayer, showparents, edgefn):
+ seen, base = [], [0, 0]
+ for rev, type, ctx, parents in dag:
+ char = ctx.node() in showparents and '@' or 'o'
+ displayer.show(ctx)
+ lines = displayer.hunk.pop(rev).split('\n')[:-1]
+ ascii(ui, base, type, char, lines, edgefn(seen, rev, parents))
+
def graphlog(ui, repo, path=None, **opts):
"""show revision history alongside an ASCII revision graph
@@ -259,8 +248,9 @@
else:
revdag = graphmod.revisions(repo, start, stop)
- fmtdag = asciiformat(ui, repo, revdag, opts)
- ascii(ui, asciiedges(fmtdag))
+ displayer = show_changeset(ui, repo, opts, buffered=True)
+ showparents = [ctx.node() for ctx in repo[None].parents()]
+ generate(ui, revdag, displayer, showparents, asciiedges)
def graphrevs(repo, nodes, opts):
limit = cmdutil.loglimit(opts)
@@ -294,8 +284,9 @@
o = repo.changelog.nodesbetween(o, revs)[0]
revdag = graphrevs(repo, o, opts)
- fmtdag = asciiformat(ui, repo, revdag, opts)
- ascii(ui, asciiedges(fmtdag))
+ displayer = show_changeset(ui, repo, opts, buffered=True)
+ showparents = [ctx.node() for ctx in repo[None].parents()]
+ generate(ui, revdag, displayer, showparents, asciiedges)
def gincoming(ui, repo, source="default", **opts):
"""show the incoming changesets alongside an ASCII revision graph
@@ -343,8 +334,9 @@
chlist = other.changelog.nodesbetween(incoming, revs)[0]
revdag = graphrevs(other, chlist, opts)
- fmtdag = asciiformat(ui, other, revdag, opts, parentrepo=repo)
- ascii(ui, asciiedges(fmtdag))
+ displayer = show_changeset(ui, other, opts, buffered=True)
+ showparents = [ctx.node() for ctx in repo[None].parents()]
+ generate(ui, revdag, displayer, showparents, asciiedges)
finally:
if hasattr(other, 'close'):
--- a/hgext/hgcia.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/hgcia.py Mon Oct 05 22:17:39 2009 +0200
@@ -3,38 +3,38 @@
"""hooks for integrating with the CIA.vc notification service
-This is meant to be run as a changegroup or incoming hook.
-To configure it, set the following options in your hgrc:
+This is meant to be run as a changegroup or incoming hook. To
+configure it, set the following options in your hgrc::
-[cia]
-# your registered CIA user name
-user = foo
-# the name of the project in CIA
-project = foo
-# the module (subproject) (optional)
-#module = foo
-# Append a diffstat to the log message (optional)
-#diffstat = False
-# Template to use for log messages (optional)
-#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}
-# Style to use (optional)
-#style = foo
-# The URL of the CIA notification service (optional)
-# You can use mailto: URLs to send by email, eg
-# mailto:cia@cia.vc
-# Make sure to set email.from if you do this.
-#url = http://cia.vc/
-# print message instead of sending it (optional)
-#test = False
+ [cia]
+ # your registered CIA user name
+ user = foo
+ # the name of the project in CIA
+ project = foo
+ # the module (subproject) (optional)
+ #module = foo
+ # Append a diffstat to the log message (optional)
+ #diffstat = False
+ # Template to use for log messages (optional)
+ #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}
+ # Style to use (optional)
+ #style = foo
+ # The URL of the CIA notification service (optional)
+ # You can use mailto: URLs to send by email, eg
+ # mailto:cia@cia.vc
+ # Make sure to set email.from if you do this.
+ #url = http://cia.vc/
+ # print message instead of sending it (optional)
+ #test = False
-[hooks]
-# one of these:
-changegroup.cia = python:hgcia.hook
-#incoming.cia = python:hgcia.hook
+ [hooks]
+ # one of these:
+ changegroup.cia = python:hgcia.hook
+ #incoming.cia = python:hgcia.hook
-[web]
-# If you want hyperlinks (optional)
-baseurl = http://server/path/to/repo
+ [web]
+ # If you want hyperlinks (optional)
+ baseurl = http://server/path/to/repo
"""
from mercurial.i18n import _
@@ -205,7 +205,7 @@
msg['From'] = self.emailfrom
msg['Subject'] = 'DeliverXML'
msg['Content-type'] = 'text/xml'
- msgtext = msg.as_string(0)
+ msgtext = msg.as_string()
self.ui.status(_('hgcia: sending update to %s\n') % address)
mail.sendmail(self.ui, util.email(self.emailfrom),
@@ -229,10 +229,10 @@
n = bin(node)
cia = hgcia(ui, repo)
if not cia.user:
- ui.debug(_('cia: no user specified'))
+ ui.debug('cia: no user specified')
return
if not cia.project:
- ui.debug(_('cia: no project specified'))
+ ui.debug('cia: no project specified')
return
if hooktype == 'changegroup':
start = repo.changelog.rev(n)
--- a/hgext/hgk.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/hgk.py Mon Oct 05 22:17:39 2009 +0200
@@ -19,19 +19,20 @@
The hg view command will launch the hgk Tcl script. For this command
to work, hgk must be in your search path. Alternately, you can specify
-the path to hgk in your .hgrc file:
+the path to hgk in your .hgrc file::
[hgk]
path=/location/of/hgk
hgk can make use of the extdiff extension to visualize revisions.
-Assuming you had already configured extdiff vdiff command, just add:
+Assuming you had already configured extdiff vdiff command, just add::
[hgk]
vdiff=vdiff
Revisions context menu will now display additional entries to fire
-vdiff on hovered and selected revisions.'''
+vdiff on hovered and selected revisions.
+'''
import os
from mercurial import commands, util, patch, revlog, cmdutil
@@ -307,7 +308,7 @@
os.chdir(repo.root)
optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
- ui.debug(_("running %s\n") % cmd)
+ ui.debug("running %s\n" % cmd)
util.system(cmd)
cmdtable = {
--- a/hgext/highlight/__init__.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/highlight/__init__.py Mon Oct 05 22:17:39 2009 +0200
@@ -13,10 +13,10 @@
It depends on the Pygments syntax highlighting library:
http://pygments.org/
-There is a single configuration option:
+There is a single configuration option::
-[web]
-pygments_style = <style>
+ [web]
+ pygments_style = <style>
The default is 'colorful'.
"""
@@ -53,8 +53,9 @@
req.respond(common.HTTP_OK, 'text/css')
return ['/* pygments_style = %s */\n\n' % pg_style, fmter.get_style_defs('')]
-# monkeypatch in the new version
-extensions.wrapfunction(webcommands, '_filerevision', filerevision_highlight)
-extensions.wrapfunction(webcommands, 'annotate', annotate_highlight)
-webcommands.highlightcss = generate_css
-webcommands.__all__.append('highlightcss')
+def extsetup():
+ # monkeypatch in the new version
+ extensions.wrapfunction(webcommands, '_filerevision', filerevision_highlight)
+ extensions.wrapfunction(webcommands, 'annotate', annotate_highlight)
+ webcommands.highlightcss = generate_css
+ webcommands.__all__.append('highlightcss')
--- a/hgext/inotify/__init__.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/inotify/__init__.py Mon Oct 05 22:17:39 2009 +0200
@@ -13,32 +13,11 @@
from mercurial.i18n import _
from mercurial import cmdutil, util
import server
-from weakref import proxy
from client import client, QueryFailed
def serve(ui, repo, **opts):
'''start an inotify server for this repository'''
- timeout = opts.get('timeout')
- if timeout:
- timeout = float(timeout) * 1e3
-
- class service(object):
- def init(self):
- try:
- self.master = server.master(ui, repo, timeout)
- except server.AlreadyStartedException, inst:
- raise util.Abort(str(inst))
-
- def run(self):
- try:
- self.master.run()
- finally:
- self.master.shutdown()
-
- service = service()
- logfile = ui.config('inotify', 'log')
- cmdutil.service(opts, initfn=service.init, runfn=service.run,
- logfile=logfile)
+ server.start(ui, repo.dirstate, repo.root, opts)
def debuginotify(ui, repo, **opts):
'''debugging information for inotify extension
@@ -56,9 +35,6 @@
if not hasattr(repo, 'dirstate'):
return
- # XXX: weakref until hg stops relying on __del__
- repo = proxy(repo)
-
class inotifydirstate(repo.dirstate.__class__):
# We'll set this to false after an unsuccessful attempt so that
--- a/hgext/inotify/client.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/inotify/client.py Mon Oct 05 22:17:39 2009 +0200
@@ -29,12 +29,13 @@
if err[0] == errno.ECONNREFUSED:
self.ui.warn(_('(found dead inotify server socket; '
'removing it)\n'))
- os.unlink(self.repo.join('inotify.sock'))
+ os.unlink(os.path.join(self.root, '.hg', 'inotify.sock'))
if err[0] in (errno.ECONNREFUSED, errno.ENOENT) and autostart:
- self.ui.debug(_('(starting inotify server)\n'))
+ self.ui.debug('(starting inotify server)\n')
try:
try:
- server.start(self.ui, self.repo)
+ server.start(self.ui, self.dirstate, self.root,
+ dict(daemon=True, daemon_pipefds=''))
except server.AlreadyStartedException, inst:
# another process may have started its own
# inotify server while this one was starting.
@@ -50,7 +51,7 @@
'server: %s\n') % err[-1])
elif err[0] in (errno.ECONNREFUSED, errno.ENOENT):
# silently ignore normal errors if autostart is False
- self.ui.debug(_('(inotify server not running)\n'))
+ self.ui.debug('(inotify server not running)\n')
else:
self.ui.warn(_('failed to contact inotify server: %s\n')
% err[-1])
@@ -64,11 +65,12 @@
class client(object):
def __init__(self, ui, repo):
self.ui = ui
- self.repo = repo
+ self.dirstate = repo.dirstate
+ self.root = repo.root
self.sock = socket.socket(socket.AF_UNIX)
def _connect(self):
- sockpath = self.repo.join('inotify.sock')
+ sockpath = os.path.join(self.root, '.hg', 'inotify.sock')
try:
self.sock.connect(sockpath)
except socket.error, err:
--- a/hgext/inotify/server.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/inotify/server.py Mon Oct 05 22:17:39 2009 +0200
@@ -7,7 +7,7 @@
# GNU General Public License version 2, incorporated herein by reference.
from mercurial.i18n import _
-from mercurial import osutil, util
+from mercurial import cmdutil, osutil, util
import common
import errno, os, select, socket, stat, struct, sys, tempfile, time
@@ -34,13 +34,11 @@
walk_ignored_errors = (errno.ENOENT, errno.ENAMETOOLONG)
-def walkrepodirs(repo):
+def walkrepodirs(dirstate, absroot):
'''Iterate over all subdirectories of this repo.
Exclude the .hg directory, any nested repos, and ignored dirs.'''
- rootslash = repo.root + os.sep
-
def walkit(dirname, top):
- fullpath = rootslash + dirname
+ fullpath = join(absroot, dirname)
try:
for name, kind in osutil.listdir(fullpath):
if kind == stat.S_IFDIR:
@@ -49,7 +47,7 @@
return
else:
d = join(dirname, name)
- if repo.dirstate._ignore(d):
+ if dirstate._ignore(d):
continue
for subdir in walkit(d, False):
yield subdir
@@ -60,18 +58,16 @@
return walkit('', True)
-def walk(repo, root):
+def walk(dirstate, absroot, root):
'''Like os.walk, but only yields regular files.'''
# This function is critical to performance during startup.
- rootslash = repo.root + os.sep
-
def walkit(root, reporoot):
files, dirs = [], []
try:
- fullpath = rootslash + root
+ fullpath = join(absroot, root)
for name, kind in osutil.listdir(fullpath):
if kind == stat.S_IFDIR:
if name == '.hg':
@@ -80,7 +76,7 @@
else:
dirs.append(name)
path = join(root, name)
- if repo.dirstate._ignore(path):
+ if dirstate._ignore(path):
continue
for result in walkit(path, False):
yield result
@@ -89,12 +85,16 @@
yield fullpath, dirs, files
except OSError, err:
- if err.errno not in walk_ignored_errors:
+ if err.errno == errno.ENOTDIR:
+ # fullpath was a directory, but has since been replaced
+ # by a file.
+ yield fullpath, dirs, files
+ elif err.errno not in walk_ignored_errors:
raise
return walkit(root, root == '')
-def _explain_watch_limit(ui, repo):
+def _explain_watch_limit(ui, dirstate, rootabs):
path = '/proc/sys/fs/inotify/max_user_watches'
try:
limit = int(file(path).read())
@@ -108,7 +108,7 @@
ui.warn(_('*** this limit is too low to watch every '
'directory in this repository\n'))
ui.warn(_('*** counting directories: '))
- ndirs = len(list(walkrepodirs(repo)))
+ ndirs = len(list(walkrepodirs(dirstate, rootabs)))
ui.warn(_('found %d\n') % ndirs)
newlimit = min(limit, 1024)
while newlimit < ((limit + ndirs) * 1.1):
@@ -117,7 +117,7 @@
(limit, newlimit))
ui.warn(_('*** echo %d > %s\n') % (newlimit, path))
raise util.Abort(_('cannot watch %s until inotify watch limit is raised')
- % repo.root)
+ % rootabs)
class pollable(object):
"""
@@ -201,6 +201,92 @@
return wrapper
return decorator
+class directory(object):
+ """
+ Representing a directory
+
+ * path is the relative path from repo root to this directory
+ * files is a dict listing the files in this directory
+ - keys are file names
+ - values are file status
+ * dirs is a dict listing the subdirectories
+ - key are subdirectories names
+ - values are directory objects
+ """
+ def __init__(self, relpath=''):
+ self.path = relpath
+ self.files = {}
+ self.dirs = {}
+
+ def dir(self, relpath):
+ """
+ Returns the directory contained at the relative path relpath.
+ Creates the intermediate directories if necessary.
+ """
+ if not relpath:
+ return self
+ l = relpath.split('/')
+ ret = self
+ while l:
+ next = l.pop(0)
+ try:
+ ret = ret.dirs[next]
+ except KeyError:
+ d = directory(join(ret.path, next))
+ ret.dirs[next] = d
+ ret = d
+ return ret
+
+ def walk(self, states):
+ """
+ yield (filename, status) pairs for items in the trees
+ that have status in states.
+ filenames are relative to the repo root
+ """
+ for file, st in self.files.iteritems():
+ if st in states:
+ yield join(self.path, file), st
+ for dir in self.dirs.itervalues():
+ for e in dir.walk(states):
+ yield e
+
+ def lookup(self, states, path):
+ """
+ yield root-relative filenames that match path, and whose
+ status are in states:
+ * if path is a file, yield path
+ * if path is a directory, yield directory files
+ * if path is not tracked, yield nothing
+ """
+ if path[-1] == '/':
+ path = path[:-1]
+
+ paths = path.split('/')
+
+ # we need to check separately for last node
+ last = paths.pop()
+
+ tree = self
+ try:
+ for dir in paths:
+ tree = tree.dirs[dir]
+ except KeyError:
+ # path is not tracked
+ return
+
+ try:
+ # if path is a directory, walk it
+ for file, st in tree.dirs[last].walk(states):
+ yield file
+ except KeyError:
+ try:
+ if tree.files[last] in states:
+ # path is a file
+ yield path
+ except KeyError:
+ # path is not tracked
+ pass
+
class repowatcher(pollable):
"""
Watches inotify events
@@ -219,10 +305,12 @@
inotify.IN_UNMOUNT |
0)
- def __init__(self, ui, repo):
+ def __init__(self, ui, dirstate, root):
self.ui = ui
- self.repo = repo
- self.wprefix = self.repo.wjoin('')
+ self.dirstate = dirstate
+
+ self.wprefix = join(root, '')
+ self.prefixlen = len(self.wprefix)
try:
self.watcher = watcher.watcher()
except OSError, err:
@@ -231,9 +319,9 @@
self.threshold = watcher.threshold(self.watcher)
self.fileno = self.watcher.fileno
- self.tree = {}
+ self.tree = directory()
self.statcache = {}
- self.statustrees = dict([(s, {}) for s in self.statuskeys])
+ self.statustrees = dict([(s, directory()) for s in self.statuskeys])
self.last_event = None
@@ -261,7 +349,7 @@
def dirstate_info(self):
try:
- st = os.lstat(self.repo.join('dirstate'))
+ st = os.lstat(self.wprefix + '.hg/dirstate')
return st.st_mtime, st.st_ino
except OSError, err:
if err.errno != errno.ENOENT:
@@ -273,7 +361,7 @@
return
if self.watcher.path(path) is None:
if self.ui.debugflag:
- self.ui.note(_('watching %r\n') % path[len(self.wprefix):])
+ self.ui.note(_('watching %r\n') % path[self.prefixlen:])
try:
self.watcher.add(path, mask)
except OSError, err:
@@ -281,33 +369,16 @@
return
if err.errno != errno.ENOSPC:
raise
- _explain_watch_limit(self.ui, self.repo)
+ _explain_watch_limit(self.ui, self.dirstate, self.wprefix)
def setup(self):
- self.ui.note(_('watching directories under %r\n') % self.repo.root)
- self.add_watch(self.repo.path, inotify.IN_DELETE)
+ self.ui.note(_('watching directories under %r\n') % self.wprefix)
+ self.add_watch(self.wprefix + '.hg', inotify.IN_DELETE)
self.check_dirstate()
- def dir(self, tree, path):
- if path:
- for name in path.split('/'):
- tree = tree.setdefault(name, {})
- return tree
-
- def lookup(self, path, tree):
- if path:
- try:
- for name in path.split('/'):
- tree = tree[name]
- except KeyError:
- return 'x'
- except TypeError:
- return 'd'
- return tree
-
def filestatus(self, fn, st):
try:
- type_, mode, size, time = self.repo.dirstate._map[fn][:4]
+ type_, mode, size, time = self.dirstate._map[fn][:4]
except KeyError:
type_ = '?'
if type_ == 'n':
@@ -319,7 +390,7 @@
if time != int(st_mtime):
return 'l'
return 'n'
- if type_ == '?' and self.repo.dirstate._ignore(fn):
+ if type_ == '?' and self.dirstate._ignore(fn):
return 'i'
return type_
@@ -350,61 +421,54 @@
def _updatestatus(self, wfn, newstatus):
'''
- Update the stored status of a file or directory.
+ Update the stored status of a file.
newstatus: - char in (statuskeys + 'ni'), new status to apply.
- or None, to stop tracking wfn
'''
root, fn = split(wfn)
- d = self.dir(self.tree, root)
+ d = self.tree.dir(root)
- oldstatus = d.get(fn)
+ oldstatus = d.files.get(fn)
# oldstatus can be either:
# - None : fn is new
# - a char in statuskeys: fn is a (tracked) file
- # - a dict: fn is a directory
- isdir = isinstance(oldstatus, dict)
if self.ui.debugflag and oldstatus != newstatus:
- if isdir:
- self.ui.note(_('status: %r dir(%d) -> %s\n') %
- (wfn, len(oldstatus), newstatus))
- else:
- self.ui.note(_('status: %r %s -> %s\n') %
+ self.ui.note(_('status: %r %s -> %s\n') %
(wfn, oldstatus, newstatus))
- if not isdir:
- if oldstatus and oldstatus in self.statuskeys \
- and oldstatus != newstatus:
- del self.dir(self.statustrees[oldstatus], root)[fn]
- if newstatus and newstatus != 'i':
- d[fn] = newstatus
- if newstatus in self.statuskeys:
- dd = self.dir(self.statustrees[newstatus], root)
- if oldstatus != newstatus or fn not in dd:
- dd[fn] = newstatus
- else:
- d.pop(fn, None)
+
+ if oldstatus and oldstatus in self.statuskeys \
+ and oldstatus != newstatus:
+ del self.statustrees[oldstatus].dir(root).files[fn]
+
+ if newstatus in (None, 'i'):
+ d.files.pop(fn, None)
+ elif oldstatus != newstatus:
+ d.files[fn] = newstatus
+ if newstatus != 'n':
+ self.statustrees[newstatus].dir(root).files[fn] = newstatus
def check_deleted(self, key):
# Files that had been deleted but were present in the dirstate
# may have vanished from the dirstate; we must clean them up.
nuke = []
- for wfn, ignore in self.walk(key, self.statustrees[key]):
- if wfn not in self.repo.dirstate:
+ for wfn, ignore in self.statustrees[key].walk(key):
+ if wfn not in self.dirstate:
nuke.append(wfn)
for wfn in nuke:
root, fn = split(wfn)
- del self.dir(self.statustrees[key], root)[fn]
- del self.dir(self.tree, root)[fn]
+ del self.statustrees[key].dir(root).files[fn]
+ del self.tree.dir(root).files[fn]
def scan(self, topdir=''):
- ds = self.repo.dirstate._map.copy()
- self.add_watch(join(self.repo.root, topdir), self.mask)
- for root, dirs, files in walk(self.repo, topdir):
+ ds = self.dirstate._map.copy()
+ self.add_watch(join(self.wprefix, topdir), self.mask)
+ for root, dirs, files in walk(self.dirstate, self.wprefix, topdir):
for d in dirs:
self.add_watch(join(root, d), self.mask)
- wroot = root[len(self.wprefix):]
+ wroot = root[self.prefixlen:]
for fn in files:
wfn = join(wroot, fn)
self.updatefile(wfn, self.getstat(wfn))
@@ -433,23 +497,11 @@
if not self.ui.debugflag:
self.last_event = None
self.ui.note(_('%s dirstate reload\n') % self.event_time())
- self.repo.dirstate.invalidate()
+ self.dirstate.invalidate()
self.handle_timeout()
self.scan()
self.ui.note(_('%s end dirstate reload\n') % self.event_time())
- def walk(self, states, tree, prefix=''):
- # This is the "inner loop" when talking to the client.
-
- for name, val in tree.iteritems():
- path = join(prefix, name)
- try:
- if val in states:
- yield path, val
- except TypeError:
- for p in self.walk(states, val, path):
- yield p
-
def update_hgignore(self):
# An update of the ignore file can potentially change the
# states of all unknown and ignored files.
@@ -461,8 +513,8 @@
# But it's easier to do nothing than to open that can of
# worms.
- if '_ignore' in self.repo.dirstate.__dict__:
- delattr(self.repo.dirstate, '_ignore')
+ if '_ignore' in self.dirstate.__dict__:
+ delattr(self.dirstate, '_ignore')
self.ui.note(_('rescanning due to .hgignore change\n'))
self.handle_timeout()
self.scan()
@@ -505,7 +557,7 @@
try:
st = self.stat(wpath)
if stat.S_ISREG(st[0]):
- if self.repo.dirstate[wpath] in 'lmn':
+ if self.dirstate[wpath] in 'lmn':
self.updatefile(wpath, st)
except OSError:
pass
@@ -519,7 +571,7 @@
self.check_dirstate()
return
- self.deletefile(wpath, self.repo.dirstate[wpath])
+ self.deletefile(wpath, self.dirstate[wpath])
def process_create(self, wpath, evt):
if self.ui.debugflag:
@@ -537,9 +589,10 @@
(self.event_time(), wpath))
if evt.mask & inotify.IN_ISDIR:
- tree = self.dir(self.tree, wpath).copy()
- for wfn, ignore in self.walk('?', tree):
- self.deletefile(join(wpath, wfn), '?')
+ tree = self.tree.dir(wpath)
+ todelete = [wfn for wfn, ignore in tree.walk('?')]
+ for fn in todelete:
+ self.deletefile(fn, '?')
self.scan(wpath)
else:
self.deleted(wpath)
@@ -578,7 +631,13 @@
(self.event_time(), len(events)))
for evt in events:
assert evt.fullpath.startswith(self.wprefix)
- wpath = evt.fullpath[len(self.wprefix):]
+ wpath = evt.fullpath[self.prefixlen:]
+
+ # paths have been normalized, wpath never ends with a '/'
+
+ if wpath.startswith('.hg/') and evt.mask & inotify.IN_ISDIR:
+ # ignore subdirectories of .hg/ (merge, patches...)
+ continue
if evt.mask & inotify.IN_UNMOUNT:
self.process_unmount(wpath, evt)
@@ -610,18 +669,17 @@
Returns a sorted list of relatives paths currently watched,
for debugging purposes.
"""
- return sorted(tuple[0][len(self.wprefix):] for tuple in self.watcher)
+ return sorted(tuple[0][self.prefixlen:] for tuple in self.watcher)
class server(pollable):
"""
Listens for client queries on unix socket inotify.sock
"""
- def __init__(self, ui, repo, repowatcher, timeout):
+ def __init__(self, ui, root, repowatcher, timeout):
self.ui = ui
- self.repo = repo
self.repowatcher = repowatcher
self.sock = socket.socket(socket.AF_UNIX)
- self.sockpath = self.repo.join('inotify.sock')
+ self.sockpath = join(root, '.hg/inotify.sock')
self.realsockpath = None
try:
self.sock.bind(self.sockpath)
@@ -669,18 +727,13 @@
if not names:
def genresult(states, tree):
- for fn, state in self.repowatcher.walk(states, tree):
+ for fn, state in tree.walk(states):
yield fn
else:
def genresult(states, tree):
for fn in names:
- l = self.repowatcher.lookup(fn, tree)
- try:
- if l in states:
- yield fn
- except TypeError:
- for f, s in self.repowatcher.walk(states, l, fn):
- yield f
+ for f in tree.lookup(states, fn):
+ yield f
return ['\0'.join(r) for r in [
genresult('l', self.repowatcher.statustrees['l']),
@@ -754,11 +807,10 @@
raise
class master(object):
- def __init__(self, ui, repo, timeout=None):
+ def __init__(self, ui, dirstate, root, timeout=None):
self.ui = ui
- self.repo = repo
- self.repowatcher = repowatcher(ui, repo)
- self.server = server(ui, repo, self.repowatcher, timeout)
+ self.repowatcher = repowatcher(ui, dirstate, root)
+ self.server = server(ui, root, self.repowatcher, timeout)
def shutdown(self):
for obj in pollable.instances.itervalues():
@@ -771,52 +823,29 @@
sys.exit(0)
pollable.run()
-def start(ui, repo):
- def closefds(ignore):
- # (from python bug #1177468)
- # close all inherited file descriptors
- # Python 2.4.1 and later use /dev/urandom to seed the random module's RNG
- # a file descriptor is kept internally as os._urandomfd (created on demand
- # the first time os.urandom() is called), and should not be closed
- try:
- os.urandom(4)
- urandom_fd = getattr(os, '_urandomfd', None)
- except AttributeError:
- urandom_fd = None
- ignore.append(urandom_fd)
- for fd in range(3, 256):
- if fd in ignore:
- continue
+def start(ui, dirstate, root, opts):
+ timeout = opts.get('timeout')
+ if timeout:
+ timeout = float(timeout) * 1e3
+
+ class service(object):
+ def init(self):
try:
- os.close(fd)
- except OSError:
- pass
-
- m = master(ui, repo)
- sys.stdout.flush()
- sys.stderr.flush()
+ self.master = master(ui, dirstate, root, timeout)
+ except AlreadyStartedException, inst:
+ raise util.Abort(str(inst))
- pid = os.fork()
- if pid:
- return pid
-
- closefds(pollable.instances.keys())
- os.setsid()
-
- fd = os.open('/dev/null', os.O_RDONLY)
- os.dup2(fd, 0)
- if fd > 0:
- os.close(fd)
+ def run(self):
+ try:
+ self.master.run()
+ finally:
+ self.master.shutdown()
- fd = os.open(ui.config('inotify', 'log', '/dev/null'),
- os.O_RDWR | os.O_CREAT | os.O_TRUNC)
- os.dup2(fd, 1)
- os.dup2(fd, 2)
- if fd > 2:
- os.close(fd)
+ runargs = None
+ if 'inserve' not in sys.argv:
+ runargs = [sys.argv[0], 'inserve', '-R', root]
- try:
- m.run()
- finally:
- m.shutdown()
- os._exit(0)
+ service = service()
+ logfile = ui.config('inotify', 'log')
+ cmdutil.service(opts, initfn=service.init, runfn=service.run,
+ logfile=logfile, runargs=runargs)
--- a/hgext/interhg.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/interhg.py Mon Oct 05 22:17:39 2009 +0200
@@ -10,12 +10,12 @@
'''expand expressions into changelog and summaries
-This extension allows the use of a special syntax in summaries,
-which will be automatically expanded into links or any other
-arbitrary expression, much like InterWiki does.
+This extension allows the use of a special syntax in summaries, which
+will be automatically expanded into links or any other arbitrary
+expression, much like InterWiki does.
-A few example patterns (link to bug tracking, etc.) that may
-be used in your hgrc:
+A few example patterns (link to bug tracking, etc.) that may be used
+in your hgrc::
[interhg]
issues = s!issue(\\d+)!<a href="http://bts/issue\\1">issue\\1</a>!
--- a/hgext/keyword.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/keyword.py Mon Oct 05 22:17:39 2009 +0200
@@ -1,6 +1,6 @@
# keyword.py - $Keyword$ expansion for Mercurial
#
-# Copyright 2007, 2008 Christian Ebert <blacktrash@gmx.net>
+# Copyright 2007-2009 Christian Ebert <blacktrash@gmx.net>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
@@ -38,20 +38,22 @@
Configuration is done in the [keyword] and [keywordmaps] sections of
hgrc files.
-Example:
+Example::
[keyword]
# expand keywords in every python file except those matching "x*"
**.py =
x* = ignore
-Note: the more specific you are in your filename patterns
- the less you lose speed in huge repositories.
+NOTE: the more specific you are in your filename patterns the less you
+lose speed in huge repositories.
For [keywordmaps] template mapping and expansion demonstration and
-control run "hg kwdemo".
+control run "hg kwdemo". See "hg help templates" for a list of
+available templates and filters.
-An additional date template filter {date|utcdate} is provided.
+An additional date template filter {date|utcdate} is provided. It
+returns a date like "2006/09/18 15:13:13".
The default template mappings (view with "hg kwdemo -d") can be
replaced with customized keywords and templates. Again, run "hg
@@ -70,17 +72,17 @@
have been checked in.
Expansions spanning more than one line and incremental expansions,
-like CVS' $Log$, are not supported. A keyword template map
-"Log = {desc}" expands to the first line of the changeset description.
+like CVS' $Log$, are not supported. A keyword template map "Log =
+{desc}" expands to the first line of the changeset description.
'''
from mercurial import commands, cmdutil, dispatch, filelog, revlog, extensions
from mercurial import patch, localrepo, templater, templatefilters, util, match
from mercurial.hgweb import webcommands
from mercurial.lock import release
-from mercurial.node import nullid, hex
+from mercurial.node import nullid
from mercurial.i18n import _
-import re, shutil, tempfile, time
+import re, shutil, tempfile
commands.optionalrepo += ' kwdemo'
@@ -93,9 +95,8 @@
# not when reading filelog, and unexpand when reading from working dir
restricted = 'merge record resolve qfold qimport qnew qpush qrefresh qrecord'
-def utcdate(date):
- '''Returns hgdate in cvs-like UTC format.'''
- return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0]))
+# provide cvs-like UTC date filter
+utcdate = lambda x: util.datestr(x, '%Y/%m/%d %H:%M:%S')
# make keyword tools accessible
kwtools = {'templater': None, 'hgcmd': '', 'inc': [], 'exc': ['.hg*']}
@@ -125,9 +126,8 @@
kwmaps = self.ui.configitems('keywordmaps')
if kwmaps: # override default templates
- kwmaps = [(k, templater.parsestring(v, False))
- for (k, v) in kwmaps]
- self.templates = dict(kwmaps)
+ self.templates = dict((k, templater.parsestring(v, False))
+ for k, v in kwmaps)
escaped = map(re.escape, self.templates.keys())
kwpat = r'\$(%s)(: [^$\n\r]*? )??\$' % '|'.join(escaped)
self.re_kw = re.compile(kwpat)
@@ -244,12 +244,14 @@
return t2 != text
return revlog.revlog.cmp(self, node, text)
-def _status(ui, repo, kwt, unknown, *pats, **opts):
+def _status(ui, repo, kwt, *pats, **opts):
'''Bails out if [keyword] configuration is not active.
Returns status of working directory.'''
if kwt:
- match = cmdutil.match(repo, pats, opts)
- return repo.status(match=match, unknown=unknown, clean=True)
+ unknown = (opts.get('unknown') or opts.get('all')
+ or opts.get('untracked'))
+ return repo.status(match=cmdutil.match(repo, pats, opts), clean=True,
+ unknown=unknown)
if ui.configitems('keyword'):
raise util.Abort(_('[keyword] patterns cannot match'))
raise util.Abort(_('no [keyword] patterns configured'))
@@ -259,7 +261,7 @@
if repo.dirstate.parents()[1] != nullid:
raise util.Abort(_('outstanding uncommitted merge'))
kwt = kwtools['templater']
- status = _status(ui, repo, kwt, False, *pats, **opts)
+ status = _status(ui, repo, kwt, *pats, **opts)
modified, added, removed, deleted = status[:4]
if modified or added or removed or deleted:
raise util.Abort(_('outstanding uncommitted changes'))
@@ -277,10 +279,12 @@
Show current, custom, or default keyword template maps and their
expansions.
- Extend current configuration by specifying maps as arguments and
- optionally by reading from an additional hgrc file.
+ Extend the current configuration by specifying maps as arguments
+ and using -f/--rcfile to source an external hgrc file.
- Override current keyword template maps with "default" option.
+ Use -d/--default to disable current configuration.
+
+ See "hg help templates" for information on templates and filters.
'''
def demoitems(section, items):
ui.write('[%s]\n' % section)
@@ -288,40 +292,47 @@
ui.write('%s = %s\n' % (k, v))
msg = 'hg keyword config and expansion example'
- kwstatus = 'current'
fn = 'demo.txt'
branchname = 'demobranch'
tmpdir = tempfile.mkdtemp('', 'kwdemo.')
ui.note(_('creating temporary repository at %s\n') % tmpdir)
repo = localrepo.localrepository(ui, tmpdir, True)
ui.setconfig('keyword', fn, '')
+
+ uikwmaps = ui.configitems('keywordmaps')
if args or opts.get('rcfile'):
- kwstatus = 'custom'
- if opts.get('rcfile'):
- ui.readconfig(opts.get('rcfile'))
- if opts.get('default'):
- kwstatus = 'default'
+ ui.status(_('\n\tconfiguration using custom keyword template maps\n'))
+ if uikwmaps:
+ ui.status(_('\textending current template maps\n'))
+ if opts.get('default') or not uikwmaps:
+ ui.status(_('\toverriding default template maps\n'))
+ if opts.get('rcfile'):
+ ui.readconfig(opts.get('rcfile'))
+ if args:
+ # simulate hgrc parsing
+ rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
+ fp = repo.opener('hgrc', 'w')
+ fp.writelines(rcmaps)
+ fp.close()
+ ui.readconfig(repo.join('hgrc'))
+ kwmaps = dict(ui.configitems('keywordmaps'))
+ elif opts.get('default'):
+ ui.status(_('\n\tconfiguration using default keyword template maps\n'))
kwmaps = kwtemplater.templates
- if ui.configitems('keywordmaps'):
- # override maps from optional rcfile
+ if uikwmaps:
+ ui.status(_('\tdisabling current template maps\n'))
for k, v in kwmaps.iteritems():
ui.setconfig('keywordmaps', k, v)
- elif args:
- # simulate hgrc parsing
- rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
- fp = repo.opener('hgrc', 'w')
- fp.writelines(rcmaps)
- fp.close()
- ui.readconfig(repo.join('hgrc'))
- if not opts.get('default'):
- kwmaps = dict(ui.configitems('keywordmaps')) or kwtemplater.templates
+ else:
+ ui.status(_('\n\tconfiguration using current keyword template maps\n'))
+ kwmaps = dict(uikwmaps) or kwtemplater.templates
+
uisetup(ui)
reposetup(ui, repo)
for k, v in ui.configitems('extensions'):
if k.endswith('keyword'):
extension = '%s = %s' % (k, v)
break
- ui.status(_('\n\tconfig using %s keyword template maps\n') % kwstatus)
ui.write('[extensions]\n%s\n' % extension)
demoitems('keyword', ui.configitems('keyword'))
demoitems('keywordmaps', kwmaps.iteritems())
@@ -329,7 +340,7 @@
repo.wopener(fn, 'w').write(keywords)
repo.add([fn])
path = repo.wjoin(fn)
- ui.note(_('\n%s keywords written to %s:\n') % (kwstatus, path))
+ ui.note(_('\nkeywords written to %s:\n') % path)
ui.note(keywords)
ui.note('\nhg -R "%s" branch "%s"\n' % (tmpdir, branchname))
# silence branch command if not verbose
@@ -343,10 +354,9 @@
ui.note(_('unhooked all commit hooks\n'))
ui.note('hg -R "%s" ci -m "%s"\n' % (tmpdir, msg))
repo.commit(text=msg)
- fmt = ui.verbose and ' in %s' % path or ''
- ui.status(_('\n\t%s keywords expanded%s\n') % (kwstatus, fmt))
+ ui.status(_('\n\tkeywords expanded\n'))
ui.write(repo.wread(fn))
- ui.debug(_('\nremoving temporary repository %s\n') % tmpdir)
+ ui.debug('\nremoving temporary repository %s\n' % tmpdir)
shutil.rmtree(tmpdir, ignore_errors=True)
def expand(ui, repo, *pats, **opts):
@@ -366,35 +376,38 @@
[keyword] configuration patterns.
Useful to prevent inadvertent keyword expansion and to speed up
- execution by including only files that are actual candidates
- for expansion.
+ execution by including only files that are actual candidates for
+ expansion.
See "hg help keyword" on how to construct patterns both for
inclusion and exclusion of files.
- Use -u/--untracked to list untracked files as well.
+ With -A/--all and -v/--verbose the codes used to show the status
+ of files are::
- With -a/--all and -v/--verbose the codes used to show the status
- of files are:
- K = keyword expansion candidate
- k = keyword expansion candidate (untracked)
- I = ignored
- i = ignored (untracked)
+ K = keyword expansion candidate
+ k = keyword expansion candidate (not tracked)
+ I = ignored
+ i = ignored (not tracked)
'''
kwt = kwtools['templater']
- status = _status(ui, repo, kwt, opts.get('untracked'), *pats, **opts)
+ status = _status(ui, repo, kwt, *pats, **opts)
+ cwd = pats and repo.getcwd() or ''
modified, added, removed, deleted, unknown, ignored, clean = status
- files = sorted(modified + added + clean)
+ files = []
+ if not (opts.get('unknown') or opts.get('untracked')) or opts.get('all'):
+ files = sorted(modified + added + clean)
wctx = repo[None]
kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)]
- kwuntracked = [f for f in unknown if kwt.iskwfile(f, wctx.flags)]
- cwd = pats and repo.getcwd() or ''
- kwfstats = (not opts.get('ignore') and
- (('K', kwfiles), ('k', kwuntracked),) or ())
+ kwunknown = [f for f in unknown if kwt.iskwfile(f, wctx.flags)]
+ if not opts.get('ignore') or opts.get('all'):
+ showfiles = kwfiles, kwunknown
+ else:
+ showfiles = [], []
if opts.get('all') or opts.get('ignore'):
- kwfstats += (('I', [f for f in files if f not in kwfiles]),
- ('i', [f for f in unknown if f not in kwuntracked]),)
- for char, filenames in kwfstats:
+ showfiles += ([f for f in files if f not in kwfiles],
+ [f for f in unknown if f not in kwunknown])
+ for char, filenames in zip('KkIi', showfiles):
fmt = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
for f in filenames:
ui.write(fmt % repo.pathto(f, cwd))
@@ -496,7 +509,8 @@
release(lock, wlock)
# monkeypatches
- def kwpatchfile_init(orig, self, ui, fname, opener, missing=False, eol=None):
+ def kwpatchfile_init(orig, self, ui, fname, opener,
+ missing=False, eol=None):
'''Monkeypatch/wrap patch.patchfile.__init__ to avoid
rejects or conflicts due to expanded keywords in working dir.'''
orig(self, ui, fname, opener, missing, eol)
@@ -535,9 +549,12 @@
_('hg kwexpand [OPTION]... [FILE]...')),
'kwfiles':
(files,
- [('a', 'all', None, _('show keyword status flags of all files')),
+ [('A', 'all', None, _('show keyword status flags of all files')),
('i', 'ignore', None, _('show files excluded from expansion')),
- ('u', 'untracked', None, _('additionally show untracked files')),
+ ('u', 'unknown', None, _('only show unknown (not tracked) files')),
+ ('a', 'all', None,
+ _('show keyword status flags of all files (DEPRECATED)')),
+ ('u', 'untracked', None, _('only show untracked files (DEPRECATED)')),
] + commands.walkopts,
_('hg kwfiles [OPTION]... [FILE]...')),
'kwshrink': (shrink, commands.walkopts,
--- a/hgext/mq.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/mq.py Mon Oct 05 22:17:39 2009 +0200
@@ -14,19 +14,18 @@
Known patches are represented as patch files in the .hg/patches
directory. Applied patches are both patch files and changesets.
-Common tasks (use "hg help command" for more details):
+Common tasks (use "hg help command" for more details)::
-prepare repository to work with patches qinit
-create new patch qnew
-import existing patch qimport
+ prepare repository to work with patches qinit
+ create new patch qnew
+ import existing patch qimport
-print patch series qseries
-print applied patches qapplied
-print name of top applied patch qtop
+ print patch series qseries
+ print applied patches qapplied
-add known patch to applied stack qpush
-remove patch from applied stack qpop
-refresh contents of top applied patch qrefresh
+ add known patch to applied stack qpush
+ remove patch from applied stack qpop
+ refresh contents of top applied patch qrefresh
'''
from mercurial.i18n import _
@@ -143,14 +142,27 @@
if not self.updateheader(['From: ', '# User '], user):
try:
patchheaderat = self.comments.index('# HG changeset patch')
- self.comments.insert(patchheaderat + 1,'# User ' + user)
+ self.comments.insert(patchheaderat + 1, '# User ' + user)
except ValueError:
- self.comments = ['From: ' + user, ''] + self.comments
+ if self._hasheader(['Date: ']):
+ self.comments = ['From: ' + user] + self.comments
+ else:
+ tmp = ['# HG changeset patch', '# User ' + user, '']
+ self.comments = tmp + self.comments
self.user = user
def setdate(self, date):
- if self.updateheader(['# Date '], date):
- self.date = date
+ if not self.updateheader(['Date: ', '# Date '], date):
+ try:
+ patchheaderat = self.comments.index('# HG changeset patch')
+ self.comments.insert(patchheaderat + 1, '# Date ' + date)
+ except ValueError:
+ if self._hasheader(['From: ']):
+ self.comments = ['Date: ' + date] + self.comments
+ else:
+ tmp = ['# HG changeset patch', '# Date ' + date, '']
+ self.comments = tmp + self.comments
+ self.date = date
def setmessage(self, message):
if self.comments:
@@ -170,6 +182,14 @@
break
return res
+ def _hasheader(self, prefixes):
+ '''Check if a header starts with any of the given prefixes.'''
+ for prefix in prefixes:
+ for comment in self.comments:
+ if comment.startswith(prefix):
+ return True
+ return False
+
def __str__(self):
if not self.comments:
return ''
@@ -301,7 +321,7 @@
if bad:
raise util.Abort(bad)
guards = sorted(set(guards))
- self.ui.debug(_('active guards: %s\n') % ' '.join(guards))
+ self.ui.debug('active guards: %s\n' % ' '.join(guards))
self.active_guards = guards
self.guards_dirty = True
@@ -556,7 +576,7 @@
if not pushable:
self.explain_pushable(patchname, all_patches=True)
continue
- self.ui.warn(_("applying %s\n") % patchname)
+ self.ui.status(_("applying %s\n") % patchname)
pf = os.path.join(patchdir, patchname)
try:
@@ -1081,6 +1101,8 @@
except: pass
repo.dirstate.forget(f)
repo.dirstate.setparents(qp, nullid)
+ for patch in reversed(self.applied[start:end]):
+ self.ui.status(_("popping %s\n") % patch.name)
del self.applied[start:end]
self.strip(repo, rev, update=False, backup='strip')
if len(self.applied):
@@ -1344,19 +1366,24 @@
def qseries(self, repo, missing=None, start=0, length=None, status=None,
summary=False):
- def displayname(patchname):
+ def displayname(pfx, patchname):
if summary:
ph = patchheader(self.join(patchname))
msg = ph.message
msg = msg and ': ' + msg[0] or ': '
else:
msg = ''
- return '%s%s' % (patchname, msg)
+ msg = "%s%s%s" % (pfx, patchname, msg)
+ if self.ui.interactive():
+ msg = util.ellipsis(msg, util.termwidth())
+ self.ui.write(msg + '\n')
applied = set([p.name for p in self.applied])
if length is None:
length = len(self.series) - start
if not missing:
+ if self.ui.verbose:
+ idxwidth = len(str(start+length - 1))
for i in xrange(start, start+length):
patch = self.series[i]
if patch in applied:
@@ -1367,10 +1394,10 @@
stat = 'G'
pfx = ''
if self.ui.verbose:
- pfx = '%d %s ' % (i, stat)
+ pfx = '%*d %s ' % (idxwidth, i, stat)
elif status and status != stat:
continue
- self.ui.write('%s%s\n' % (pfx, displayname(patch)))
+ displayname(pfx, patch)
else:
msng_list = []
for root, dirs, files in os.walk(self.path):
@@ -1384,7 +1411,7 @@
msng_list.append(fl)
for x in sorted(msng_list):
pfx = self.ui.verbose and ('D ') or ''
- self.ui.write("%s%s\n" % (pfx, displayname(x)))
+ displayname(pfx, x)
def issaveline(self, l):
if l.name == '.hg.patches.save.line':
@@ -1537,7 +1564,7 @@
raise util.Abort(_('option "-r" not valid when importing '
'files'))
rev = cmdutil.revrange(repo, rev)
- rev.sort(lambda x, y: cmp(y, x))
+ rev.sort(reverse=True)
if (len(files) > 1 or len(rev) > 1) and patchname:
raise util.Abort(_('option "-n" not valid when importing multiple '
'patches'))
@@ -1654,17 +1681,35 @@
def applied(ui, repo, patch=None, **opts):
"""print the patches already applied"""
+
q = repo.mq
+ l = len(q.applied)
+
if patch:
if patch not in q.series:
raise util.Abort(_("patch %s is not in series file") % patch)
end = q.series.index(patch) + 1
else:
end = q.series_end(True)
- return q.qseries(repo, length=end, status='A', summary=opts.get('summary'))
+
+ if opts.get('last') and not end:
+ ui.write(_("no patches applied\n"))
+ return 1
+ elif opts.get('last') and end == 1:
+ ui.write(_("only one patch applied\n"))
+ return 1
+ elif opts.get('last'):
+ start = end - 2
+ end = 1
+ else:
+ start = 0
+
+ return q.qseries(repo, length=end, start=start, status='A',
+ summary=opts.get('summary'))
def unapplied(ui, repo, patch=None, **opts):
"""print the patches not yet applied"""
+
q = repo.mq
if patch:
if patch not in q.series:
@@ -1672,7 +1717,14 @@
start = q.series.index(patch) + 1
else:
start = q.series_end(True)
- q.qseries(repo, start=start, status='U', summary=opts.get('summary'))
+
+ if start == len(q.series) and opts.get('first'):
+ ui.write(_("all patches applied\n"))
+ return 1
+
+ length = opts.get('first') and 1 or None
+ return q.qseries(repo, start=start, length=length, status='U',
+ summary=opts.get('summary'))
def qimport(ui, repo, *filename, **opts):
"""import a patch
@@ -1847,7 +1899,7 @@
summary=opts.get('summary'))
def setupheaderopts(ui, opts):
- def do(opt,val):
+ def do(opt, val):
if not opts[opt] and opts['current' + opt]:
opts[opt] = val
do('user', ui.username())
@@ -2330,7 +2382,7 @@
if ui.verbose:
guards['NONE'] = noguards
guards = guards.items()
- guards.sort(lambda a, b: cmp(a[0][1:], b[0][1:]))
+ guards.sort(key=lambda x: x[0][1:])
if guards:
ui.note(_('guards in series file:\n'))
for guard, count in guards:
@@ -2423,34 +2475,33 @@
raise util.Abort(_('source has mq patches applied'))
return super(mqrepo, self).push(remote, force, revs)
- def tags(self):
- if self.tagscache:
- return self.tagscache
-
- tagscache = super(mqrepo, self).tags()
+ def _findtags(self):
+ '''augment tags from base class with patch tags'''
+ result = super(mqrepo, self)._findtags()
q = self.mq
if not q.applied:
- return tagscache
+ return result
mqtags = [(bin(patch.rev), patch.name) for patch in q.applied]
if mqtags[-1][0] not in self.changelog.nodemap:
self.ui.warn(_('mq status file refers to unknown node %s\n')
% short(mqtags[-1][0]))
- return tagscache
+ return result
mqtags.append((mqtags[-1][0], 'qtip'))
mqtags.append((mqtags[0][0], 'qbase'))
mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent'))
+ tags = result[0]
for patch in mqtags:
- if patch[1] in tagscache:
+ if patch[1] in tags:
self.ui.warn(_('Tag %s overrides mq patch of the same name\n')
% patch[1])
else:
- tagscache[patch[1]] = patch[0]
+ tags[patch[1]] = patch[0]
- return tagscache
+ return result
def _branchtags(self, partial, lrev):
q = self.mq
@@ -2495,7 +2546,10 @@
seriesopts = [('s', 'summary', None, _('print first line of patch header'))]
cmdtable = {
- "qapplied": (applied, [] + seriesopts, _('hg qapplied [-s] [PATCH]')),
+ "qapplied":
+ (applied,
+ [('1', 'last', None, _('show only the last patch'))] + seriesopts,
+ _('hg qapplied [-1] [-s] [PATCH]')),
"qclone":
(clone,
[('', 'pull', None, _('use pull protocol to copy metadata')),
@@ -2579,10 +2633,10 @@
[('e', 'edit', None, _('edit commit message')),
('g', 'git', None, _('use git extended diff format')),
('s', 'short', None, _('refresh only files already in the patch and specified files')),
- ('U', 'currentuser', None, _('add/update "From: <current user>" in patch')),
- ('u', 'user', '', _('add/update "From: <given user>" in patch')),
- ('D', 'currentdate', None, _('update "Date: <current date>" in patch (if present)')),
- ('d', 'date', '', _('update "Date: <given date>" in patch (if present)'))
+ ('U', 'currentuser', None, _('add/update author field in patch with current user')),
+ ('u', 'user', '', _('add/update author field in patch with given user')),
+ ('D', 'currentdate', None, _('add/update date field in patch with current date')),
+ ('d', 'date', '', _('add/update date field in patch with given date'))
] + commands.walkopts + commands.commitopts,
_('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')),
'qrename|qmv':
@@ -2618,7 +2672,10 @@
('n', 'nobackup', None, _('no backups'))],
_('hg strip [-f] [-b] [-n] REV')),
"qtop": (top, [] + seriesopts, _('hg qtop [-s]')),
- "qunapplied": (unapplied, [] + seriesopts, _('hg qunapplied [-s] [PATCH]')),
+ "qunapplied":
+ (unapplied,
+ [('1', 'first', None, _('show only the first patch'))] + seriesopts,
+ _('hg qunapplied [-1] [-s] [PATCH]')),
"qfinish":
(finish,
[('a', 'applied', None, _('finish all applied changesets'))],
--- a/hgext/notify.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/notify.py Mon Oct 05 22:17:39 2009 +0200
@@ -7,62 +7,67 @@
'''hooks for sending email notifications at commit/push time
-Subscriptions can be managed through hgrc. Default mode is to print
-messages to stdout, for testing and configuring.
+Subscriptions can be managed through a hgrc file. Default mode is to
+print messages to stdout, for testing and configuring.
-To use, configure notify extension and enable in hgrc like this:
+To use, configure the notify extension and enable it in hgrc like
+this::
- [extensions]
- hgext.notify =
+ [extensions]
+ hgext.notify =
- [hooks]
- # one email for each incoming changeset
- incoming.notify = python:hgext.notify.hook
- # batch emails when many changesets incoming at one time
- changegroup.notify = python:hgext.notify.hook
+ [hooks]
+ # one email for each incoming changeset
+ incoming.notify = python:hgext.notify.hook
+ # batch emails when many changesets incoming at one time
+ changegroup.notify = python:hgext.notify.hook
- [notify]
- # config items go in here
+ [notify]
+ # config items go here
- config items:
+Required configuration items::
- REQUIRED:
- config = /path/to/file # file containing subscriptions
+ config = /path/to/file # file containing subscriptions
+
+Optional configuration items::
- OPTIONAL:
- test = True # print messages to stdout for testing
- strip = 3 # number of slashes to strip for url paths
- domain = example.com # domain to use if committer missing domain
- style = ... # style file to use when formatting email
- template = ... # template to use when formatting email
- incoming = ... # template to use when run as incoming hook
- changegroup = ... # template when run as changegroup hook
- maxdiff = 300 # max lines of diffs to include (0=none, -1=all)
- maxsubject = 67 # truncate subject line longer than this
- diffstat = True # add a diffstat before the diff content
- sources = serve # notify if source of incoming changes in this list
- # (serve == ssh or http, push, pull, bundle)
- [email]
- from = user@host.com # email address to send as if none given
- [web]
- baseurl = http://hgserver/... # root of hg web site for browsing commits
+ test = True # print messages to stdout for testing
+ strip = 3 # number of slashes to strip for url paths
+ domain = example.com # domain to use if committer missing domain
+ style = ... # style file to use when formatting email
+ template = ... # template to use when formatting email
+ incoming = ... # template to use when run as incoming hook
+ changegroup = ... # template when run as changegroup hook
+ maxdiff = 300 # max lines of diffs to include (0=none, -1=all)
+ maxsubject = 67 # truncate subject line longer than this
+ diffstat = True # add a diffstat before the diff content
+ sources = serve # notify if source of incoming changes in this list
+ # (serve == ssh or http, push, pull, bundle)
+ merge = False # send notification for merges (default True)
+ [email]
+ from = user@host.com # email address to send as if none given
+ [web]
+ baseurl = http://hgserver/... # root of hg web site for browsing commits
- notify config file has same format as regular hgrc. it has two
- sections so you can express subscriptions in whatever way is handier
- for you.
+The notify config file has same format as a regular hgrc file. It has
+two sections so you can express subscriptions in whatever way is
+handier for you.
- [usersubs]
- # key is subscriber email, value is ","-separated list of glob patterns
- user@host = pattern
+::
+
+ [usersubs]
+ # key is subscriber email, value is ","-separated list of glob patterns
+ user@host = pattern
- [reposubs]
- # key is glob pattern, value is ","-separated list of subscriber emails
- pattern = user@host
+ [reposubs]
+ # key is glob pattern, value is ","-separated list of subscriber emails
+ pattern = user@host
- glob patterns are matched against path to repository root.
+Glob patterns are matched against path to repository root.
- if you like, you can put notify config file in repository that users
- can push changes to, they can manage their own subscriptions.'''
+If you like, you can put notify config file in repository that users
+can push changes to, they can manage their own subscriptions.
+'''
from mercurial.i18n import _
from mercurial import patch, cmdutil, templater, util, mail
@@ -107,6 +112,7 @@
self.test = self.ui.configbool('notify', 'test', True)
self.charsets = mail._charsets(self.ui)
self.subs = self.subscribers()
+ self.merge = self.ui.configbool('notify', 'merge', True)
mapfile = self.ui.config('notify', 'style')
template = (self.ui.config('notify', hooktype) or
@@ -161,11 +167,14 @@
def url(self, path=None):
return self.ui.config('web', 'baseurl') + (path or self.root)
- def node(self, ctx):
- '''format one changeset.'''
+ def node(self, ctx, **props):
+ '''format one changeset, unless it is a suppressed merge.'''
+ if not self.merge and len(ctx.parents()) > 1:
+ return False
self.t.show(ctx, changes=ctx.changeset(),
baseurl=self.ui.config('web', 'baseurl'),
- root=self.repo.root, webroot=self.root)
+ root=self.repo.root, webroot=self.root, **props)
+ return True
def skipsource(self, source):
'''true if incoming changes from this source should be skipped.'''
@@ -226,7 +235,7 @@
hash(self.repo.root), socket.getfqdn()))
msg['To'] = ', '.join(self.subs)
- msgtext = msg.as_string(0)
+ msgtext = msg.as_string()
if self.test:
self.ui.write(msgtext)
if not msgtext.endswith('\n'):
@@ -272,23 +281,36 @@
ctx = repo[node]
if not n.subs:
- ui.debug(_('notify: no subscribers to repository %s\n') % n.root)
+ ui.debug('notify: no subscribers to repository %s\n' % n.root)
return
if n.skipsource(source):
- ui.debug(_('notify: changes have source "%s" - skipping\n') % source)
+ ui.debug('notify: changes have source "%s" - skipping\n' % source)
return
ui.pushbuffer()
+ data = ''
+ count = 0
if hooktype == 'changegroup':
start, end = ctx.rev(), len(repo)
- count = end - start
for rev in xrange(start, end):
- n.node(repo[rev])
- n.diff(ctx, repo['tip'])
+ if n.node(repo[rev]):
+ count += 1
+ else:
+ data += ui.popbuffer()
+ ui.note(_('notify: suppressing notification for merge %d:%s\n') %
+ (rev, repo[rev].hex()[:12]))
+ ui.pushbuffer()
+ if count:
+ n.diff(ctx, repo['tip'])
else:
- count = 1
- n.node(ctx)
+ if not n.node(ctx):
+ ui.popbuffer()
+ ui.note(_('notify: suppressing notification for merge %d:%s\n') %
+ (ctx.rev(), ctx.hex()[:12]))
+ return
+ count += 1
n.diff(ctx)
- data = ui.popbuffer()
- n.send(ctx, count, data)
+ data += ui.popbuffer()
+ if count:
+ n.send(ctx, count, data)
--- a/hgext/pager.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/pager.py Mon Oct 05 22:17:39 2009 +0200
@@ -14,7 +14,7 @@
'''browse command output with an external pager
-To set the pager that should be used, set the application variable:
+To set the pager that should be used, set the application variable::
[pager]
pager = LESS='FSRX' less
@@ -23,19 +23,19 @@
$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.
If you notice "BROKEN PIPE" error messages, you can disable them by
-setting:
+setting::
[pager]
quiet = True
You can disable the pager for certain commands by adding them to the
-pager.ignore list:
+pager.ignore list::
[pager]
ignore = version, help, update
You can also enable the pager only for certain commands using
-pager.attend:
+pager.attend::
[pager]
attend = log
--- a/hgext/parentrevspec.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/parentrevspec.py Mon Oct 05 22:17:39 2009 +0200
@@ -10,15 +10,15 @@
This extension allows you to use git-style suffixes to refer to the
ancestors of a specific revision.
-For example, if you can refer to a revision as "foo", then:
+For example, if you can refer to a revision as "foo", then::
-- foo^N = Nth parent of foo
+ foo^N = Nth parent of foo
foo^0 = foo
foo^1 = first parent of foo
foo^2 = second parent of foo
foo^ = foo^1
-- foo~N = Nth first grandparent of foo
+ foo~N = Nth first grandparent of foo
foo~0 = foo
foo~1 = foo^1 = foo^ = first parent of foo
foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo
--- a/hgext/patchbomb.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/patchbomb.py Mon Oct 05 22:17:39 2009 +0200
@@ -14,11 +14,9 @@
first line of the changeset description as the subject text. The
message contains two or three body parts:
- The changeset description.
-
- [Optional] The result of running diffstat on the patch.
-
- The patch itself, as generated by "hg export".
+- The changeset description.
+- [Optional] The result of running diffstat on the patch.
+- The patch itself, as generated by "hg export".
Each message refers to the first in the series using the In-Reply-To
and References headers, so they will show up as a sequence in threaded
@@ -29,7 +27,7 @@
you are sending the right changes.
To configure other defaults, add a section like this to your hgrc
-file:
+file::
[email]
from = My Name <my@email>
@@ -52,13 +50,13 @@
patchbomb message in a pager or sending the messages directly, it will
create a UNIX mailbox file with the patch emails. This mailbox file
can be previewed with any mail user agent which supports UNIX mbox
-files, e.g. with mutt:
+files, e.g. with mutt::
% mutt -R -f mbox
-When you are previewing the patchbomb messages, you can use `formail'
+When you are previewing the patchbomb messages, you can use ``formail``
(a utility that is commonly installed as part of the procmail
-package), to send each message out:
+package), to send each message out::
% formail -s sendmail -bm -t < mbox
@@ -68,9 +66,10 @@
to be a sendmail compatible mailer or fill out the [smtp] section so
that the patchbomb extension can automatically send patchbombs
directly from the commandline. See the [email] and [smtp] sections in
-hgrc(5) for details.'''
+hgrc(5) for details.
+'''
-import os, errno, socket, tempfile, cStringIO
+import os, errno, socket, tempfile, cStringIO, time
import email.MIMEMultipart, email.MIMEBase
import email.Utils, email.Encoders, email.Generator
from mercurial import cmdutil, commands, hg, mail, patch, util
@@ -163,12 +162,16 @@
body += '\n'.join(patch)
msg = mail.mimetextpatch(body, display=opts.get('test'))
+ flag = ' '.join(opts.get('flag'))
+ if flag:
+ flag = ' ' + flag
+
subj = desc[0].strip().rstrip('. ')
if total == 1 and not opts.get('intro'):
- subj = '[PATCH] ' + (opts.get('subject') or subj)
+ subj = '[PATCH%s] %s' % (flag, opts.get('subject') or subj)
else:
tlen = len(str(total))
- subj = '[PATCH %0*d of %d] %s' % (tlen, idx, total, subj)
+ subj = '[PATCH %0*d of %d%s] %s' % (tlen, idx, total, flag, subj)
msg['Subject'] = mail.headencode(ui, subj, _charsets, opts.get('test'))
msg['X-Mercurial-Node'] = node
return msg, subj
@@ -201,22 +204,22 @@
single email containing a binary Mercurial bundle as an attachment
will be sent.
- Examples:
+ Examples::
- hg email -r 3000 # send patch 3000 only
- hg email -r 3000 -r 3001 # send patches 3000 and 3001
- hg email -r 3000:3005 # send patches 3000 through 3005
- hg email 3000 # send patch 3000 (deprecated)
+ hg email -r 3000 # send patch 3000 only
+ hg email -r 3000 -r 3001 # send patches 3000 and 3001
+ hg email -r 3000:3005 # send patches 3000 through 3005
+ hg email 3000 # send patch 3000 (deprecated)
- hg email -o # send all patches not in default
- hg email -o DEST # send all patches not in DEST
- hg email -o -r 3000 # send all ancestors of 3000 not in default
- hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST
+ hg email -o # send all patches not in default
+ hg email -o DEST # send all patches not in DEST
+ hg email -o -r 3000 # send all ancestors of 3000 not in default
+ hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST
- hg email -b # send bundle of all patches not in default
- hg email -b DEST # send bundle of all patches not in DEST
- hg email -b -r 3000 # bundle of all ancestors of 3000 not in default
- hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST
+ hg email -b # send bundle of all patches not in default
+ hg email -b DEST # send bundle of all patches not in DEST
+ hg email -b -r 3000 # bundle of all ancestors of 3000 not in default
+ hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST
Before using this command, you will need to enable email in your
hgrc. See the [email] section in hgrc(5) for details.
@@ -323,11 +326,13 @@
if len(patches) > 1 or opts.get('intro'):
tlen = len(str(len(patches)))
- subj = '[PATCH %0*d of %d] %s' % (
- tlen, 0, len(patches),
- opts.get('subject') or
- prompt(ui, 'Subject:',
- rest=' [PATCH %0*d of %d] ' % (tlen, 0, len(patches))))
+ flag = ' '.join(opts.get('flag'))
+ if flag:
+ subj = '[PATCH %0*d of %d %s] ' % (tlen, 0, len(patches), flag)
+ else:
+ subj = '[PATCH %0*d of %d] ' % (tlen, 0, len(patches))
+ subj += opts.get('subject') or prompt(ui, 'Subject:', rest=subj,
+ default='None')
body = ''
if opts.get('diffstat'):
@@ -417,7 +422,7 @@
first = False
m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version()
- m['Date'] = email.Utils.formatdate(start_time[0])
+ m['Date'] = email.Utils.formatdate(start_time[0], localtime=True)
start_time = (start_time[0] + 1, start_time[1])
m['From'] = sender
@@ -446,7 +451,7 @@
ui.status(_('Writing '), subj, ' ...\n')
fp = open(opts.get('mbox'), 'In-Reply-To' in m and 'ab+' or 'wb+')
generator = email.Generator.Generator(fp, mangle_from_=True)
- date = util.datestr(start_time, '%a %b %d %H:%M:%S %Y')
+ date = time.ctime(start_time[0])
fp.write('From %s %s\n' % (sender_addr, date))
generator.flatten(m, 0)
fp.write('\n\n')
@@ -478,6 +483,7 @@
_('subject of first message (intro or single patch)')),
('', 'in-reply-to', '',
_('message identifier to reply to')),
+ ('', 'flag', [], _('flags to add in subject prefixes')),
('t', 'to', [], _('email addresses of recipients')),
]
--- a/hgext/purge.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/purge.py Mon Oct 05 22:17:39 2009 +0200
@@ -3,8 +3,8 @@
# This is a small extension for Mercurial (http://mercurial.selenic.com/)
# that removes files not known to mercurial
#
-# This program was inspired by the "cvspurge" script contained in CVS utilities
-# (http://www.red-bean.com/cvsutils/).
+# This program was inspired by the "cvspurge" script contained in CVS
+# utilities (http://www.red-bean.com/cvsutils/).
#
# For help on the usage of "hg purge" use:
# hg help purge
@@ -36,13 +36,16 @@
and uncommitted changes in an otherwise-clean source tree.
This means that purge will delete:
- - Unknown files: files marked with "?" by "hg status"
- - Empty directories: in fact Mercurial ignores directories unless
- they contain files under source control management
+
+ - Unknown files: files marked with "?" by "hg status"
+ - Empty directories: in fact Mercurial ignores directories unless
+ they contain files under source control management
+
But it will leave untouched:
- - Modified and unmodified tracked files
- - Ignored files (unless --all is specified)
- - New files added to the repository (with "hg add")
+
+ - Modified and unmodified tracked files
+ - Ignored files (unless --all is specified)
+ - New files added to the repository (with "hg add")
If directories are given on the command line, only files in these
directories are considered.
--- a/hgext/rebase.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/rebase.py Mon Oct 05 22:17:39 2009 +0200
@@ -11,7 +11,7 @@
repository.
For more information:
-http://mercurial.selenic.com/wiki/RebaseProject
+http://mercurial.selenic.com/wiki/RebaseExtension
'''
from mercurial import util, repair, merge, cmdutil, commands, error
@@ -35,7 +35,7 @@
if not first:
ancestor.ancestor = newancestor
else:
- repo.ui.debug(_("first revision, do not change ancestor\n"))
+ repo.ui.debug("first revision, do not change ancestor\n")
stats = merge.update(repo, rev, True, True, False)
return stats
@@ -149,7 +149,7 @@
"""Skip commit if collapsing has been required and rev is not the last
revision, commit otherwise
"""
- repo.ui.debug(_(" set parents\n"))
+ repo.ui.debug(" set parents\n")
if collapse and not last:
repo.dirstate.setparents(repo[p1].node())
return None
@@ -187,23 +187,23 @@
def rebasenode(repo, rev, target, state, skipped, targetancestors, collapse,
extrafn):
'Rebase a single revision'
- repo.ui.debug(_("rebasing %d:%s\n") % (rev, repo[rev]))
+ repo.ui.debug("rebasing %d:%s\n" % (rev, repo[rev]))
p1, p2 = defineparents(repo, rev, target, state, targetancestors)
- repo.ui.debug(_(" future parents are %d and %d\n") % (repo[p1].rev(),
+ repo.ui.debug(" future parents are %d and %d\n" % (repo[p1].rev(),
repo[p2].rev()))
# Merge phase
if len(repo.parents()) != 2:
# Update to target and merge it with local
if repo['.'].rev() != repo[p1].rev():
- repo.ui.debug(_(" update to %d:%s\n") % (repo[p1].rev(), repo[p1]))
+ repo.ui.debug(" update to %d:%s\n" % (repo[p1].rev(), repo[p1]))
merge.update(repo, p1, False, True, False)
else:
- repo.ui.debug(_(" already in target\n"))
+ repo.ui.debug(" already in target\n")
repo.dirstate.write()
- repo.ui.debug(_(" merge against %d:%s\n") % (repo[rev].rev(), repo[rev]))
+ repo.ui.debug(" merge against %d:%s\n" % (repo[rev].rev(), repo[rev]))
first = repo[rev].rev() == repo[min(state)].rev()
stats = rebasemerge(repo, rev, first)
@@ -211,7 +211,7 @@
raise util.Abort(_('fix unresolved conflicts with hg resolve then '
'run hg rebase --continue'))
else: # we have an interrupted rebase
- repo.ui.debug(_('resuming interrupted rebase\n'))
+ repo.ui.debug('resuming interrupted rebase\n')
# Keep track of renamed files in the revision that is going to be rebased
# Here we simulate the copies and renames in the source changeset
@@ -234,7 +234,7 @@
else:
if not collapse:
repo.ui.note(_('no changes, revision %d skipped\n') % rev)
- repo.ui.debug(_('next revision set to %s\n') % p1)
+ repo.ui.debug('next revision set to %s\n' % p1)
skipped.add(rev)
state[rev] = p1
@@ -280,7 +280,7 @@
mqrebase = {}
for p in repo.mq.applied:
if repo[p.rev].rev() in state:
- repo.ui.debug(_('revision %d is an mq patch (%s), finalize it.\n') %
+ repo.ui.debug('revision %d is an mq patch (%s), finalize it.\n' %
(repo[p.rev].rev(), p.name))
mqrebase[repo[p.rev].rev()] = (p.name, isagitpatch(repo, p.name))
@@ -290,7 +290,7 @@
# We must start import from the newest revision
for rev in sorted(mqrebase, reverse=True):
if rev not in skipped:
- repo.ui.debug(_('import mq patch %d (%s)\n')
+ repo.ui.debug('import mq patch %d (%s)\n'
% (state[rev], mqrebase[rev][0]))
repo.mq.qimport(repo, (), patchname=mqrebase[rev][0],
git=mqrebase[rev][1],rev=[str(state[rev])])
@@ -311,7 +311,7 @@
newrev = repo[v].hex()
f.write("%s:%s\n" % (oldrev, newrev))
f.close()
- repo.ui.debug(_('rebase status stored\n'))
+ repo.ui.debug('rebase status stored\n')
def clearstatus(repo):
'Remove the status files'
@@ -342,7 +342,7 @@
else:
oldrev, newrev = l.split(':')
state[repo[oldrev].rev()] = repo[newrev].rev()
- repo.ui.debug(_('rebase status resumed\n'))
+ repo.ui.debug('rebase status resumed\n')
return originalwd, target, state, collapse, keep, keepbranches, external
except IOError, err:
if err.errno != errno.ENOENT:
@@ -392,12 +392,12 @@
cwd = repo['.'].rev()
if cwd == dest:
- repo.ui.debug(_('already working on current\n'))
+ repo.ui.debug('already working on current\n')
return None
targetancestors = set(repo.changelog.ancestors(dest))
if cwd in targetancestors:
- repo.ui.debug(_('already working on the current branch\n'))
+ repo.ui.debug('already working on the current branch\n')
return None
cwdancestors = set(repo.changelog.ancestors(cwd))
@@ -405,7 +405,7 @@
rebasingbranch = cwdancestors - targetancestors
source = min(rebasingbranch)
- repo.ui.debug(_('rebase onto %d starting from %d\n') % (dest, source))
+ repo.ui.debug('rebase onto %d starting from %d\n' % (dest, source))
state = dict.fromkeys(repo.changelog.descendants(source), nullrev)
external = nullrev
if collapse:
@@ -429,8 +429,8 @@
if opts.get('rebase'):
if opts.get('update'):
del opts['update']
- ui.debug(_('--update and --rebase are not compatible, ignoring '
- 'the update flag\n'))
+ ui.debug('--update and --rebase are not compatible, ignoring '
+ 'the update flag\n')
cmdutil.bail_if_changed(repo)
revsprepull = len(repo)
--- a/hgext/record.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/record.py Mon Oct 05 22:17:39 2009 +0200
@@ -291,25 +291,28 @@
_('Record &all changes to all remaining files'),
_('&Quit, recording no changes'),
_('&?'))
- r = (ui.prompt("%s %s " % (query, resps), choices)
- or _('y')).lower()
- if r == _('?'):
+ r = ui.promptchoice("%s %s " % (query, resps), choices)
+ if r == 7: # ?
doc = gettext(record.__doc__)
c = doc.find(_('y - record this change'))
for l in doc[c:].splitlines():
if l: ui.write(l.strip(), '\n')
continue
- elif r == _('s'):
- r = resp_file[0] = 'n'
- elif r == _('f'):
- r = resp_file[0] = 'y'
- elif r == _('d'):
- r = resp_all[0] = 'n'
- elif r == _('a'):
- r = resp_all[0] = 'y'
- elif r == _('q'):
+ elif r == 0: # yes
+ ret = 'y'
+ elif r == 1: # no
+ ret = 'n'
+ elif r == 2: # Skip
+ ret = resp_file[0] = 'n'
+ elif r == 3: # file (Record remaining)
+ ret = resp_file[0] = 'y'
+ elif r == 4: # done, skip remaining
+ ret = resp_all[0] = 'n'
+ elif r == 5: # all
+ ret = resp_all[0] = 'y'
+ elif r == 6: # quit
raise util.Abort(_('user quit'))
- return r
+ return ret
pos, total = 0, len(chunks) - 1
while chunks:
chunk = chunks.pop()
@@ -362,19 +365,19 @@
You will be prompted for whether to record changes to each
modified file, and for files with multiple changes, for each
change to use. For each query, the following responses are
- possible:
+ possible::
- y - record this change
- n - skip this change
+ y - record this change
+ n - skip this change
- s - skip remaining changes to this file
- f - record remaining changes to this file
+ s - skip remaining changes to this file
+ f - record remaining changes to this file
- d - done, skip remaining changes and files
- a - record all changes to all remaining files
- q - quit, recording no changes
+ d - done, skip remaining changes and files
+ a - record all changes to all remaining files
+ q - quit, recording no changes
- ? - display help'''
+ ? - display help'''
def record_committer(ui, repo, pats, opts):
commands.commit(ui, repo, *pats, **opts)
@@ -409,7 +412,7 @@
def recordfunc(ui, repo, message, match, opts):
"""This is generic record driver.
- It's job is to interactively filter local changes, and accordingly
+ Its job is to interactively filter local changes, and accordingly
prepare working dir into a state, where the job can be delegated to
non-interactive commit command such as 'commit' or 'qrefresh'.
@@ -460,7 +463,7 @@
fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.',
dir=backupdir)
os.close(fd)
- ui.debug(_('backup %r as %r\n') % (f, tmpname))
+ ui.debug('backup %r as %r\n' % (f, tmpname))
util.copyfile(repo.wjoin(f), tmpname)
backups[f] = tmpname
@@ -478,7 +481,7 @@
# 3b. (apply)
if dopatch:
try:
- ui.debug(_('applying patch\n'))
+ ui.debug('applying patch\n')
ui.debug(fp.getvalue())
pfiles = {}
patch.internalpatch(fp, ui, 1, repo.root, files=pfiles,
@@ -509,7 +512,7 @@
# 5. finally restore backed-up files
try:
for realname, tmpname in backups.iteritems():
- ui.debug(_('restoring %r to %r\n') % (tmpname, realname))
+ ui.debug('restoring %r to %r\n' % (tmpname, realname))
util.copyfile(tmpname, repo.wjoin(realname))
os.unlink(tmpname)
os.rmdir(backupdir)
--- a/hgext/share.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/share.py Mon Oct 05 22:17:39 2009 +0200
@@ -5,7 +5,6 @@
'''share a common history between several working directories'''
-import os
from mercurial.i18n import _
from mercurial import hg, commands
--- a/hgext/transplant.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/transplant.py Mon Oct 05 22:17:39 2009 +0200
@@ -439,9 +439,9 @@
Selected changesets will be applied on top of the current working
directory with the log of the original changeset. If --log is
- specified, log messages will have a comment appended of the form:
+ specified, log messages will have a comment appended of the form::
- (transplanted from CHANGESETHASH)
+ (transplanted from CHANGESETHASH)
You can rewrite the changelog message with the --filter option.
Its argument will be invoked with the current changelog message as
--- a/hgext/win32mbcs.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/win32mbcs.py Mon Oct 05 22:17:39 2009 +0200
@@ -19,19 +19,22 @@
operation.
This extension is useful for:
- * Japanese Windows users using shift_jis encoding.
- * Chinese Windows users using big5 encoding.
- * All users who use a repository with one of problematic encodings on
- case-insensitive file system.
+
+- Japanese Windows users using shift_jis encoding.
+- Chinese Windows users using big5 encoding.
+- All users who use a repository with one of problematic encodings on
+ case-insensitive file system.
This extension is not needed for:
- * Any user who use only ASCII chars in path.
- * Any user who do not use any of problematic encodings.
+
+- Any user who use only ASCII chars in path.
+- Any user who do not use any of problematic encodings.
Note that there are some limitations on using this extension:
- * You should use single encoding in one repository.
- * You should set same encoding for the repository by locale or
- HGENCODING.
+
+- You should use single encoding in one repository.
+- You should set same encoding for the repository by locale or
+ HGENCODING.
Path encoding conversion are done between Unicode and
encoding.encoding which is decided by Mercurial from current locale
@@ -98,7 +101,7 @@
if args:
args = list(args)
args[0] = appendsep(args[0])
- if kwds.has_key('path'):
+ if 'path' in kwds:
kwds['path'] = appendsep(kwds['path'])
return func(*args, **kwds)
@@ -139,6 +142,6 @@
for f in funcs.split():
wrapname(f, wrapper)
wrapname("mercurial.osutil.listdir", wrapperforlistdir)
- ui.debug(_("[win32mbcs] activated with encoding: %s\n")
+ ui.debug("[win32mbcs] activated with encoding: %s\n"
% encoding.encoding)
--- a/hgext/win32text.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/win32text.py Mon Oct 05 22:17:39 2009 +0200
@@ -7,30 +7,30 @@
'''perform automatic newline conversion
-To perform automatic newline conversion, use:
+To perform automatic newline conversion, use::
-[extensions]
-hgext.win32text =
-[encode]
-** = cleverencode:
-# or ** = macencode:
+ [extensions]
+ hgext.win32text =
+ [encode]
+ ** = cleverencode:
+ # or ** = macencode:
-[decode]
-** = cleverdecode:
-# or ** = macdecode:
+ [decode]
+ ** = cleverdecode:
+ # or ** = macdecode:
-If not doing conversion, to make sure you do not commit CRLF/CR by accident:
+If not doing conversion, to make sure you do not commit CRLF/CR by accident::
-[hooks]
-pretxncommit.crlf = python:hgext.win32text.forbidcrlf
-# or pretxncommit.cr = python:hgext.win32text.forbidcr
+ [hooks]
+ pretxncommit.crlf = python:hgext.win32text.forbidcrlf
+ # or pretxncommit.cr = python:hgext.win32text.forbidcr
To do the same check on a server to prevent CRLF/CR from being
-pushed or pulled:
+pushed or pulled::
-[hooks]
-pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
-# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
+ [hooks]
+ pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
+ # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
'''
from mercurial.i18n import _
--- a/hgext/zeroconf/__init__.py Mon Oct 05 22:01:08 2009 +0200
+++ b/hgext/zeroconf/__init__.py Mon Oct 05 22:17:39 2009 +0200
@@ -12,15 +12,15 @@
without knowing their actual IP address.
To allow other people to discover your repository using run "hg serve"
-in your repository.
+in your repository::
- $ cd test
- $ hg serve
+ $ cd test
+ $ hg serve
-You can discover zeroconf enabled repositories by running "hg paths".
+You can discover zeroconf enabled repositories by running "hg paths"::
- $ hg paths
- zc-test = http://example.com:8000/test
+ $ hg paths
+ zc-test = http://example.com:8000/test
'''
import Zeroconf, socket, time, os
@@ -109,12 +109,13 @@
def __init__(self, conf, baseui=None):
super(hgwebdirzc, self).__init__(conf, baseui)
prefix = self.ui.config("web", "prefix", "").strip('/') + '/'
- for r, p in self.repos:
+ for repo, path in self.repos:
u = self.ui.copy()
- u.readconfig(os.path.join(p, '.hg', 'hgrc'))
- n = os.path.basename(r)
- path = (prefix + r).strip('/')
- publish(n, "hgweb", path, int(u.config("web", "port", 8000)))
+ u.readconfig(os.path.join(path, '.hg', 'hgrc'))
+ name = os.path.basename(repo)
+ path = (prefix + repo).strip('/')
+ desc = u.config('web', 'description', name)
+ publish(name, desc, path, int(u.config("web", "port", 8000)))
# listen
@@ -136,25 +137,24 @@
Zeroconf.ServiceBrowser(server, "_hg._tcp.local.", l)
time.sleep(1)
server.close()
- for v in l.found.values():
- n = v.name[:v.name.index('.')]
- n.replace(" ", "-")
- u = "http://%s:%s%s" % (socket.inet_ntoa(v.address), v.port,
- v.properties.get("path", "/"))
- yield "zc-" + n, u
+ for value in l.found.values():
+ name = value.name[:value.name.index('.')]
+ url = "http://%s:%s%s" % (socket.inet_ntoa(value.address), value.port,
+ value.properties.get("path", "/"))
+ yield "zc-" + name, url
def config(orig, self, section, key, default=None, untrusted=False):
if section == "paths" and key.startswith("zc-"):
- for n, p in getzcpaths():
- if n == key:
- return p
+ for name, path in getzcpaths():
+ if name == key:
+ return path
return orig(self, section, key, default, untrusted)
def configitems(orig, self, section, untrusted=False):
- r = orig(self, section, untrusted)
+ repos = orig(self, section, untrusted)
if section == "paths":
- r += getzcpaths()
- return r
+ repos += getzcpaths()
+ return repos
extensions.wrapfunction(ui.ui, 'config', config)
extensions.wrapfunction(ui.ui, 'configitems', configitems)
--- a/i18n/da.po Mon Oct 05 22:01:08 2009 +0200
+++ b/i18n/da.po Mon Oct 05 22:17:39 2009 +0200
@@ -17,8 +17,8 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2009-07-20 23:05+0200\n"
-"PO-Revision-Date: 2009-07-21 00:18+0200\n"
+"POT-Creation-Date: 2009-09-29 00:26+0200\n"
+"PO-Revision-Date: 2009-09-29 00:41+0200\n"
"Last-Translator: <mg@lazybytes.net>\n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
@@ -1007,7 +1007,8 @@
#, python-format
msgid ""
"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
-msgstr "uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)"
+msgstr ""
+"uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)"
#, python-format
msgid "%d bytes missing from remote file"
@@ -1086,6 +1087,10 @@
msgid "%d changeset entries\n"
msgstr "%d ændringer\n"
+#, python-format
+msgid "darcs version 2.1 or newer needed (found %r)"
+msgstr ""
+
msgid "Python ElementTree module is not available"
msgstr "Python ElementTree modulet er ikke tilstede"
@@ -1492,10 +1497,6 @@
msgstr "sammenføjer med %d:%s\n"
#, python-format
-msgid "Automated merge with %s"
-msgstr "Automatisk sammenføjning med %s"
-
-#, python-format
msgid "new changeset %d:%s merges remote changes with local\n"
msgstr "ny ændring %d:%s fletter fjernændringer sammen med lokale\n"
@@ -1576,10 +1577,6 @@
"arbejdskopien af .hgsigs er ændret (deponer venligst .hgsigs manuelt eller "
"brug --force)"
-#, python-format
-msgid "Added signature for changeset %s"
-msgstr "Tilføjede underskrift af ændring %s"
-
msgid "unknown signature version"
msgstr "ukendt underskrift-version"
@@ -2133,7 +2130,9 @@
msgid ""
"\n"
"%s keywords written to %s:\n"
-msgstr "\n%s nøgleord skrevet til %s:\n"
+msgstr ""
+"\n"
+"%s nøgleord skrevet til %s:\n"
msgid "unhooked all commit hooks\n"
msgstr ""
@@ -3789,22 +3788,22 @@
msgstr ""
msgid "cannot use both abort and continue"
-msgstr ""
+msgstr "abort og continue kan ikke angives samtidig"
msgid "cannot use collapse with continue or abort"
-msgstr ""
+msgstr "continue eller abort kan ikke angives samtidig med collapse"
msgid "abort and continue do not allow specifying revisions"
-msgstr ""
+msgstr "abort og continue tillader ikke at der angives revisioner"
msgid "cannot specify both a revision and a base"
-msgstr ""
+msgstr "man kan ikke angive både en revision og en basis"
msgid "nothing to rebase\n"
msgstr ""
msgid "cannot use both keepbranches and extrafn"
-msgstr ""
+msgstr "man kan ikke bruge både keepbranches og extrafn"
msgid "rebase merging completed\n"
msgstr ""
@@ -3817,7 +3816,7 @@
#, python-format
msgid "%d revisions have been skipped\n"
-msgstr ""
+msgstr "sprang %d revisioner over\n"
msgid " set parents\n"
msgstr ""
@@ -4275,7 +4274,7 @@
msgstr ""
#, python-format
-msgid "[win32mbcs] filename conversion fail with %s encoding\n"
+msgid "[win32mbcs] filename conversion failed with %s encoding\n"
msgstr ""
msgid "[win32mbcs] cannot activate on this platform.\n"
@@ -4668,12 +4667,27 @@
" be expensive.\n"
" "
msgstr ""
+"tilføj alle nye filer, fjern alle manglende filer\n"
+"\n"
+" Tilføj alle nye filer og fjern alle manglende filer fra depotet.\n"
+"\n"
+" Nye filer bliver ignoreret hvis de matcher et af mønstrene i\n"
+" .hgignore. Som ved add, så træder disse ændringer først i kræft\n"
+" ved næste commit.\n"
+"\n"
+" Brug -s/--similarity tilvalget for at opdage omdøbte filer. Med en\n"
+" parameter større end 0 bliver hver fjernet fil sammenlignet med\n"
+" enhver tilføjet fil og filer der er tilstrækkelig ens bliver\n"
+" opført som omdøbte. Dette tilvalg tager et procenttal mellem 0\n"
+" (slået fra) og 100 (filer skal være identiske) som parameter. At\n"
+" opdage omdøbninger på denne måde kan være dyrt.\n"
+" "
msgid "similarity must be a number"
-msgstr ""
+msgstr "lighedsgrad skal være et tal"
msgid "similarity must be between 0 and 100"
-msgstr ""
+msgstr "lighedsgrad skal være mellem 0 og 100"
msgid ""
"show changeset information by line for each file\n"
@@ -4705,10 +4719,10 @@
" "
msgid "at least one filename or pattern is required"
-msgstr ""
+msgstr "kræver mindst et filnavn eller mønster"
msgid "at least one of -n/-c is required for -l"
-msgstr ""
+msgstr "brug af -l kræver mindst en af -n/-c"
#, python-format
msgid "%s: binary file\n"
@@ -4744,10 +4758,10 @@
msgstr "intet arbejdskatalog: angive venligst en revision"
msgid "repository root cannot be destination"
-msgstr ""
+msgstr "depotets rod kan ikke bruges som destination"
msgid "cannot archive plain files to stdout"
-msgstr ""
+msgstr "flade filer kan ikke arkiveres til standarduddata"
msgid ""
"reverse effect of earlier changeset\n"
@@ -4806,11 +4820,7 @@
msgstr "%s er ikke forælder til %s"
msgid "cannot use --parent on non-merge changeset"
-msgstr ""
-
-#, python-format
-msgid "Backed out changeset %s"
-msgstr ""
+msgstr "kan ikke bruge --parent på en ændringer som ikke er en sammenføjning"
#, python-format
msgid "changeset %s backs out changeset %s\n"
@@ -4824,7 +4834,7 @@
msgstr ""
msgid "(use \"backout --merge\" if you want to auto-merge)\n"
-msgstr ""
+msgstr "(brug \"backout --merge\" hvis du vil sammenføje automatisk)\n"
msgid ""
"subdivision search of changesets\n"
@@ -4872,7 +4882,7 @@
msgstr ""
msgid "(use of 'hg bisect <cmd>' is deprecated)\n"
-msgstr ""
+msgstr "(formen 'hg bisect <kommando>' er forældet)\n"
msgid "incompatible arguments"
msgstr "inkompatible argumenter"
@@ -4883,7 +4893,7 @@
#, python-format
msgid "failed to execute %s"
-msgstr ""
+msgstr "kunne ikke køre %s"
#, python-format
msgid "%s killed"
@@ -4917,10 +4927,27 @@
" 'hg commit --close-branch' to mark this branch as closed.\n"
" "
msgstr ""
+"angiv eller vis navnet på den aktuelle gren\n"
+"\n"
+" Uden noget argument vises navnet på den nuværende gren. Med et\n"
+" argument angives arbejdskatalogets grennavn (grenen eksisterer\n"
+" ikke i depotet før næste deponering). Det anbefales at den primære\n"
+" udvikling foretages på 'default' grenen.\n"
+"\n"
+" Med mindre -f/--force bruges, så vil branch ikke lade dig bruge et\n"
+" grennavn som allerede eksisterer, selv hvis det er inaktivt.\n"
+"\n"
+" Brug -C/--clean for at nulstille arbejdskatalogs gren til samme\n"
+" gren dets forældre-ændring og derved negere end tidligere ændring.\n"
+"\n"
+" Brug kommandoen 'hg update' for at skifte til en eksisterende\n"
+" gren. Brug 'hg commit --close-branch' for at markere denne gren\n"
+" som lukket.\n"
+" "
#, python-format
msgid "reset working directory to branch %s\n"
-msgstr ""
+msgstr "nulstil arbejdskataloget til gren %s\n"
msgid "a branch of the same name already exists (use --force to override)"
msgstr ""
@@ -5003,6 +5030,22 @@
" %p root-relative path name of file being printed\n"
" "
msgstr ""
+"udskriv den aktuelle eller en given revision af filer\n"
+"\n"
+" Udskriver de angivne filer som de så ud ved den givne revision.\n"
+" Hvis der ikke angves en revision, så bruges forældre-revisionen\n"
+" til arbejdskataloget, eller spidsen hvis der ikke er hentet noget\n"
+" arbejdskatalog.\n"
+"\n"
+" Output kan gemmes i en fil hvis navn angives med et formatstreng.\n"
+" Reglerne for formatteringen er de samme som for export-kommandoen\n"
+" med følgende tilføjelser:\n"
+"\n"
+" %s grundnavn for filen som udskrives\n"
+" %d katalognavn for filen som blvier udskrevet\n"
+" eller '.' hvis filen er i katalogets rod\n"
+" %p rod-relativ sti for filen som bliver udkrevet\n"
+" "
msgid ""
"make a copy of an existing repository\n"
@@ -5525,24 +5568,29 @@
"\n"
" With no arguments, show all repository head changesets.\n"
"\n"
-" Repository \"heads\" are changesets that don't have child\n"
-" changesets. They are where development generally takes place and\n"
-" are the usual targets for update and merge operations.\n"
+" Repository \"heads\" are changesets with no child changesets. They are\n"
+" where development generally takes place and are the usual targets\n"
+" for update and merge operations.\n"
"\n"
" If one or more REV is given, the \"branch heads\" will be shown for\n"
-" the named branch associated with that revision. The name of the\n"
-" branch is called the revision's branch tag.\n"
-"\n"
-" Branch heads are revisions on a given named branch that do not have\n"
-" any descendants on the same branch. A branch head could be a true head\n"
-" or it could be the last changeset on a branch before a new branch\n"
-" was created. If none of the branch heads are true heads, the branch\n"
-" is considered inactive. If -c/--closed is specified, also show branch\n"
-" heads marked closed (see hg commit --close-branch).\n"
-"\n"
-" If STARTREV is specified only those heads (or branch heads) that\n"
-" are descendants of STARTREV will be displayed.\n"
-" "
+" the named branch associated with the specified changeset(s).\n"
+"\n"
+" Branch heads are changesets on a named branch with no descendants on\n"
+" the same branch. A branch head could be a \"true\" (repository) head,\n"
+" or it could be the last changeset on that branch before it was\n"
+" merged into another branch, or it could be the last changeset on the\n"
+" branch before a new branch was created. If none of the branch heads\n"
+" are true heads, the branch is considered inactive.\n"
+"\n"
+" If -c/--closed is specified, also show branch heads marked closed\n"
+" (see hg commit --close-branch).\n"
+"\n"
+" If STARTREV is specified, only those heads that are descendants of\n"
+" STARTREV will be displayed.\n"
+" "
+msgstr ""
+
+msgid "you must specify a branch to use --closed"
msgstr ""
#, python-format
@@ -6403,17 +6451,9 @@
msgstr "mærkaten '%s' er ikke en lokal mærkat"
#, python-format
-msgid "Removed tag %s"
-msgstr "Mærke %s er fjernet"
-
-#, python-format
msgid "tag '%s' already exists (use -f to force)"
msgstr "mærkaten '%s' eksisterer allerede (brug -f for at gennemtvinge)"
-#, python-format
-msgid "Added tag %s for changeset %s"
-msgstr "Tilføjede mærkat %s til ændring %s"
-
msgid ""
"list repository tags\n"
"\n"
@@ -6511,6 +6551,9 @@
" Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n"
" "
+msgid "cannot specify both -c/--check and -C/--clean"
+msgstr "man kan ikke angive både -c/--check og -C/--clean"
+
msgid "uncommitted local changes"
msgstr "udeponerede lokale ændringer"
@@ -6525,6 +6568,14 @@
" integrity of their crosslinks and indices.\n"
" "
msgstr ""
+"verificer depotets integritet\n"
+"\n"
+" Verificer integreteten af det aktuelle depot.\n"
+"\n"
+" Dette vil lave en udførlig kontrol af depotets integritet.\n"
+" Hashværdier og tjeksummer valideres for hver indgang i\n"
+" historikfilen, manifæstet og fulgte filer. Desuden valideres\n"
+" integriteten af deres krydslinks og indekser."
msgid "output version and copyright information"
msgstr "udskriv version- og copyrightinformation"
@@ -6539,6 +6590,11 @@
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
+"\n"
+"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> og andre\n"
+"Dette er frit programmel; se kildekoden for kopieringsbetingelser. Der\n"
+"gives INGEN GARANTI; ikke engang for SALGBARHED eller EGNETHED FOR\n"
+"NOGET BESTEMT FORMÃ…L.\n"
msgid "repository root directory or symbolic path name"
msgstr "depotrodfolder eller symbolsk stinavn"
@@ -6721,10 +6777,10 @@
msgstr "[-gbsr] [-c KOMMANDO] [REV]"
msgid "set branch name even if it shadows an existing branch"
-msgstr ""
+msgstr "sæt grennavnet selv hvis det overskygger en eksisterende gren"
msgid "reset branch name to parent branch name"
-msgstr ""
+msgstr "nulstil grennavnet til forældre-grennavnet"
msgid "[-fC] [NAME]"
msgstr "[-fC] [NAVN]"
@@ -6732,8 +6788,8 @@
msgid "show only branches that have unmerged heads"
msgstr "vil kun grene som har usammenføjne hoveder"
-msgid "show normal and closed heads"
-msgstr "vis normale og lukkede hoveder"
+msgid "show normal and closed branches"
+msgstr "vis normale og lukkede grene"
msgid "[-a]"
msgstr "[-a]"
@@ -6847,7 +6903,7 @@
msgstr "[TILVALG]... [-r REV1 [-r REV2]] [FIL]..."
msgid "diff against the second parent"
-msgstr ""
+msgstr "find forskelle i forhold til den anden forældre"
msgid "[OPTION]... [-o OUTFILESPEC] REV..."
msgstr "[TILVALG]... [-o UDFILSPECIFIKATION] REV..."
@@ -6879,8 +6935,11 @@
msgid "show only heads which are descendants of REV"
msgstr "vis kun hoveder som er efterkommere af REV"
-msgid "show only the active heads from open branches"
-msgstr "vis kun aktive hoveder fra åbne grene"
+msgid "show only the active branch heads from open branches"
+msgstr "vis kun de aktive grenhoveder fra åbne grene"
+
+msgid "show normal and closed branch heads"
+msgstr "vis normale og lukkede grenhoveder"
msgid "[-r STARTREV] [REV]..."
msgstr "[-r STARTREV] [REV]..."
@@ -7766,22 +7825,21 @@
" Mercurial supports several ways to specify individual revisions.\n"
"\n"
" A plain integer is treated as a revision number. Negative integers\n"
-" are treated as topological offsets from the tip, with -1 denoting\n"
-" the tip. As such, negative numbers are only useful if you've\n"
-" memorized your local tree numbers and want to save typing a single\n"
-" digit. This editor suggests copy and paste.\n"
+" are treated as sequential offsets from the tip, with -1 denoting\n"
+" the tip, -2 denoting the revision prior to the tip, and so forth.\n"
"\n"
" A 40-digit hexadecimal string is treated as a unique revision\n"
" identifier.\n"
"\n"
" A hexadecimal string less than 40 characters long is treated as a\n"
-" unique revision identifier, and referred to as a short-form\n"
+" unique revision identifier and is referred to as a short-form\n"
" identifier. A short-form identifier is only valid if it is the\n"
" prefix of exactly one full-length identifier.\n"
"\n"
-" Any other string is treated as a tag name, which is a symbolic\n"
-" name associated with a revision identifier. Tag names may not\n"
-" contain the \":\" character.\n"
+" Any other string is treated as a tag or branch name. A tag name is\n"
+" a symbolic name associated with a revision identifier. A branch\n"
+" name denotes the tipmost revision of that branch. Tag and branch\n"
+" names must not contain the \":\" character.\n"
"\n"
" The reserved name \"tip\" is a special tag that always identifies\n"
" the most recent revision.\n"
@@ -7943,13 +8001,19 @@
" - nonempty: Any text. Returns '(none)' if the string is empty.\n"
" - hgdate: Date. Returns the date as a pair of numbers:\n"
" \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
-" - isodate: Date. Returns the date in ISO 8601 format.\n"
+" - isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18\n"
+" 13:00 +0200\".\n"
+" - isodatesec: Date. Returns the date in ISO 8601 format, including\n"
+" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
+" rfc3339date filter.\n"
" - localdate: Date. Converts a date to local date.\n"
" - obfuscate: Any text. Returns the input text rendered as a\n"
" sequence of XML entities.\n"
" - person: Any text. Returns the text before an email address.\n"
" - rfc822date: Date. Returns a date using the same format used\n"
-" in email headers.\n"
+" in email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+" - rfc3339date: Date. Returns a date using the Internet date format\n"
+" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
" - short: Changeset hash. Returns the short form of a changeset\n"
" hash, i.e. a 12-byte hexadecimal string.\n"
" - shortdate: Date. Returns a date like \"2006-09-18\".\n"
--- a/i18n/hggettext Mon Oct 05 22:01:08 2009 +0200
+++ b/i18n/hggettext Mon Oct 05 22:17:39 2009 +0200
@@ -112,6 +112,11 @@
print poentry(path, lineno, func.__doc__)
+def rawtext(path):
+ src = open(path).read()
+ print poentry(path, 1, src)
+
+
if __name__ == "__main__":
# It is very important that we import the Mercurial modules from
# the source tree where hggettext is executed. Otherwise we might
@@ -120,4 +125,7 @@
sys.path.insert(0, os.getcwd())
from mercurial import demandimport; demandimport.enable()
for path in sys.argv[1:]:
- docstrings(path)
+ if path.endswith('.txt'):
+ rawtext(path)
+ else:
+ docstrings(path)
--- a/i18n/pt_BR.po Mon Oct 05 22:01:08 2009 +0200
+++ b/i18n/pt_BR.po Mon Oct 05 22:17:39 2009 +0200
@@ -9812,22 +9812,21 @@
" Mercurial supports several ways to specify individual revisions.\n"
"\n"
" A plain integer is treated as a revision number. Negative integers\n"
-" are treated as topological offsets from the tip, with -1 denoting\n"
-" the tip. As such, negative numbers are only useful if you've\n"
-" memorized your local tree numbers and want to save typing a single\n"
-" digit. This editor suggests copy and paste.\n"
+" are treated as sequential offsets from the tip, with -1 denoting\n"
+" the tip, -2 denoting the revision prior to the tip, and so forth.\n"
"\n"
" A 40-digit hexadecimal string is treated as a unique revision\n"
" identifier.\n"
"\n"
" A hexadecimal string less than 40 characters long is treated as a\n"
-" unique revision identifier, and referred to as a short-form\n"
+" unique revision identifier and is referred to as a short-form\n"
" identifier. A short-form identifier is only valid if it is the\n"
" prefix of exactly one full-length identifier.\n"
"\n"
-" Any other string is treated as a tag name, which is a symbolic\n"
-" name associated with a revision identifier. Tag names may not\n"
-" contain the \":\" character.\n"
+" Any other string is treated as a tag or branch name. A tag name is\n"
+" a symbolic name associated with a revision identifier. A branch\n"
+" name denotes the tipmost revision of that branch. Tag and branch\n"
+" names must not contain the \":\" character.\n"
"\n"
" The reserved name \"tip\" is a special tag that always identifies\n"
" the most recent revision.\n"
@@ -9846,23 +9845,22 @@
" individuais.\n"
"\n"
" Um simples inteiro é tratado como um número de revisão. Inteiros\n"
-" negativos são tratados como contados topologicamente a partir da\n"
-" tip, com -1 denotando a tip. Assim, números negativos são úteis\n"
-" apenas se você memorizou os números de sua árvore local e quiser\n"
-" evitar digitar um único caractere. Este editor sugere copiar e\n"
-" colar.\n"
+" negativos são contados a partir da tip, com -1 denotando a tip,\n"
+" -2 denotando a revisão anterior à tip, e assim por diante.\n"
"\n"
" Uma string hexadecimal de 40 dÃgitos é tratada como um\n"
" identificador único de revisão.\n"
"\n"
" Uma string hexadecimal de menos de 40 caracteres é tratada como\n"
-" um identificador único de revisão, e referida como um\n"
-" identificador curto. Um identificador curto é válido apenas se\n"
-" for o prefixo de um identificador completo.\n"
-"\n"
-" Qualquer outra string é tratada como um nome de etiqueta, que é\n"
-" um nome simbólico associado a um identificador de revisão. Nomes\n"
-" de etiqueta não podem conter o caractere \":\".\n"
+" um identificador único de revisão, chamado de identificador\n"
+" curto. Um identificador curto é válido apenas se for o prefixo\n"
+" de um identificador completo.\n"
+"\n"
+" Qualquer outra string é tratada como um nome de etiqueta ou\n"
+" ramo. Um nome de etiqueta é um nome simbólico associado a um\n"
+" identificador de revisão. Um nome de ramo denota a revisão mais\n"
+" recente de tal ramo. Nomes de etiqueta ou de ramo não podem\n"
+" conter o caractere \":\".\n"
"\n"
" O nome reservado \"tip\" é uma etiqueta especial que sempre\n"
" identifica a revisão mais recente.\n"
@@ -10076,13 +10074,19 @@
" - nonempty: Any text. Returns '(none)' if the string is empty.\n"
" - hgdate: Date. Returns the date as a pair of numbers:\n"
" \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
-" - isodate: Date. Returns the date in ISO 8601 format.\n"
+" - isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18\n"
+" 13:00 +0200\".\n"
+" - isodatesec: Date. Returns the date in ISO 8601 format, including\n"
+" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
+" rfc3339date filter.\n"
" - localdate: Date. Converts a date to local date.\n"
" - obfuscate: Any text. Returns the input text rendered as a\n"
" sequence of XML entities.\n"
" - person: Any text. Returns the text before an email address.\n"
" - rfc822date: Date. Returns a date using the same format used\n"
-" in email headers.\n"
+" in email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+" - rfc3339date: Date. Returns a date using the Internet date format\n"
+" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
" - short: Changeset hash. Returns the short form of a changeset\n"
" hash, i.e. a 12-byte hexadecimal string.\n"
" - shortdate: Date. Returns a date like \"2006-09-18\".\n"
@@ -10186,14 +10190,17 @@
" - nonempty: Qualquer texto. Devolve (none) se o texto for vazio.\n"
" - hgdate: Data. Devolve a data como um par de números:\n"
" \"1157407993 25200\" (timestamp Unix, defasagem de fuso)\n"
-" - isodate: Data. Devolve a data em formato ISO 8601.\n"
+" - isodate: Data. Devolve a data em formato ISO 8601: \"2009-08-18\n"
+" 13:00 +0200\".\n"
" - localdate: Data. Converte para data local.\n"
" - obfuscate: Qualquer texto. Devolve o texto de entrada\n"
" renderizado como uma seqüência de entidades XML.\n"
" - person: Qualquer texto. Devolve o texto antes de um endereço\n"
" de e-mail.\n"
-" - rfc822date: Data. Devolve uma data usando o mesmo formato\n"
-" utilizado em cabeçalhos de e-mail.\n"
+" - rfc822date: Data. Devolve uma data usando o mesmo formato utilizado\n"
+" em cabeçalhos de e-mail: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+" - rfc3339date: Data. Devolve uma data usando o formato de data da\n"
+" Internet especificado na RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
" - short: Hash do changeset. Devolve a forma curta do hash de\n"
" um changeset, ou seja, uma string hexadecimal de 12 bytes.\n"
" - shortdate: Data. Devolve uma data como \"2006-09-18\".\n"
--- a/mercurial/bdiff.c Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/bdiff.c Mon Oct 05 22:17:39 2009 +0200
@@ -151,7 +151,7 @@
}
/* compute popularity threshold */
- t = (bn >= 4000) ? bn / 1000 : bn + 1;
+ t = (bn >= 31000) ? bn / 1000 : 1000000 / (bn + 1);
/* match items in a to their equivalence class in b */
for (i = 0; i < an; i++) {
--- a/mercurial/bundlerepo.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/bundlerepo.py Mon Oct 05 22:17:39 2009 +0200
@@ -160,7 +160,7 @@
localrepo.localrepository.__init__(self, ui, path)
except error.RepoError:
self._tempparent = tempfile.mkdtemp()
- localrepo.instance(ui,self._tempparent,1)
+ localrepo.instance(ui, self._tempparent, 1)
localrepo.localrepository.__init__(self, ui, self._tempparent)
if path:
--- a/mercurial/byterange.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/byterange.py Mon Oct 05 22:17:39 2009 +0200
@@ -208,7 +208,7 @@
"""
def open_local_file(self, req):
import mimetypes
- import mimetools
+ import email
host = req.get_host()
file = req.get_selector()
localfile = urllib.url2pathname(file)
@@ -232,9 +232,9 @@
raise RangeError('Requested Range Not Satisfiable')
size = (lb - fb)
fo = RangeableFileObject(fo, (fb, lb))
- headers = mimetools.Message(StringIO(
+ headers = email.message_from_string(
'Content-Type: %s\nContent-Length: %d\nLast-Modified: %s\n' %
- (mtype or 'text/plain', size, modified)))
+ (mtype or 'text/plain', size, modified))
return urllib.addinfourl(fo, headers, 'file:'+file)
@@ -251,7 +251,7 @@
import socket
import sys
import mimetypes
-import mimetools
+import email
class FTPRangeHandler(urllib2.FTPHandler):
def ftp_open(self, req):
@@ -325,8 +325,7 @@
headers += "Content-Type: %s\n" % mtype
if retrlen is not None and retrlen >= 0:
headers += "Content-Length: %d\n" % retrlen
- sf = StringIO(headers)
- headers = mimetools.Message(sf)
+ headers = email.message_from_string(headers)
return addinfourl(fp, headers, req.get_full_url())
except ftplib.all_errors, msg:
raise IOError('ftp error', msg), sys.exc_info()[2]
--- a/mercurial/changegroup.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/changegroup.py Mon Oct 05 22:17:39 2009 +0200
@@ -10,7 +10,7 @@
import struct, os, bz2, zlib, tempfile
def getchunk(source):
- """get a chunk from a changegroup"""
+ """return the next chunk from changegroup 'source' as a string"""
d = source.read(4)
if not d:
return ""
@@ -25,7 +25,8 @@
return d
def chunkiter(source):
- """iterate through the chunks in source"""
+ """iterate through the chunks in source, yielding a sequence of chunks
+ (strings)"""
while 1:
c = getchunk(source)
if not c:
@@ -33,10 +34,11 @@
yield c
def chunkheader(length):
- """build a changegroup chunk header"""
+ """return a changegroup chunk header (string)"""
return struct.pack(">l", length + 4)
def closechunk():
+ """return a changegroup chunk header (string) for a zero-length chunk"""
return struct.pack(">l", 0)
class nocompress(object):
@@ -52,7 +54,7 @@
"HG10GZ": ("HG10GZ", lambda: zlib.compressobj()),
}
-# hgweb uses this list to communicate it's preferred type
+# hgweb uses this list to communicate its preferred type
bundlepriority = ['HG10GZ', 'HG10BZ', 'HG10UN']
def writebundle(cg, filename, bundletype):
--- a/mercurial/changelog.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/changelog.py Mon Oct 05 22:17:39 2009 +0200
@@ -87,25 +87,39 @@
self.data.append(str(s))
self.offset += len(s)
+def delayopener(opener, target, divert, buf):
+ def o(name, mode='r'):
+ if name != target:
+ return opener(name, mode)
+ if divert:
+ return opener(name + ".a", mode.replace('a', 'w'))
+ # otherwise, divert to memory
+ return appender(opener(name, mode), buf)
+ return o
+
class changelog(revlog.revlog):
def __init__(self, opener):
+ revlog.revlog.__init__(self, opener, "00changelog.i")
self._realopener = opener
self._delayed = False
- revlog.revlog.__init__(self, self._delayopener, "00changelog.i")
+ self._divert = False
def delayupdate(self):
"delay visibility of index updates to other readers"
self._delayed = True
- self._delaycount = len(self)
+ self._divert = (len(self) == 0)
self._delaybuf = []
- self._delayname = None
+ self.opener = delayopener(self._realopener, self.indexfile,
+ self._divert, self._delaybuf)
def finalize(self, tr):
"finalize index updates"
self._delayed = False
+ self.opener = self._realopener
# move redirected index data back into place
- if self._delayname:
- util.rename(self._delayname + ".a", self._delayname)
+ if self._divert:
+ n = self.opener(self.indexfile + ".a").name
+ util.rename(n, n[:-2])
elif self._delaybuf:
fp = self.opener(self.indexfile, 'a')
fp.write("".join(self._delaybuf))
@@ -114,21 +128,6 @@
# split when we're done
self.checkinlinesize(tr)
- def _delayopener(self, name, mode='r'):
- fp = self._realopener(name, mode)
- # only divert the index
- if not self._delayed or not name == self.indexfile:
- return fp
- # if we're doing an initial clone, divert to another file
- if self._delaycount == 0:
- self._delayname = fp.name
- if not len(self):
- # make sure to truncate the file
- mode = mode.replace('a', 'w')
- return self._realopener(name + ".a", mode)
- # otherwise, divert to memory
- return appender(fp, self._delaybuf)
-
def readpending(self, file):
r = revlog.revlog(self.opener, file)
self.index = r.index
@@ -147,17 +146,16 @@
fp2.close()
# switch modes so finalize can simply rename
self._delaybuf = []
- self._delayname = fp1.name
+ self._divert = True
- if self._delayname:
+ if self._divert:
return True
return False
def checkinlinesize(self, tr, fp=None):
- if self.opener == self._delayopener:
- return
- return revlog.revlog.checkinlinesize(self, tr, fp)
+ if not self._delayed:
+ revlog.revlog.checkinlinesize(self, tr, fp)
def read(self, node):
"""
--- a/mercurial/cmdutil.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/cmdutil.py Mon Oct 05 22:17:39 2009 +0200
@@ -546,24 +546,26 @@
return errors
-def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None):
+def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
+ runargs=None):
'''Run a command as a service.'''
if opts['daemon'] and not opts['daemon_pipefds']:
rfd, wfd = os.pipe()
- args = sys.argv[:]
- args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
+ if not runargs:
+ runargs = sys.argv[:]
+ runargs.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
# Don't pass --cwd to the child process, because we've already
# changed directory.
- for i in xrange(1,len(args)):
- if args[i].startswith('--cwd='):
- del args[i]
+ for i in xrange(1,len(runargs)):
+ if runargs[i].startswith('--cwd='):
+ del runargs[i]
break
- elif args[i].startswith('--cwd'):
- del args[i:i+2]
+ elif runargs[i].startswith('--cwd'):
+ del runargs[i:i+2]
break
pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
- args[0], args)
+ runargs[0], runargs)
os.close(wfd)
os.read(rfd, 1)
if parentfn:
@@ -743,6 +745,9 @@
'parent': '{rev}:{node|formatnode} ',
'manifest': '{rev}:{node|formatnode}',
'filecopy': '{name} ({source})'})
+ # Cache mapping from rev to a tuple with tag date, tag
+ # distance and tag name
+ self._latesttagcache = {-1: (0, 0, 'null')}
def use_template(self, t):
'''set template string to use'''
@@ -760,6 +765,30 @@
return []
return parents
+ def _latesttaginfo(self, rev):
+ '''return date, distance and name for the latest tag of rev'''
+ todo = [rev]
+ while todo:
+ rev = todo.pop()
+ if rev in self._latesttagcache:
+ continue
+ ctx = self.repo[rev]
+ tags = [t for t in ctx.tags() if self.repo.tagtype(t) == 'global']
+ if tags:
+ self._latesttagcache[rev] = ctx.date()[0], 0, ':'.join(sorted(tags))
+ continue
+ try:
+ # The tuples are laid out so the right one can be found by comparison.
+ pdate, pdist, ptag = max(
+ self._latesttagcache[p.rev()] for p in ctx.parents())
+ except KeyError:
+ # Cache miss - recurse
+ todo.append(rev)
+ todo.extend(p.rev() for p in ctx.parents())
+ continue
+ self._latesttagcache[rev] = pdate, pdist + 1, ptag
+ return self._latesttagcache[rev]
+
def _show(self, ctx, copies, props):
'''show a single changeset or file revision'''
@@ -877,6 +906,11 @@
removes += i[2]
return '%s: +%s/-%s' % (files, adds, removes)
+ def showlatesttag(**args):
+ return self._latesttaginfo(ctx.rev())[2]
+ def showlatesttagdistance(**args):
+ return self._latesttaginfo(ctx.rev())[1]
+
defprops = {
'author': ctx.user(),
'branches': showbranches,
@@ -894,6 +928,8 @@
'tags': showtags,
'extras': showextras,
'diffstat': showdiffstat,
+ 'latesttag': showlatesttag,
+ 'latesttagdistance': showlatesttagdistance,
}
props = props.copy()
props.update(defprops)
@@ -987,12 +1023,12 @@
def finddate(ui, repo, date):
"""Find the tipmost changeset that matches the given date spec"""
df = util.matchdate(date)
- get = util.cachefunc(lambda r: repo[r].changeset())
+ get = util.cachefunc(lambda r: repo[r])
changeiter, matchfn = walkchangerevs(ui, repo, [], get, {'rev':None})
results = {}
for st, rev, fns in changeiter:
if st == 'add':
- d = get(rev)[2]
+ d = get(rev).date()
if df(d[0]):
results[rev] = d
elif st == 'iter':
@@ -1118,13 +1154,13 @@
def changerevgen():
for i, window in increasing_windows(len(repo) - 1, nullrev):
for j in xrange(i - window, i + 1):
- yield j, change(j)[3]
+ yield change(j)
- for rev, changefiles in changerevgen():
- matches = filter(m, changefiles)
+ for ctx in changerevgen():
+ matches = filter(m, ctx.files())
if matches:
- fncache[rev] = matches
- wanted.add(rev)
+ fncache[ctx.rev()] = matches
+ wanted.add(ctx.rev())
class followfilter(object):
def __init__(self, onlyfirst=False):
@@ -1189,7 +1225,7 @@
fns = fncache.get(rev)
if not fns:
def fns_generator():
- for f in change(rev)[3]:
+ for f in change(rev).files():
if m(f):
yield f
fns = fns_generator()
--- a/mercurial/commands.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/commands.py Mon Oct 05 22:17:39 2009 +0200
@@ -8,12 +8,13 @@
from node import hex, nullid, nullrev, short
from lock import release
from i18n import _, gettext
-import os, re, sys, subprocess, difflib, time
+import os, re, sys, subprocess, difflib, time, tempfile
import hg, util, revlog, bundlerepo, extensions, copies, context, error
-import patch, help, mdiff, tempfile, url, encoding
+import patch, help, mdiff, url, encoding
import archival, changegroup, cmdutil, sshserver, hbisect
from hgweb import server
import merge as merge_
+import minirst
# Commands start here, listed alphabetically
@@ -57,11 +58,11 @@
commit.
Use the -s/--similarity option to detect renamed files. With a
- parameter > 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.
+ 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.
"""
try:
sim = float(opts.get('similarity') or 0)
@@ -141,14 +142,14 @@
directory; use -r/--rev to specify a different revision.
To specify the type of archive to create, use -t/--type. Valid
- types are:
-
- "files" (default): a directory full of files
- "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
+ types are::
+
+ "files" (default): a directory full of files
+ "tar": tar archive, uncompressed
+ "tbz2": tar archive, compressed using bzip2
+ "tgz": tar archive, compressed using gzip
+ "uzip": zip archive, uncompressed
+ "zip": zip archive, compressed using deflate
The exact name of the destination archive or directory is given
using a format string; see 'hg help export' for details.
@@ -247,7 +248,7 @@
commit_opts['addremove'] = False
if not commit_opts['message'] and not commit_opts['logfile']:
# we don't translate commit messages
- commit_opts['message'] = "Backed out changeset %s" % (short(node))
+ commit_opts['message'] = "Backed out changeset %s" % short(node)
commit_opts['force_editor'] = True
commit(ui, repo, **commit_opts)
def nice(node):
@@ -397,8 +398,8 @@
while size <= changesets:
tests, size = tests + 1, size * 2
rev = repo.changelog.rev(node)
- ui.write(_("Testing changeset %s:%s "
- "(%s changesets remaining, ~%s tests)\n")
+ ui.write(_("Testing changeset %d:%s "
+ "(%d changesets remaining, ~%d tests)\n")
% (rev, short(node), changesets, tests))
if not noupdate:
cmdutil.bail_if_changed(repo)
@@ -564,11 +565,11 @@
Output may be to a file, in which case the name of the file is
given using a format string. The formatting rules are the same as
- 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
+ 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
"""
ctx = repo[opts.get('rev')]
err = 1
@@ -617,7 +618,7 @@
avoid hardlinking.
In some cases, you can clone repositories and checked out files
- using full hardlinks with
+ using full hardlinks with ::
$ cp -al REPO REPOCLONE
@@ -627,7 +628,6 @@
breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
this is not compatible with certain extensions that place their
metadata under the .hg directory, such as mq.
-
"""
hg.clone(cmdutil.remoteui(ui, opts), source, dest,
pull=opts.get('pull'),
@@ -680,9 +680,9 @@
ui.status(_('created new head\n'))
if ui.debugflag:
- ui.write(_('committed changeset %d:%s\n') % (rev,hex(node)))
+ ui.write(_('committed changeset %d:%s\n') % (rev, hex(node)))
elif ui.verbose:
- ui.write(_('committed changeset %d:%s\n') % (rev,short(node)))
+ ui.write(_('committed changeset %d:%s\n') % (rev, short(node)))
def copy(ui, repo, *pats, **opts):
"""mark files as copied for the next commit
@@ -751,7 +751,7 @@
ui.write("%s\n" % "\n".join(sorted(cmdlist)))
def debugfsinfo(ui, path = "."):
- file('.debugfsinfo', 'w').write('')
+ open('.debugfsinfo', 'w').write('')
ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
@@ -984,7 +984,7 @@
if list(files) != [os.path.basename(fa)]:
ui.write(_(" unexpected patch output!\n"))
patchproblems += 1
- a = file(fa).read()
+ a = open(fa).read()
if a != b:
ui.write(_(" patch test failed!\n"))
patchproblems += 1
@@ -1116,16 +1116,16 @@
first parent only.
Output may be to a file, in which case the name of the file is
- 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
+ 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
Without the -a/--text option, export will avoid generating diffs
of files it detects as binary. With -a, export will generate a
@@ -1275,9 +1275,9 @@
if opts.get('all'):
cols.append(change)
if opts.get('user'):
- cols.append(ui.shortuser(get(r)[1]))
+ cols.append(ui.shortuser(get(r).user()))
if opts.get('date'):
- cols.append(datefunc(get(r)[2]))
+ cols.append(datefunc(get(r).date()))
if opts.get('files_with_matches'):
c = (fn, r)
if c in filerevmatches:
@@ -1291,7 +1291,7 @@
skip = {}
revfiles = {}
- get = util.cachefunc(lambda r: repo[r].changeset())
+ get = util.cachefunc(lambda r: repo[r])
changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
found = False
follow = opts.get('follow')
@@ -1300,7 +1300,7 @@
matches.clear()
revfiles.clear()
elif st == 'add':
- ctx = repo[rev]
+ ctx = get(rev)
pctx = ctx.parents()[0]
parent = pctx.rev()
matches.setdefault(rev, {})
@@ -1323,18 +1323,18 @@
continue
files.append(fn)
- if not matches[rev].has_key(fn):
+ if fn not in matches[rev]:
grepbody(fn, rev, flog.read(fnode))
pfn = copy or fn
- if not matches[parent].has_key(pfn):
+ if pfn not in matches[parent]:
try:
fnode = pctx.filenode(pfn)
grepbody(pfn, parent, flog.read(fnode))
except error.LookupError:
pass
elif st == 'iter':
- parent = repo[rev].parents()[0].rev()
+ parent = get(rev).parents()[0].rev()
for fn in sorted(revfiles.get(rev, [])):
states = matches[rev][fn]
copy = copies.get(rev, {}).get(fn)
@@ -1356,23 +1356,25 @@
With no arguments, show all repository head changesets.
- Repository "heads" are changesets that don't have child
- changesets. They are where development generally takes place and
- are the usual targets for update and merge operations.
+ Repository "heads" are changesets with no child changesets. They are
+ where development generally takes place and are the usual targets
+ for update and merge operations.
If one or more REV is given, the "branch heads" will be shown for
- the named branch associated with that revision. The name of the
- branch is called the revision's branch tag.
-
- Branch heads are revisions on a given named branch that do not have
- any descendants on the same branch. A branch head could be a true head
- or it could be the last changeset on a branch before a new branch
- was created. If none of the branch heads are true heads, the branch
- is considered inactive. If -c/--closed is specified, also show branch
- heads marked closed (see hg commit --close-branch).
-
- If STARTREV is specified only those heads (or branch heads) that
- are descendants of STARTREV will be displayed.
+ the named branch associated with the specified changeset(s).
+
+ Branch heads are changesets on a named branch with no descendants on
+ the same branch. A branch head could be a "true" (repository) head,
+ or it could be the last changeset on that branch before it was
+ merged into another branch, or it could be the last changeset on the
+ branch before a new branch was created. If none of the branch heads
+ are true heads, the branch is considered inactive.
+
+ If -c/--closed is specified, also show branch heads marked closed
+ (see hg commit --close-branch).
+
+ If STARTREV is specified, only those heads that are descendants of
+ STARTREV will be displayed.
"""
if opts.get('rev'):
start = repo.lookup(opts['rev'])
@@ -1423,6 +1425,7 @@
Given a topic, extension, or command name, print help for that
topic."""
option_lists = []
+ textwidth = util.termwidth() - 2
def addglobalopts(aliases):
if ui.verbose:
@@ -1449,7 +1452,10 @@
try:
aliases, i = cmdutil.findcmd(name, table, False)
except error.AmbiguousCommand, inst:
- select = lambda c: c.lstrip('^').startswith(inst.args[0])
+ # 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)
helplist(_('list of commands:\n\n'), select)
return
@@ -1471,8 +1477,8 @@
if not doc:
doc = _("(no help text available)")
if ui.quiet:
- doc = doc.splitlines(0)[0]
- ui.write("\n%s\n" % doc.rstrip())
+ doc = doc.splitlines()[0]
+ ui.write("\n%s\n" % minirst.format(doc, textwidth))
if not ui.quiet:
# options
@@ -1502,7 +1508,7 @@
doc = gettext(doc)
if not doc:
doc = _("(no help text available)")
- h[f] = doc.splitlines(0)[0].rstrip()
+ h[f] = doc.splitlines()[0].rstrip()
cmds[f] = c.lstrip("^")
if not h:
@@ -1521,7 +1527,9 @@
if name != 'shortlist':
exts, maxlength = extensions.enabled()
- ui.write(help.listexts(_('enabled extensions:'), exts, maxlength))
+ text = help.listexts(_('enabled extensions:'), exts, maxlength)
+ if text:
+ ui.write("\n%s\n" % minirst.format(text, textwidth))
if not ui.quiet:
addglobalopts(True)
@@ -1539,8 +1547,8 @@
if hasattr(doc, '__call__'):
doc = doc()
- ui.write("%s\n" % header)
- ui.write("%s\n" % doc.rstrip())
+ ui.write("%s\n\n" % header)
+ ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
def helpext(name):
try:
@@ -1549,12 +1557,14 @@
raise error.UnknownCommand(name)
doc = gettext(mod.__doc__) or _('no help text available')
- doc = doc.splitlines(0)
- ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
- for d in doc[1:]:
- ui.write(d, '\n')
-
- ui.status('\n')
+ if '\n' not in doc:
+ head, tail = doc, ""
+ else:
+ head, tail = doc.split('\n', 1)
+ ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
+ if tail:
+ ui.write(minirst.format(tail, textwidth))
+ ui.status('\n\n')
try:
ct = mod.cmdtable
@@ -1609,9 +1619,7 @@
ui.write(_("\nadditional help topics:\n\n"))
topics = []
for names, header, doc in help.helptable:
- names = [(-len(name), name) for name in names]
- names.sort()
- topics.append((names[0][1], header))
+ topics.append((sorted(names, key=len, reverse=True)[0], header))
topics_len = max([len(s[0]) for s in topics])
for t, desc in topics:
ui.write(" %-*s %s\n" % (topics_len, t, desc))
@@ -1781,7 +1789,7 @@
else:
# launch the editor
message = None
- ui.debug(_('message:\n%s\n') % message)
+ ui.debug('message:\n%s\n' % message)
wp = repo.parents()
if opts.get('exact'):
@@ -1974,7 +1982,7 @@
will appear in files:.
"""
- get = util.cachefunc(lambda r: repo[r].changeset())
+ get = util.cachefunc(lambda r: repo[r])
changeiter, matchfn = cmdutil.walkchangerevs(ui, repo, pats, get, opts)
limit = cmdutil.loglimit(opts)
@@ -2032,40 +2040,37 @@
if opts.get('only_merges') and len(parents) != 2:
continue
- if only_branches:
- revbranch = get(rev)[5]['branch']
- if revbranch not in only_branches:
- continue
-
- if df:
- changes = get(rev)
- if not df(changes[2][0]):
- continue
+ ctx = get(rev)
+ if only_branches and ctx.branch() not in only_branches:
+ continue
+
+ if df and not df(ctx.date()[0]):
+ continue
if opts.get('keyword'):
- changes = get(rev)
miss = 0
for k in [kw.lower() for kw in opts['keyword']]:
- if not (k in changes[1].lower() or
- k in changes[4].lower() or
- k in " ".join(changes[3]).lower()):
+ if not (k in ctx.user().lower() or
+ k in ctx.description().lower() or
+ k in " ".join(ctx.files()).lower()):
miss = 1
break
if miss:
continue
if opts['user']:
- changes = get(rev)
- if not [k for k in opts['user'] if k in changes[1]]:
+ if not [k for k in opts['user'] if k in ctx.user()]:
continue
copies = []
if opts.get('copies') and rev:
- for fn in get(rev)[3]:
+ for fn in ctx.files():
rename = getrenamed(fn, rev)
if rename:
copies.append((fn, rename[0]))
- displayer.show(context.changectx(repo, rev), copies=copies)
+
+ displayer.show(ctx, copies=copies)
+
elif st == 'iter':
if count == limit: break
if displayer.flush(rev):
@@ -2360,15 +2365,15 @@
The following table details the behavior of remove for different
file states (columns) and option combinations (rows). The file
- states are Added [A], Clean [C], Modified [M] and Missing [!]
- (as reported by hg status). The actions are Warn, Remove (from
- branch) and Delete (from disk).
-
- A C M !
- none W RD W R
- -f R RD RD R
- -A W W W R
- -Af R R R R
+ 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)::
+
+ A C M !
+ none W RD W R
+ -f R RD RD R
+ -A W W W R
+ -Af R R R R
This command schedules the files to be removed at the next commit.
To undo a remove before that, see hg revert.
@@ -2443,9 +2448,10 @@
indicating whether or not files are resolved. All files must be
marked as resolved before a commit is permitted.
- The codes used to show the status of files are:
- U = unresolved
- R = resolved
+ The codes used to show the status of files are::
+
+ U = unresolved
+ R = resolved
"""
all, mark, unmark, show = [opts.get(o) for o in 'all mark unmark list'.split()]
@@ -2711,7 +2717,7 @@
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,
- and their effects can be rolled back:
+ and their effects can be rolled back::
commit
import
@@ -2822,15 +2828,16 @@
If two revisions are given, the differences between them are
shown.
- 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)
+ 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)
"""
node1, node2 = cmdutil.revpair(repo, opts.get('rev'))
@@ -3086,7 +3093,7 @@
globalopts = [
('R', 'repository', '',
- _('repository root directory or symbolic path name')),
+ _('repository root directory or name of overlay bundle file')),
('', 'cwd', '', _('change working directory')),
('y', 'noninteractive', None,
_('do not prompt, assume \'yes\' for any required answers')),
--- a/mercurial/config.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/config.py Mon Oct 05 22:17:39 2009 +0200
@@ -80,9 +80,9 @@
section = ""
item = None
line = 0
- cont = 0
+ cont = False
- for l in data.splitlines(1):
+ for l in data.splitlines(True):
line += 1
if cont:
m = contre.match(l)
@@ -115,7 +115,7 @@
m = itemre.match(l)
if m:
item = m.group(1)
- cont = 1
+ cont = True
if sections and section not in sections:
continue
self.set(section, item, m.group(2), "%s:%d" % (src, line))
@@ -129,7 +129,7 @@
del self._data[section][name]
continue
- raise error.ConfigError(_('config error at %s:%d: \'%s\'')
+ raise error.ConfigError(_("config error at %s:%d: '%s'")
% (src, line, l.rstrip()))
def read(self, path, fp=None, sections=None, remap=None):
--- a/mercurial/context.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/context.py Mon Oct 05 22:17:39 2009 +0200
@@ -199,7 +199,9 @@
assert (changeid is not None
or fileid is not None
- or changectx is not None)
+ or changectx is not None), \
+ ("bad args: changeid=%r, fileid=%r, changectx=%r"
+ % (changeid, fileid, changectx))
if filelog:
self._filelog = filelog
@@ -441,7 +443,7 @@
del hist[p]
hist[f] = curr
- return zip(hist[f][0], hist[f][1].splitlines(1))
+ return zip(hist[f][0], hist[f][1].splitlines(True))
def ancestor(self, fc2):
"""
--- a/mercurial/copies.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/copies.py Mon Oct 05 22:17:39 2009 +0200
@@ -42,7 +42,7 @@
seen.add(s)
if fc.path() != orig and fc.path() not in old:
old[fc.path()] = (depth, fc.path()) # remember depth
- if fc.rev() < limit and fc.rev() is not None:
+ if fc.rev() is not None and fc.rev() < limit:
continue
visit += [(p, depth - 1) for p in fc.parents()]
@@ -144,16 +144,16 @@
elif of in ma:
diverge.setdefault(of, []).append(f)
- repo.ui.debug(_(" searching for copies back to rev %d\n") % limit)
+ repo.ui.debug(" searching for copies back to rev %d\n" % limit)
u1 = _nonoverlap(m1, m2, ma)
u2 = _nonoverlap(m2, m1, ma)
if u1:
- repo.ui.debug(_(" unmatched files in local:\n %s\n")
+ repo.ui.debug(" unmatched files in local:\n %s\n"
% "\n ".join(u1))
if u2:
- repo.ui.debug(_(" unmatched files in other:\n %s\n")
+ repo.ui.debug(" unmatched files in other:\n %s\n"
% "\n ".join(u2))
for f in u1:
@@ -169,7 +169,7 @@
diverge2.update(fl) # reverse map for below
if fullcopy:
- repo.ui.debug(_(" all copies found (* = to merge, ! = divergent):\n"))
+ repo.ui.debug(" all copies found (* = to merge, ! = divergent):\n")
for f in fullcopy:
note = ""
if f in copy: note += "*"
@@ -180,7 +180,7 @@
if not fullcopy or not checkdirs:
return copy, diverge
- repo.ui.debug(_(" checking for directory renames\n"))
+ repo.ui.debug(" checking for directory renames\n")
# generate a directory move map
d1, d2 = _dirs(m1), _dirs(m2)
@@ -216,7 +216,7 @@
return copy, diverge
for d in dirmove:
- repo.ui.debug(_(" dir %s -> %s\n") % (d, dirmove[d]))
+ repo.ui.debug(" dir %s -> %s\n" % (d, dirmove[d]))
# check unaccounted nonoverlapping files against directory moves
for f in u1 + u2:
@@ -227,7 +227,7 @@
df = dirmove[d] + f[len(d):]
if df not in copy:
copy[f] = df
- repo.ui.debug(_(" file %s -> %s\n") % (f, copy[f]))
+ repo.ui.debug(" file %s -> %s\n" % (f, copy[f]))
break
return copy, diverge
--- a/mercurial/demandimport.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/demandimport.py Mon Oct 05 22:17:39 2009 +0200
@@ -127,6 +127,8 @@
# imported by profile, itself imported by hotshot.stats,
# not available under Windows
'resource',
+ # this trips up many extension authors
+ 'gtk',
]
def enable():
--- a/mercurial/dirstate.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/dirstate.py Mon Oct 05 22:17:39 2009 +0200
@@ -38,6 +38,9 @@
class dirstate(object):
def __init__(self, opener, ui, root):
+ '''Create a new dirstate object. opener is an open()-like callable
+ that can be used to open the dirstate file; root is the root of the
+ directory tracked by the dirstate.'''
self._opener = opener
self._root = root
self._rootdir = os.path.join(root, '')
@@ -47,6 +50,8 @@
@propertycache
def _map(self):
+ '''Return the dirstate contents as a map from filename to
+ (state, mode, size, time).'''
self._read()
return self._map
@@ -169,12 +174,14 @@
return path
def __getitem__(self, key):
- ''' current states:
- n normal
- m needs merging
- r marked for removal
- a marked for addition
- ? not tracked'''
+ '''Return the current state of key (a filename) in the dirstate.
+ States are:
+ n normal
+ m needs merging
+ r marked for removal
+ a marked for addition
+ ? not tracked
+ '''
return self._map.get(key, ("?",))[0]
def __contains__(self, key):
@@ -373,13 +380,9 @@
return
st = self._opener("dirstate", "w", atomictemp=True)
- try:
- gran = int(self._ui.config('dirstate', 'granularity', 1))
- except ValueError:
- gran = 1
- if gran > 0:
- hlimit = util.fstat(st).st_mtime
- llimit = hlimit - gran
+ # use the modification time of the newly created temporary file as the
+ # filesystem's notion of 'now'
+ now = int(util.fstat(st).st_mtime)
cs = cStringIO.StringIO()
copymap = self._copymap
@@ -389,9 +392,19 @@
for f, e in self._map.iteritems():
if f in copymap:
f = "%s\0%s" % (f, copymap[f])
- if gran > 0 and e[0] == 'n' and llimit < e[3] <= hlimit:
- # file was updated too recently, ignore stat data
- e = (e[0], 0, -1, -1)
+
+ if e[0] == 'n' and e[3] == now:
+ # The file was last modified "simultaneously" with the current
+ # write to dirstate (i.e. within the same second for file-
+ # systems with a granularity of 1 sec). This commonly happens
+ # for at least a couple of files on 'update'.
+ # The user could change the file without changing its size
+ # within the same second. Invalidate the file's stat data in
+ # dirstate, forcing future 'status' calls to compare the
+ # contents of the file. This prevents mistakenly treating such
+ # files as clean.
+ e = (e[0], 0, -1, -1) # mark entry as 'unset'
+
e = pack(_format, e[0], e[1], e[2], e[3], len(f))
write(e)
write(f)
@@ -411,11 +424,11 @@
def walk(self, match, unknown, ignored):
'''
- walk recursively through the directory tree, finding all files
- matched by the match function
+ Walk recursively through the directory tree, finding all files
+ matched by match.
- results are yielded in a tuple (filename, stat), where stat
- and st is the stat result if the file was found in the directory.
+ Return a dict mapping filename to stat-like object (either
+ mercurial.osutil.stat instance or return value of os.stat()).
'''
def fwarn(f, msg):
@@ -553,12 +566,38 @@
return results
def status(self, match, ignored, clean, unknown):
+ '''Determine the status of the working copy relative to the
+ dirstate and return a tuple of lists (unsure, modified, added,
+ removed, deleted, unknown, ignored, clean), where:
+
+ unsure:
+ files that might have been modified since the dirstate was
+ written, but need to be read to be sure (size is the same
+ but mtime differs)
+ modified:
+ files that have definitely been modified since the dirstate
+ was written (different size or mode)
+ added:
+ files that have been explicitly added with hg add
+ removed:
+ files that have been explicitly removed with hg remove
+ deleted:
+ files that have been deleted through other means ("missing")
+ unknown:
+ files not in the dirstate that are not ignored
+ ignored:
+ files not in the dirstate that are ignored
+ (by _dirignore())
+ clean:
+ files that have definitely not been modified since the
+ dirstate was written
+ '''
listignored, listclean, listunknown = ignored, clean, unknown
lookup, modified, added, unknown, ignored = [], [], [], [], []
removed, deleted, clean = [], [], []
dmap = self._map
- ladd = lookup.append
+ ladd = lookup.append # aka "unsure"
madd = modified.append
aadd = added.append
uadd = unknown.append
--- a/mercurial/dispatch.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/dispatch.py Mon Oct 05 22:17:39 2009 +0200
@@ -217,7 +217,7 @@
def __call__(self, ui, *args, **opts):
if self.shadows:
- ui.debug(_("alias '%s' shadows command\n") % self.name)
+ ui.debug("alias '%s' shadows command\n" % self.name)
return self.fn(ui, *args, **opts)
@@ -338,7 +338,7 @@
path = _findrepo(os.getcwd()) or ""
if not path:
lui = ui
- if path:
+ else:
try:
lui = ui.copy()
lui.readconfig(os.path.join(path, ".hg", "hgrc"))
@@ -352,19 +352,25 @@
lui = ui.copy()
lui.readconfig(os.path.join(path, ".hg", "hgrc"))
+ # Configure extensions in phases: uisetup, extsetup, cmdtable, and
+ # reposetup. Programs like TortoiseHg will call _dispatch several
+ # times so we keep track of configured extensions in _loaded.
extensions.loadall(lui)
- for name, module in extensions.extensions():
- if name in _loaded:
- continue
+ exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded]
- # setup extensions
- # TODO this should be generalized to scheme, where extensions can
- # redepend on other extensions. then we should toposort them, and
- # do initialization in correct order
+ # (uisetup is handled in extensions.loadall)
+
+ for name, module in exts:
extsetup = getattr(module, 'extsetup', None)
if extsetup:
- extsetup()
+ try:
+ extsetup(ui)
+ except TypeError:
+ if extsetup.func_code.co_argcount != 0:
+ raise
+ extsetup() # old extsetup with no ui argument
+ for name, module in exts:
cmdtable = getattr(module, 'cmdtable', {})
overrides = [cmd for cmd in cmdtable if cmd in commands.table]
if overrides:
@@ -373,6 +379,8 @@
commands.table.update(cmdtable)
_loaded.add(name)
+ # (reposetup is handled in hg.repository)
+
addaliases(lui, commands.table)
# check for fallback encoding
--- a/mercurial/extensions.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/extensions.py Mon Oct 05 22:17:39 2009 +0200
@@ -40,6 +40,7 @@
return imp.load_source(module_name, path)
def load(ui, name, path):
+ # unused ui argument kept for backwards compatibility
if name.startswith('hgext.') or name.startswith('hgext/'):
shortname = name[6:]
else:
@@ -66,12 +67,9 @@
_extensions[shortname] = mod
_order.append(shortname)
- uisetup = getattr(mod, 'uisetup', None)
- if uisetup:
- uisetup(ui)
-
def loadall(ui):
result = ui.configitems("extensions")
+ newindex = len(_order)
for (name, path) in result:
if path:
if path[0] == '!':
@@ -90,6 +88,11 @@
if ui.traceback():
return 1
+ for name in _order[newindex:]:
+ uisetup = getattr(_extensions[name], 'uisetup', None)
+ if uisetup:
+ uisetup(ui)
+
def wrapcommand(table, command, wrapper):
aliases, entry = cmdutil.findcmd(command, table)
for alias, e in table.iteritems():
@@ -166,10 +169,6 @@
def enabled():
'''return a dict of {name: desc} of extensions, and the max name length'''
-
- if not enabled:
- return {}, 0
-
exts = {}
maxlength = 0
exthelps = []
@@ -177,6 +176,6 @@
doc = (gettext(ext.__doc__) or _('(no help text available)'))
ename = ename.split('.')[-1]
maxlength = max(len(ename), maxlength)
- exts[ename] = doc.splitlines(0)[0].strip()
+ exts[ename] = doc.splitlines()[0].strip()
return exts, maxlength
--- a/mercurial/filemerge.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/filemerge.py Mon Oct 05 22:17:39 2009 +0200
@@ -140,14 +140,14 @@
binary = isbin(fcd) or isbin(fco) or isbin(fca)
symlink = 'l' in fcd.flags() + fco.flags()
tool, toolpath = _picktool(repo, ui, fd, binary, symlink)
- ui.debug(_("picked tool '%s' for %s (binary %s symlink %s)\n") %
+ ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" %
(tool, fd, binary, symlink))
if not tool or tool == 'internal:prompt':
tool = "internal:local"
- if ui.prompt(_(" no tool found to merge %s\n"
- "keep (l)ocal or take (o)ther?") % fd,
- (_("&Local"), _("&Other")), _("l")) != _("l"):
+ if ui.promptchoice(_(" no tool found to merge %s\n"
+ "keep (l)ocal or take (o)ther?") % fd,
+ (_("&Local"), _("&Other")), 0):
tool = "internal:other"
if tool == "internal:local":
return 0
@@ -170,13 +170,13 @@
else:
ui.status(_("merging %s\n") % fd)
- ui.debug(_("my %s other %s ancestor %s\n") % (fcd, fco, fca))
+ ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
# do we attempt to simplemerge first?
if _toolbool(ui, tool, "premerge", not (binary or symlink)):
r = simplemerge.simplemerge(ui, a, b, c, quiet=True)
if not r:
- ui.debug(_(" premerge successful\n"))
+ ui.debug(" premerge successful\n")
os.unlink(back)
os.unlink(b)
os.unlink(c)
@@ -213,9 +213,9 @@
if not r and _toolbool(ui, tool, "checkchanged"):
if filecmp.cmp(repo.wjoin(fd), back):
- if ui.prompt(_(" output file %s appears unchanged\n"
- "was merge successful (yn)?") % fd,
- (_("&Yes"), _("&No")), _("n")) != _("y"):
+ if ui.promptchoice(_(" output file %s appears unchanged\n"
+ "was merge successful (yn)?") % fd,
+ (_("&Yes"), _("&No")), 1):
r = 1
if _toolbool(ui, tool, "fixeol"):
--- a/mercurial/help.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/help.py Mon Oct 05 22:17:39 2009 +0200
@@ -5,7 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
+from i18n import gettext, _
+import sys, os
import extensions, util
@@ -45,46 +46,11 @@
return ''
result = '\n%s\n\n' % header
for name, desc in sorted(exts.iteritems()):
- desc = util.wrap(desc, maxlength + 4)
- result += ' %s %s\n' % (name.ljust(maxlength), desc)
+ result += ' %-*s %s\n' % (maxlength + 2, ':%s:' % name, desc)
return result
def extshelp():
- doc = _(r'''
- Mercurial has the ability to add new features through the use of
- extensions. Extensions may add new commands, add options to
- existing commands, change the default behavior of commands, or
- implement hooks.
-
- Extensions are not loaded by default for a variety of reasons:
- they can increase startup overhead; they may be meant for
- advanced usage only; they may provide potentially dangerous
- abilities (such as letting you destroy or modify history); they
- might not be ready for prime time; or they may alter some
- usual behaviors of stock Mercurial. It is thus up to the user to
- activate extensions as needed.
-
- To enable the "foo" extension, either shipped with Mercurial
- or in the Python search path, create an entry for it in your
- hgrc, like this:
-
- [extensions]
- foo =
-
- You may also specify the full path to an extension:
-
- [extensions]
- myfeature = ~/.hgext/myfeature.py
-
- To explicitly disable an extension enabled in an hgrc of broader
- scope, prepend its path with !:
-
- [extensions]
- # disabling extension bar residing in /path/to/extension/bar.py
- hgext.bar = !/path/to/extension/bar.py
- # ditto, but no path was supplied for extension baz
- hgext.baz = !
- ''')
+ doc = loaddoc('extensions')()
exts, maxlength = extensions.enabled()
doc += listexts(_('enabled extensions:'), exts, maxlength)
@@ -94,423 +60,33 @@
return doc
-helptable = (
- (["dates"], _("Date Formats"),
- _(r'''
- Some commands allow the user to specify a date, e.g.:
- * backout, commit, import, tag: Specify the commit date.
- * log, revert, update: Select revision(s) by date.
-
- Many date formats are valid. Here are some examples:
-
- "Wed Dec 6 13:18:29 2006" (local timezone assumed)
- "Dec 6 13:18 -0600" (year assumed, time offset provided)
- "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000)
- "Dec 6" (midnight)
- "13:18" (today assumed)
- "3:39" (3:39AM assumed)
- "3:39pm" (15:39)
- "2006-12-06 13:18:29" (ISO 8601 format)
- "2006-12-6 13:18"
- "2006-12-6"
- "12-6"
- "12/6"
- "12/6/6" (Dec 6 2006)
-
- Lastly, there is Mercurial's internal format:
-
- "1165432709 0" (Wed Dec 6 13:18:29 2006 UTC)
-
- This is the internal representation format for dates. unixtime is
- the number of seconds since the epoch (1970-01-01 00:00 UTC).
- offset is the offset of the local timezone, in seconds west of UTC
- (negative if the timezone is east of UTC).
-
- The log command also accepts date ranges:
-
- "<{datetime}" - at or before a given date/time
- ">{datetime}" - on or after a given date/time
- "{datetime} to {datetime}" - a date range, inclusive
- "-{days}" - within a given number of days of today
- ''')),
-
- (["patterns"], _("File Name Patterns"),
- _(r'''
- Mercurial accepts several notations for identifying one or more
- files at a time.
-
- By default, Mercurial treats filenames as shell-style extended
- glob patterns.
-
- Alternate pattern notations must be specified explicitly.
-
- To use a plain path name without any pattern matching, start it
- with "path:". These path names must completely match starting at
- the current repository root.
-
- To use an extended glob, start a name with "glob:". Globs are
- rooted at the current directory; a glob such as "*.c" will only
- match files in the current directory ending with ".c".
-
- The supported glob syntax extensions are "**" to match any string
- across path separators and "{a,b}" to mean "a or b".
-
- To use a Perl/Python regular expression, start a name with "re:".
- Regexp pattern matching is anchored at the root of the repository.
-
- Plain examples:
-
- path:foo/bar a name bar in a directory named foo in the root of
- the repository
- path:path:name a file or directory named "path:name"
-
- Glob examples:
-
- glob:*.c any name ending in ".c" in the current directory
- *.c any name ending in ".c" in the current directory
- **.c any name ending in ".c" in any subdirectory of the
- current directory including itself.
- foo/*.c any name ending in ".c" in the directory foo
- foo/**.c any name ending in ".c" in any subdirectory of foo
- including itself.
-
- Regexp examples:
-
- re:.*\.c$ any name ending in ".c", anywhere in the repository
-
- ''')),
-
- (['environment', 'env'], _('Environment Variables'),
- _(r'''
-HG::
- Path to the 'hg' executable, automatically passed when running
- hooks, extensions or external tools. If unset or empty, this is
- the hg executable's name if it's frozen, or an executable named
- 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
- Windows) is searched.
-
-HGEDITOR::
- This is the name of the editor to run when committing. See EDITOR.
-
- (deprecated, use .hgrc)
+def loaddoc(topic):
+ """Return a delayed loader for help/topic.txt."""
-HGENCODING::
- This overrides the default locale setting detected by Mercurial.
- This setting is used to convert data including usernames,
- changeset descriptions, tag names, and branches. This setting can
- be overridden with the --encoding command-line option.
-
-HGENCODINGMODE::
- This sets Mercurial's behavior for handling unknown characters
- while transcoding user input. The default is "strict", which
- causes Mercurial to abort if it can't map a character. Other
- settings include "replace", which replaces unknown characters, and
- "ignore", which drops them. This setting can be overridden with
- the --encodingmode command-line option.
-
-HGMERGE::
- An executable to use for resolving merge conflicts. The program
- will be executed with three arguments: local file, remote file,
- ancestor file.
-
- (deprecated, use .hgrc)
-
-HGRCPATH::
- A list of files or directories to search for hgrc files. Item
- separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set,
- platform default search path is used. If empty, only the .hg/hgrc
- from the current repository is read.
-
- For each element in HGRCPATH:
- * if it's a directory, all files ending with .rc are added
- * otherwise, the file itself will be added
-
-HGUSER::
- This is the string used as the author of a commit. If not set,
- available values will be considered in this order:
-
- * HGUSER (deprecated)
- * hgrc files from the HGRCPATH
- * EMAIL
- * interactive prompt
- * LOGNAME (with '@hostname' appended)
-
- (deprecated, use .hgrc)
-
-EMAIL::
- May be used as the author of a commit; see HGUSER.
-
-LOGNAME::
- May be used as the author of a commit; see HGUSER.
-
-VISUAL::
- This is the name of the editor to use when committing. See EDITOR.
-
-EDITOR::
- Sometimes Mercurial needs to open a text file in an editor for a
- user to modify, for example when writing commit messages. The
- editor it uses is determined by looking at the environment
- variables HGEDITOR, VISUAL and EDITOR, in that order. The first
- non-empty one is chosen. If all of them are empty, the editor
- defaults to 'vi'.
-
-PYTHONPATH::
- This is used by Python to find imported modules and may need to be
- set appropriately if this Mercurial is not installed system-wide.
- ''')),
-
- (['revs', 'revisions'], _('Specifying Single Revisions'),
- _(r'''
- Mercurial supports several ways to specify individual revisions.
-
- A plain integer is treated as a revision number. Negative integers
- are treated as sequential offsets from the tip, with -1 denoting
- the tip, -2 denoting the revision prior to the tip, and so forth.
-
- A 40-digit hexadecimal string is treated as a unique revision
- identifier.
-
- A hexadecimal string less than 40 characters long is treated as a
- unique revision identifier and is referred to as a short-form
- identifier. A short-form identifier is only valid if it is the
- prefix of exactly one full-length identifier.
-
- Any other string is treated as a tag or branch name. A tag name is
- a symbolic name associated with a revision identifier. A branch
- name denotes the tipmost revision of that branch. Tag and branch
- names must not contain the ":" character.
-
- The reserved name "tip" is a special tag that always identifies
- the most recent revision.
-
- The reserved name "null" indicates the null revision. This is the
- revision of an empty repository, and the parent of revision 0.
-
- The reserved name "." indicates the working directory parent. If
- no working directory is checked out, it is equivalent to null. If
- an uncommitted merge is in progress, "." is the revision of the
- first parent.
- ''')),
-
- (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'),
- _(r'''
- When Mercurial accepts more than one revision, they may be
- specified individually, or provided as a topologically continuous
- range, separated by the ":" character.
+ def loader():
+ if hasattr(sys, 'frozen'):
+ module = sys.executable
+ else:
+ module = __file__
+ base = os.path.dirname(module)
- The syntax of range notation is [BEGIN]:[END], where BEGIN and END
- are revision identifiers. Both BEGIN and END are optional. If
- BEGIN is not specified, it defaults to revision number 0. If END
- is not specified, it defaults to the tip. The range ":" thus means
- "all revisions".
-
- If BEGIN is greater than END, revisions are treated in reverse
- order.
-
- A range acts as a closed interval. This means that a range of 3:5
- gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
- ''')),
-
- (['diffs'], _('Diff Formats'),
- _(r'''
- Mercurial's default format for showing changes between two
- versions of a file is compatible with the unified format of GNU
- diff, which can be used by GNU patch and many other standard
- tools.
-
- While this standard format is often enough, it does not encode the
- following information:
-
- - executable status and other permission bits
- - copy or rename information
- - changes in binary files
- - creation or deletion of empty files
-
- Mercurial also supports the extended diff format from the git VCS
- which addresses these limitations. The git diff format is not
- produced by default because a few widespread tools still do not
- understand this format.
-
- This means that when generating diffs from a Mercurial repository
- (e.g. with "hg export"), you should be careful about things like
- file copies and renames or other things mentioned above, because
- when applying a standard diff to a different repository, this
- extra information is lost. Mercurial's internal operations (like
- push and pull) are not affected by this, because they use an
- internal binary format for communicating changes.
+ for dir in ('.', '..'):
+ docdir = os.path.join(base, dir, 'help')
+ if os.path.isdir(docdir):
+ break
- To make Mercurial produce the git extended diff format, use the
- --git option available for many commands, or set 'git = True' in
- the [diff] section of your hgrc. You do not need to set this
- option when importing diffs in this format or using them in the mq
- extension.
- ''')),
- (['templating'], _('Template Usage'),
- _(r'''
- Mercurial allows you to customize output of commands through
- templates. You can either pass in a template from the command
- line, via the --template option, or select an existing
- template-style (--style).
-
- You can customize output for any "log-like" command: log,
- outgoing, incoming, tip, parents, heads and glog.
-
- Three styles are packaged with Mercurial: default (the style used
- when no explicit preference is passed), compact and changelog.
- Usage:
-
- $ hg log -r1 --style changelog
-
- A template is a piece of text, with markup to invoke variable
- expansion:
-
- $ hg log -r1 --template "{node}\n"
- b56ce7b07c52de7d5fd79fb89701ea538af65746
-
- Strings in curly braces are called keywords. The availability of
- keywords depends on the exact context of the templater. These
- keywords are usually available for templating a log-like command:
-
- - author: String. The unmodified author of the changeset.
- - branches: String. The name of the branch on which the changeset
- was committed. Will be empty if the branch name was default.
- - date: Date information. The date when the changeset was committed.
- - desc: String. The text of the changeset description.
- - diffstat: String. Statistics of changes with the following
- format: "modified files: +added/-removed lines"
- - files: List of strings. All files modified, added, or removed by
- this changeset.
- - file_adds: List of strings. Files added by this changeset.
- - file_mods: List of strings. Files modified by this changeset.
- - file_dels: List of strings. Files removed by this changeset.
- - node: String. The changeset identification hash, as a
- 40-character hexadecimal string.
- - parents: List of strings. The parents of the changeset.
- - rev: Integer. The repository-local changeset revision number.
- - tags: List of strings. Any tags associated with the changeset.
-
- The "date" keyword does not produce human-readable output. If you
- want to use a date in your output, you can use a filter to process
- it. Filters are functions which return a string based on the input
- variable. You can also use a chain of filters to get the desired
- output:
-
- $ hg tip --template "{date|isodate}\n"
- 2008-08-21 18:22 +0000
-
- List of filters:
+ path = os.path.join(docdir, topic + ".txt")
+ return gettext(open(path).read())
+ return loader
- - addbreaks: Any text. Add an XHTML "<br />" tag before the end of
- every line except the last.
- - age: Date. Returns a human-readable date/time difference between
- the given date/time and the current date/time.
- - basename: Any text. Treats the text as a path, and returns the
- last component of the path after splitting by the path
- separator (ignoring trailing separators). For example,
- "foo/bar/baz" becomes "baz" and "foo/bar//" becomes "bar".
- - stripdir: Treat the text as path and strip a directory level, if
- possible. For example, "foo" and "foo/bar" becomes "foo".
- - date: Date. Returns a date in a Unix date format, including
- the timezone: "Mon Sep 04 15:13:13 2006 0700".
- - domain: Any text. Finds the first string that looks like an
- email address, and extracts just the domain component.
- Example: 'User <user@example.com>' becomes 'example.com'.
- - email: Any text. Extracts the first string that looks like an
- email address. Example: 'User <user@example.com>' becomes
- 'user@example.com'.
- - escape: Any text. Replaces the special XML/XHTML characters "&",
- "<" and ">" with XML entities.
- - fill68: Any text. Wraps the text to fit in 68 columns.
- - fill76: Any text. Wraps the text to fit in 76 columns.
- - firstline: Any text. Returns the first line of text.
- - nonempty: Any text. Returns '(none)' if the string is empty.
- - hgdate: Date. Returns the date as a pair of numbers:
- "1157407993 25200" (Unix timestamp, timezone offset).
- - isodate: Date. Returns the date in ISO 8601 format: "2009-08-18
- 13:00 +0200".
- - isodatesec: Date. Returns the date in ISO 8601 format, including
- seconds: "2009-08-18 13:00:13 +0200". See also the
- rfc3339date filter.
- - localdate: Date. Converts a date to local date.
- - obfuscate: Any text. Returns the input text rendered as a
- sequence of XML entities.
- - person: Any text. Returns the text before an email address.
- - rfc822date: Date. Returns a date using the same format used
- in email headers: "Tue, 18 Aug 2009 13:00:13 +0200".
- - rfc3339date: Date. Returns a date using the Internet date format
- specified in RFC 3339: "2009-08-18T13:00:13+02:00".
- - short: Changeset hash. Returns the short form of a changeset
- hash, i.e. a 12-byte hexadecimal string.
- - shortdate: Date. Returns a date like "2006-09-18".
- - strip: Any text. Strips all leading and trailing whitespace.
- - tabindent: Any text. Returns the text, with every line except
- the first starting with a tab character.
- - urlescape: Any text. Escapes all "special" characters. For
- example, "foo bar" becomes "foo%20bar".
- - user: Any text. Returns the user portion of an email address.
- ''')),
-
- (['urls'], _('URL Paths'),
- _(r'''
- Valid URLs are of the form:
-
- local/filesystem/path[#revision]
- file://local/filesystem/path[#revision]
- http://[user[:pass]@]host[:port]/[path][#revision]
- https://[user[:pass]@]host[:port]/[path][#revision]
- ssh://[user[:pass]@]host[:port]/[path][#revision]
-
- Paths in the local filesystem can either point to Mercurial
- repositories or to bundle files (as created by 'hg bundle' or
- 'hg incoming --bundle').
-
- An optional identifier after # indicates a particular branch, tag,
- or changeset to use from the remote repository. See also 'hg help
- revisions'.
-
- Some features, such as pushing to http:// and https:// URLs are
- only possible if the feature is explicitly enabled on the remote
- Mercurial server.
-
- Some notes about using SSH with Mercurial:
- - SSH requires an accessible shell account on the destination
- machine and a copy of hg in the remote path or specified with as
- remotecmd.
- - path is relative to the remote user's home directory by default.
- Use an extra slash at the start of a path to specify an absolute path:
- ssh://example.com//tmp/repository
- - Mercurial doesn't use its own compression via SSH; the right
- thing to do is to configure it in your ~/.ssh/config, e.g.:
- Host *.mylocalnetwork.example.com
- Compression no
- Host *
- Compression yes
- Alternatively specify "ssh -C" as your ssh command in your hgrc
- or with the --ssh command line option.
-
- These URLs can all be stored in your hgrc with path aliases under
- the [paths] section like so:
- [paths]
- alias1 = URL1
- alias2 = URL2
- ...
-
- You can then use the alias for any command that uses a URL (for
- example 'hg pull alias1' would pull from the 'alias1' path).
-
- Two path aliases are special because they are used as defaults
- when you do not provide the URL to a command:
-
- default:
- When you create a repository with hg clone, the clone command
- saves the location of the source repository as the new
- repository's 'default' path. This is then used when you omit
- path from push- and pull-like commands (including incoming and
- outgoing).
-
- default-push:
- The push command will look for a path named 'default-push', and
- prefer it over 'default' if both are defined.
- ''')),
+helptable = (
+ (["dates"], _("Date Formats"), loaddoc('dates')),
+ (["patterns"], _("File Name Patterns"), loaddoc('patterns')),
+ (['environment', 'env'], _('Environment Variables'), loaddoc('environment')),
+ (['revs', 'revisions'], _('Specifying Single Revisions'), loaddoc('revisions')),
+ (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'), loaddoc('multirevs')),
+ (['diffs'], _('Diff Formats'), loaddoc('diffs')),
+ (['templating', 'templates'], _('Template Usage'), loaddoc('templates')),
+ (['urls'], _('URL Paths'), loaddoc('urls')),
(["extensions"], _("Using additional features"), extshelp),
)
--- a/mercurial/hg.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/hg.py Mon Oct 05 22:17:39 2009 +0200
@@ -283,9 +283,9 @@
revs = None
if rev:
if 'lookup' not in src_repo.capabilities:
- raise util.Abort(_("src repository does not support revision "
- "lookup and so doesn't support clone by "
- "revision"))
+ raise util.Abort(_("src repository does not support "
+ "revision lookup and so doesn't "
+ "support clone by revision"))
revs = [src_repo.lookup(r) for r in rev]
checkout = revs[0]
if dest_repo.local():
@@ -327,12 +327,8 @@
dir_cleanup.cleanup()
def _showstats(repo, stats):
- stats = ((stats[0], _("updated")),
- (stats[1], _("merged")),
- (stats[2], _("removed")),
- (stats[3], _("unresolved")))
- note = ", ".join([_("%d files %s") % s for s in stats])
- repo.ui.status("%s\n" % note)
+ repo.ui.status(_("%d files updated, %d files merged, "
+ "%d files removed, %d files unresolved\n") % stats)
def update(repo, node):
"""update the working directory to node, merging linear changes"""
@@ -357,7 +353,7 @@
_showstats(repo, stats)
if stats[3]:
repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
- "or 'hg up --clean' to abandon\n"))
+ "or 'hg update -C' to abandon\n"))
elif remind:
repo.ui.status(_("(branch merge, don't forget to commit)\n"))
return stats[3] > 0
--- a/mercurial/hgweb/common.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/hgweb/common.py Mon Oct 05 22:17:39 2009 +0200
@@ -69,7 +69,7 @@
os.stat(path)
ct = mimetypes.guess_type(path)[0] or "text/plain"
req.respond(HTTP_OK, ct, length = os.path.getsize(path))
- return file(path, 'rb').read()
+ return open(path, 'rb').read()
except TypeError:
raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename')
except OSError, err:
--- a/mercurial/hgweb/hgwebdir_mod.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py Mon Oct 05 22:17:39 2009 +0200
@@ -198,12 +198,17 @@
sortdefault = 'name', False
def entries(sortcolumn="", descending=False, subdir="", **map):
+
rows = []
parity = paritygen(self.stripecount)
+ descend = self.ui.configbool('web', 'descend', True)
for name, path in self.repos:
+
if not name.startswith(subdir):
continue
name = name[len(subdir):]
+ if not descend and '/' in name:
+ continue
u = self.ui.copy()
try:
--- a/mercurial/hgweb/protocol.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/hgweb/protocol.py Mon Oct 05 22:17:39 2009 +0200
@@ -26,7 +26,7 @@
try:
r = hex(repo.lookup(req.form['key'][0]))
success = 1
- except Exception,inst:
+ except Exception, inst:
r = str(inst)
success = 0
resp = "%s %s\n" % (success, r)
--- a/mercurial/hgweb/server.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/hgweb/server.py Mon Oct 05 22:17:39 2009 +0200
@@ -35,7 +35,7 @@
for msg in seq:
self.handler.log_error("HG error: %s", msg)
-class _hgwebhandler(object, BaseHTTPServer.BaseHTTPRequestHandler):
+class _hgwebhandler(BaseHTTPServer.BaseHTTPRequestHandler):
url_scheme = 'http'
--- a/mercurial/hgweb/webcommands.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/hgweb/webcommands.py Mon Oct 05 22:17:39 2009 +0200
@@ -65,7 +65,7 @@
text = '(binary:%s)' % mt
def lines():
- for lineno, t in enumerate(text.splitlines(1)):
+ for lineno, t in enumerate(text.splitlines(True)):
yield {"line": t,
"lineid": "l%d" % (lineno + 1),
"linenumber": "% 6d" % (lineno + 1),
@@ -343,7 +343,7 @@
i.reverse()
parity = paritygen(web.stripecount)
- def entries(notip=False,limit=0, **map):
+ def entries(notip=False, limit=0, **map):
count = 0
for k, n in i:
if notip and k == "tip":
--- a/mercurial/httprepo.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/httprepo.py Mon Oct 05 22:17:39 2009 +0200
@@ -35,7 +35,7 @@
self._url, authinfo = url.getauthinfo(path)
self.ui = ui
- self.ui.debug(_('using %s\n') % self._url)
+ self.ui.debug('using %s\n' % self._url)
self.urlopener = url.opener(ui, authinfo)
@@ -56,7 +56,7 @@
self.caps = set(self.do_read('capabilities').split())
except error.RepoError:
self.caps = set()
- self.ui.debug(_('capabilities: %s\n') %
+ self.ui.debug('capabilities: %s\n' %
(' '.join(self.caps or ['none'])))
return self.caps
@@ -68,21 +68,21 @@
def do_cmd(self, cmd, **args):
data = args.pop('data', None)
headers = args.pop('headers', {})
- self.ui.debug(_("sending %s command\n") % cmd)
+ self.ui.debug("sending %s command\n" % cmd)
q = {"cmd": cmd}
q.update(args)
qs = '?%s' % urllib.urlencode(q)
cu = "%s%s" % (self._url, qs)
try:
if data:
- self.ui.debug(_("sending %s bytes\n") % len(data))
+ self.ui.debug("sending %s bytes\n" % len(data))
resp = self.urlopener.open(urllib2.Request(cu, data, headers))
except urllib2.HTTPError, inst:
if inst.code == 401:
raise util.Abort(_('authorization failed'))
raise
except httplib.HTTPException, inst:
- self.ui.debug(_('http error while sending %s command\n') % cmd)
+ self.ui.debug('http error while sending %s command\n' % cmd)
self.ui.traceback()
raise IOError(None, inst)
except IndexError:
@@ -105,7 +105,7 @@
if not (proto.startswith('application/mercurial-') or
proto.startswith('text/plain') or
proto.startswith('application/hg-changegroup')):
- self.ui.debug(_("requested URL: '%s'\n") % url.hidepassword(cu))
+ self.ui.debug("requested URL: '%s'\n" % url.hidepassword(cu))
raise error.RepoError(_("'%s' does not appear to be an hg repository")
% safeurl)
--- a/mercurial/i18n.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/i18n.py Mon Oct 05 22:17:39 2009 +0200
@@ -16,7 +16,7 @@
base = os.path.dirname(module)
for dir in ('.', '..'):
- localedir = os.path.normpath(os.path.join(base, dir, 'locale'))
+ localedir = os.path.join(base, dir, 'locale')
if os.path.isdir(localedir):
break
@@ -36,12 +36,16 @@
if message is None:
return message
- # We cannot just run the text through encoding.tolocal since that
- # leads to infinite recursion when encoding._encoding is invalid.
+ u = t.ugettext(message)
try:
- u = t.ugettext(message)
+ # encoding.tolocal cannot be used since it will first try to
+ # decode the Unicode string. Calling u.decode(enc) really
+ # means u.encode(sys.getdefaultencoding()).decode(enc). Since
+ # the Python encoding defaults to 'ascii', this fails if the
+ # translated string use non-ASCII characters.
return u.encode(encoding.encoding, "replace")
except LookupError:
+ # An unknown encoding results in a LookupError.
return message
_ = gettext
--- a/mercurial/ignore.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/ignore.py Mon Oct 05 22:17:39 2009 +0200
@@ -11,8 +11,16 @@
_commentre = None
-def _parselines(fp):
- for line in fp:
+def ignorepats(lines):
+ '''parse lines (iterable) of .hgignore text, returning a tuple of
+ (patterns, parse errors). These patterns should be given to compile()
+ to be validated and converted into a match function.'''
+ syntaxes = {'re': 'relre:', 'regexp': 'relre:', 'glob': 'relglob:'}
+ syntax = 'relre:'
+ patterns = []
+ warnings = []
+
+ for line in lines:
if "#" in line:
global _commentre
if not _commentre:
@@ -22,11 +30,30 @@
# fixup properly escaped comments that survived the above
line = line.replace("\\#", "#")
line = line.rstrip()
- if line:
- yield line
+ if not line:
+ continue
+
+ if line.startswith('syntax:'):
+ s = line[7:].strip()
+ try:
+ syntax = syntaxes[s]
+ except KeyError:
+ warnings.append(_("ignoring invalid syntax '%s'") % s)
+ continue
+ pat = syntax + line
+ for s, rels in syntaxes.iteritems():
+ if line.startswith(rels):
+ pat = line
+ break
+ elif line.startswith(s+':'):
+ pat = rels + line[len(s)+1:]
+ break
+ patterns.append(pat)
+
+ return patterns, warnings
def ignore(root, files, warn):
- '''return the contents of .hgignore files as a list of patterns.
+ '''return matcher covering patterns in 'files'.
the files parsed for patterns include:
.hgignore in the repository root
@@ -45,30 +72,14 @@
glob:pattern # non-rooted glob
pattern # pattern of the current default type'''
- syntaxes = {'re': 'relre:', 'regexp': 'relre:', 'glob': 'relglob:'}
pats = {}
for f in files:
try:
pats[f] = []
fp = open(f)
- syntax = 'relre:'
- for line in _parselines(fp):
- if line.startswith('syntax:'):
- s = line[7:].strip()
- try:
- syntax = syntaxes[s]
- except KeyError:
- warn(_("%s: ignoring invalid syntax '%s'\n") % (f, s))
- continue
- pat = syntax + line
- for s, rels in syntaxes.iteritems():
- if line.startswith(rels):
- pat = line
- break
- elif line.startswith(s+':'):
- pat = rels + line[len(s)+1:]
- break
- pats[f].append(pat)
+ pats[f], warnings = ignorepats(fp)
+ for warning in warnings:
+ warn("%s: %s\n" % (f, warning))
except IOError, inst:
if f != files[0]:
warn(_("skipping unreadable ignore file '%s': %s\n") %
--- a/mercurial/localrepo.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/localrepo.py Mon Oct 05 22:17:39 2009 +0200
@@ -13,6 +13,7 @@
import util, extensions, hook, error
import match as match_
import merge as merge_
+import tags as tags_
from lock import release
import weakref, stat, errno, os, time, inspect
propertycache = util.propertycache
@@ -89,8 +90,14 @@
self.sjoin = self.store.join
self.opener.createmode = self.store.createmode
- self.tagscache = None
- self._tagstypecache = None
+ # These two define the set of tags for this repository. _tags
+ # maps tag name to node; _tagtypes maps tag name to 'global' or
+ # 'local'. (Global tags are defined by .hgtags across all
+ # heads, and local tags are defined in .hg/localtags.) They
+ # constitute the in-memory cache of tags.
+ self._tags = None
+ self._tagtypes = None
+
self.branchcache = None
self._ubranchcache = None # UTF-8 version of branchcache
self._branchcachetip = None
@@ -160,8 +167,8 @@
fp.write('\n')
for name in names:
m = munge and munge(name) or name
- if self._tagstypecache and name in self._tagstypecache:
- old = self.tagscache.get(name, nullid)
+ if self._tagtypes and name in self._tagtypes:
+ old = self._tags.get(name, nullid)
fp.write('%s %s\n' % (hex(old), m))
fp.write('%s %s\n' % (hex(node), m))
fp.close()
@@ -233,100 +240,43 @@
def tags(self):
'''return a mapping of tag to node'''
- if self.tagscache:
- return self.tagscache
+ if self._tags is None:
+ (self._tags, self._tagtypes) = self._findtags()
+
+ return self._tags
- globaltags = {}
+ def _findtags(self):
+ '''Do the hard work of finding tags. Return a pair of dicts
+ (tags, tagtypes) where tags maps tag name to node, and tagtypes
+ maps tag name to a string like \'global\' or \'local\'.
+ Subclasses or extensions are free to add their own tags, but
+ should be aware that the returned dicts will be retained for the
+ duration of the localrepo object.'''
+
+ # XXX what tagtype should subclasses/extensions use? Currently
+ # mq and bookmarks add tags, but do not set the tagtype at all.
+ # Should each extension invent its own tag type? Should there
+ # be one tagtype for all such "virtual" tags? Or is the status
+ # quo fine?
+
+ alltags = {} # map tag name to (node, hist)
tagtypes = {}
- def readtags(lines, fn, tagtype):
- filetags = {}
- count = 0
-
- def warn(msg):
- self.ui.warn(_("%s, line %s: %s\n") % (fn, count, msg))
-
- for l in lines:
- count += 1
- if not l:
- continue
- s = l.split(" ", 1)
- if len(s) != 2:
- warn(_("cannot parse entry"))
- continue
- node, key = s
- key = encoding.tolocal(key.strip()) # stored in UTF-8
- try:
- bin_n = bin(node)
- except TypeError:
- warn(_("node '%s' is not well formed") % node)
- continue
- if bin_n not in self.changelog.nodemap:
- # silently ignore as pull -r might cause this
- continue
-
- h = []
- if key in filetags:
- n, h = filetags[key]
- h.append(n)
- filetags[key] = (bin_n, h)
-
- for k, nh in filetags.iteritems():
- if k not in globaltags:
- globaltags[k] = nh
- tagtypes[k] = tagtype
- continue
+ tags_.findglobaltags(self.ui, self, alltags, tagtypes)
+ tags_.readlocaltags(self.ui, self, alltags, tagtypes)
- # we prefer the global tag if:
- # it supercedes us OR
- # mutual supercedes and it has a higher rank
- # otherwise we win because we're tip-most
- an, ah = nh
- bn, bh = globaltags[k]
- if (bn != an and an in bh and
- (bn not in ah or len(bh) > len(ah))):
- an = bn
- ah.extend([n for n in bh if n not in ah])
- globaltags[k] = an, ah
- tagtypes[k] = tagtype
-
- seen = set()
- f = None
- ctxs = []
- for node in self.heads():
- try:
- fnode = self[node].filenode('.hgtags')
- except error.LookupError:
- continue
- if fnode not in seen:
- seen.add(fnode)
- if not f:
- f = self.filectx('.hgtags', fileid=fnode)
- else:
- f = f.filectx(fnode)
- ctxs.append(f)
-
- # read the tags file from each head, ending with the tip
- for f in reversed(ctxs):
- readtags(f.data().splitlines(), f, "global")
-
- try:
- data = encoding.fromlocal(self.opener("localtags").read())
- # localtags are stored in the local character set
- # while the internal tag table is stored in UTF-8
- readtags(data.splitlines(), "localtags", "local")
- except IOError:
- pass
-
- self.tagscache = {}
- self._tagstypecache = {}
- for k, nh in globaltags.iteritems():
- n = nh[0]
- if n != nullid:
- self.tagscache[k] = n
- self._tagstypecache[k] = tagtypes[k]
- self.tagscache['tip'] = self.changelog.tip()
- return self.tagscache
+ # Build the return dicts. Have to re-encode tag names because
+ # the tags module always uses UTF-8 (in order not to lose info
+ # writing to the cache), but the rest of Mercurial wants them in
+ # local encoding.
+ tags = {}
+ for (name, (node, hist)) in alltags.iteritems():
+ if node != nullid:
+ tags[encoding.tolocal(name)] = node
+ tags['tip'] = self.changelog.tip()
+ tagtypes = dict([(encoding.tolocal(name), value)
+ for (name, value) in tagtypes.iteritems()])
+ return (tags, tagtypes)
def tagtype(self, tagname):
'''
@@ -339,7 +289,7 @@
self.tags()
- return self._tagstypecache.get(tagname)
+ return self._tagtypes.get(tagname)
def tagslist(self):
'''return a list of tags ordered by revision'''
@@ -577,7 +527,7 @@
for mf, fn, cmd in self.filterpats[filter]:
if mf(filename):
- self.ui.debug(_("filtering %s through %s\n") % (filename, cmd))
+ self.ui.debug("filtering %s through %s\n" % (filename, cmd))
data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
break
@@ -668,6 +618,7 @@
% encoding.tolocal(self.dirstate.branch()))
self.invalidate()
self.dirstate.invalidate()
+ self.destroyed()
else:
self.ui.warn(_("no rollback information available\n"))
finally:
@@ -677,8 +628,8 @@
for a in "changelog manifest".split():
if a in self.__dict__:
delattr(self, a)
- self.tagscache = None
- self._tagstypecache = None
+ self._tags = None
+ self._tagtypes = None
self.nodetagscache = None
self.branchcache = None
self._ubranchcache = None
@@ -700,6 +651,9 @@
return l
def lock(self, wait=True):
+ '''Lock the repository store (.hg/store) and return a weak reference
+ to the lock. Use this before modifying the store (e.g. committing or
+ stripping). If you are opening a transaction, get a lock as well.)'''
l = self._lockref and self._lockref()
if l is not None and l.held:
l.lock()
@@ -711,6 +665,9 @@
return l
def wlock(self, wait=True):
+ '''Lock the non-store parts of the repository (everything under
+ .hg except .hg/store) and return a weak reference to the lock.
+ Use this before modifying files in .hg.'''
l = self._wlockref and self._wlockref()
if l is not None and l.held:
l.lock()
@@ -767,14 +724,14 @@
# find source in nearest ancestor if we've lost track
if not crev:
- self.ui.debug(_(" %s: searching for copy revision for %s\n") %
+ self.ui.debug(" %s: searching for copy revision for %s\n" %
(fname, cfname))
for ancestor in self['.'].ancestors():
if cfname in ancestor:
crev = ancestor[cfname].filenode()
break
- self.ui.debug(_(" %s: copy %s:%s\n") % (fname, cfname, hex(crev)))
+ self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
meta["copy"] = cfname
meta["copyrev"] = hex(crev)
fparent1, fparent2 = nullid, newfparent
@@ -966,6 +923,25 @@
del tr
lock.release()
+ def destroyed(self):
+ '''Inform the repository that nodes have been destroyed.
+ Intended for use by strip and rollback, so there's a common
+ place for anything that has to be done after destroying history.'''
+ # XXX it might be nice if we could take the list of destroyed
+ # nodes, but I don't see an easy way for rollback() to do that
+
+ # Ensure the persistent tag cache is updated. Doing it now
+ # means that the tag cache only has to worry about destroyed
+ # heads immediately after a strip/rollback. That in turn
+ # guarantees that "cachetip == currenttip" (comparing both rev
+ # and node) always means no nodes have been added or destroyed.
+
+ # XXX this is suboptimal when qrefresh'ing: we strip the current
+ # head, refresh the tag cache, then immediately add a new head.
+ # But I think doing it this way is necessary for the "instant
+ # tag cache retrieval" case to work.
+ tags_.findglobaltags(self.ui, self, {}, {})
+
def walk(self, match, node=None):
'''
walk recursively through the directory tree or a given
@@ -1318,22 +1294,22 @@
if n[0] in seen:
continue
- self.ui.debug(_("examining %s:%s\n")
+ self.ui.debug("examining %s:%s\n"
% (short(n[0]), short(n[1])))
if n[0] == nullid: # found the end of the branch
pass
elif n in seenbranch:
- self.ui.debug(_("branch already found\n"))
+ self.ui.debug("branch already found\n")
continue
elif n[1] and n[1] in m: # do we know the base?
- self.ui.debug(_("found incomplete branch %s:%s\n")
+ self.ui.debug("found incomplete branch %s:%s\n"
% (short(n[0]), short(n[1])))
search.append(n[0:2]) # schedule branch range for scanning
seenbranch.add(n)
else:
if n[1] not in seen and n[1] not in fetch:
if n[2] in m and n[3] in m:
- self.ui.debug(_("found new changeset %s\n") %
+ self.ui.debug("found new changeset %s\n" %
short(n[1]))
fetch.add(n[1]) # earliest unknown
for p in n[2:4]:
@@ -1348,11 +1324,11 @@
if r:
reqcnt += 1
- self.ui.debug(_("request %d: %s\n") %
+ self.ui.debug("request %d: %s\n" %
(reqcnt, " ".join(map(short, r))))
for p in xrange(0, len(r), 10):
for b in remote.branches(r[p:p+10]):
- self.ui.debug(_("received %s:%s\n") %
+ self.ui.debug("received %s:%s\n" %
(short(b[0]), short(b[1])))
unknown.append(b)
@@ -1365,15 +1341,15 @@
p = n[0]
f = 1
for i in l:
- self.ui.debug(_("narrowing %d:%d %s\n") % (f, len(l), short(i)))
+ self.ui.debug("narrowing %d:%d %s\n" % (f, len(l), short(i)))
if i in m:
if f <= 2:
- self.ui.debug(_("found new branch changeset %s\n") %
+ self.ui.debug("found new branch changeset %s\n" %
short(p))
fetch.add(p)
base[i] = 1
else:
- self.ui.debug(_("narrowed branch search to %s:%s\n")
+ self.ui.debug("narrowed branch search to %s:%s\n"
% (short(p), short(i)))
newsearch.append((p, i))
break
@@ -1392,10 +1368,10 @@
else:
raise util.Abort(_("repository is unrelated"))
- self.ui.debug(_("found new changesets starting at ") +
+ self.ui.debug("found new changesets starting at " +
" ".join([short(f) for f in fetch]) + "\n")
- self.ui.debug(_("%d total queries\n") % reqcnt)
+ self.ui.debug("%d total queries\n" % reqcnt)
return base.keys(), list(fetch), heads
@@ -1412,7 +1388,7 @@
base = {}
self.findincoming(remote, base, heads, force=force)
- self.ui.debug(_("common changesets up to ")
+ self.ui.debug("common changesets up to "
+ " ".join(map(short, base.keys())) + "\n")
remain = set(self.changelog.nodemap)
@@ -1488,6 +1464,12 @@
return self.push_addchangegroup(remote, force, revs)
def prepush(self, remote, force, revs):
+ '''Analyze the local and remote repositories and determine which
+ changesets need to be pushed to the remote. Return a tuple
+ (changegroup, remoteheads). changegroup is a readable file-like
+ object whose read() returns successive changegroup chunks ready to
+ be sent over the wire. remoteheads is the list of remote heads.
+ '''
common = {}
remote_heads = remote.heads()
inc = self.findincoming(remote, common, remote_heads, force=force)
@@ -1626,14 +1608,15 @@
if self.ui.verbose or source == 'bundle':
self.ui.status(_("%d changesets found\n") % len(nodes))
if self.ui.debugflag:
- self.ui.debug(_("list of changesets:\n"))
+ self.ui.debug("list of changesets:\n")
for node in nodes:
self.ui.debug("%s\n" % hex(node))
def changegroupsubset(self, bases, heads, source, extranodes=None):
- """This function generates a changegroup consisting of all the nodes
- that are descendents of any of the bases, and ancestors of any of
- the heads.
+ """Compute a changegroup consisting of all the nodes that are
+ descendents of any of the bases and ancestors of any of the heads.
+ Return a chunkbuffer object whose read() method will return
+ successive changegroup chunks.
It is fairly complex as determining which filenodes and which
manifest nodes need to be included for the changeset to be complete
@@ -1714,24 +1697,13 @@
def identity(x):
return x
- # A function generating function. Sets up an environment for the
- # inner function.
- def cmp_by_rev_func(revlog):
- # Compare two nodes by their revision number in the environment's
- # revision history. Since the revision number both represents the
- # most efficient order to read the nodes in, and represents a
- # topological sorting of the nodes, this function is often useful.
- def cmp_by_rev(a, b):
- return cmp(revlog.rev(a), revlog.rev(b))
- return cmp_by_rev
-
# If we determine that a particular file or manifest node must be a
# node that the recipient of the changegroup will already have, we can
# also assume the recipient will have all the parents. This function
# prunes them from the set of missing nodes.
def prune_parents(revlog, hasset, msngset):
haslst = list(hasset)
- haslst.sort(cmp_by_rev_func(revlog))
+ haslst.sort(key=revlog.rev)
for node in haslst:
parentlst = [p for p in revlog.parents(node) if p != nullid]
while parentlst:
@@ -1881,7 +1853,7 @@
add_extra_nodes(1, msng_mnfst_set)
msng_mnfst_lst = msng_mnfst_set.keys()
# Sort the manifestnodes by revision number.
- msng_mnfst_lst.sort(cmp_by_rev_func(mnfst))
+ msng_mnfst_lst.sort(key=mnfst.rev)
# Create a generator for the manifestnodes that calls our lookup
# and data collection functions back.
group = mnfst.group(msng_mnfst_lst, lookup_manifest_link,
@@ -1919,7 +1891,7 @@
yield changegroup.chunkheader(len(fname))
yield fname
# Sort the filenodes by their revision #
- msng_filenode_lst.sort(cmp_by_rev_func(filerevlog))
+ msng_filenode_lst.sort(key=filerevlog.rev)
# Create a group generator and only pass in a changenode
# lookup function as we need to collect no information
# from filenodes.
@@ -1943,8 +1915,9 @@
return self.changegroupsubset(basenodes, self.heads(), source)
def _changegroup(self, common, source):
- """Generate a changegroup of all nodes that we have that a recipient
- doesn't.
+ """Compute the changegroup of all nodes that we have that a recipient
+ doesn't. Return a chunkbuffer object whose read() method will return
+ successive changegroup chunks.
This is much easier than the previous function as we can assume that
the recipient has any changenode we aren't sending them.
@@ -1978,6 +1951,7 @@
return lookuprevlink
def gengroup():
+ '''yield a sequence of changegroup chunks (strings)'''
# construct a list of all changed files
changedfiles = set()
@@ -2020,7 +1994,7 @@
- number of heads stays the same: 1
"""
def csmap(x):
- self.ui.debug(_("add changeset %s\n") % short(x))
+ self.ui.debug("add changeset %s\n" % short(x))
return len(cl)
def revmap(x):
@@ -2066,7 +2040,7 @@
f = changegroup.getchunk(source)
if not f:
break
- self.ui.debug(_("adding %s revisions\n") % f)
+ self.ui.debug("adding %s revisions\n" % f)
fl = self.file(f)
o = len(fl)
chunkiter = changegroup.chunkiter(source)
@@ -2099,7 +2073,7 @@
if changesets > 0:
# forcefully update the on-disk branch cache
- self.ui.debug(_("updating the branch cache\n"))
+ self.ui.debug("updating the branch cache\n")
self.branchtags()
self.hook("changegroup", node=hex(cl.node(clstart)),
source=srctype, url=url)
@@ -2148,7 +2122,7 @@
except (ValueError, TypeError):
raise error.ResponseError(
_('Unexpected response from remote server:'), l)
- self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size)))
+ self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size)))
# for backwards compat, name was partially encoded
ofp = self.sopener(store.decodedir(name), 'w')
for chunk in util.filechunkiter(fp, limit=size):
--- a/mercurial/lock.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/lock.py Mon Oct 05 22:17:39 2009 +0200
@@ -1,4 +1,4 @@
-# lock.py - simple locking scheme for mercurial
+# lock.py - simple advisory locking scheme for mercurial
#
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
@@ -10,6 +10,15 @@
import warnings
class lock(object):
+ '''An advisory lock held by one process to control access to a set
+ of files. Non-cooperating processes or incorrectly written scripts
+ can ignore Mercurial's locking scheme and stomp all over the
+ repository, so don't do that.
+
+ Typically used via localrepository.lock() to lock the repository
+ store (.hg/store/) or localrepository.wlock() to lock everything
+ else under .hg/.'''
+
# lock is symlink on platforms that support it, file on others.
# symlink is used because create of directory entry and contents
--- a/mercurial/lsprof.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/lsprof.py Mon Oct 05 22:17:39 2009 +0200
@@ -26,12 +26,10 @@
"""XXX docstring"""
if crit not in profiler_entry.__dict__:
raise ValueError("Can't sort by %s" % crit)
- self.data.sort(lambda b, a: cmp(getattr(a, crit),
- getattr(b, crit)))
+ self.data.sort(key=lambda x: getattr(x, crit), reverse=True)
for e in self.data:
if e.calls:
- e.calls.sort(lambda b, a: cmp(getattr(a, crit),
- getattr(b, crit)))
+ e.calls.sort(key=lambda x: getattr(x, crit), reverse=True)
def pprint(self, top=None, file=None, limit=None, climit=None):
"""XXX docstring"""
--- a/mercurial/manifest.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/manifest.py Mon Oct 05 22:17:39 2009 +0200
@@ -20,12 +20,11 @@
def set(self, f, flags):
self._flags[f] = flags
def copy(self):
- return manifestdict(dict.copy(self), dict.copy(self._flags))
+ return manifestdict(self, dict.copy(self._flags))
class manifest(revlog.revlog):
def __init__(self, opener):
- self.mapcache = None
- self.listcache = None
+ self._mancache = None
revlog.revlog.__init__(self, opener, "00manifest.i")
def parse(self, lines):
@@ -40,12 +39,12 @@
def read(self, node):
if node == revlog.nullid:
return manifestdict() # don't upset local cache
- if self.mapcache and self.mapcache[0] == node:
- return self.mapcache[1]
+ if self._mancache and self._mancache[0] == node:
+ return self._mancache[1]
text = self.revision(node)
- self.listcache = array.array('c', text)
+ arraytext = array.array('c', text)
mapping = self.parse(text)
- self.mapcache = (node, mapping)
+ self._mancache = (node, mapping, arraytext)
return mapping
def _search(self, m, s, lo=0, hi=None):
@@ -93,8 +92,8 @@
def find(self, node, f):
'''look up entry for a single file efficiently.
return (node, flags) pair if found, (None, None) if not.'''
- if self.mapcache and node == self.mapcache[0]:
- return self.mapcache[1].get(f), self.mapcache[1].flags(f)
+ if self._mancache and self._mancache[0] == node:
+ return self._mancache[1].get(f), self._mancache[1].flags(f)
text = self.revision(node)
start, end = self._search(text, f)
if start == end:
@@ -110,17 +109,13 @@
def addlistdelta(addlist, x):
# start from the bottom up
# so changes to the offsets don't mess things up.
- i = len(x)
- while i > 0:
- i -= 1
- start = x[i][0]
- end = x[i][1]
- if x[i][2]:
- addlist[start:end] = array.array('c', x[i][2])
+ for start, end, content in reversed(x):
+ if content:
+ addlist[start:end] = array.array('c', content)
else:
del addlist[start:end]
- return "".join([struct.pack(">lll", d[0], d[1], len(d[2])) + d[2]
- for d in x ])
+ return "".join(struct.pack(">lll", start, end, len(content)) + content
+ for start, end, content in x)
def checkforbidden(l):
for f in l:
@@ -128,26 +123,29 @@
raise error.RevlogError(
_("'\\n' and '\\r' disallowed in filenames: %r") % f)
- # if we're using the listcache, make sure it is valid and
+ # if we're using the cache, make sure it is valid and
# parented by the same node we're diffing against
- if not (changed and self.listcache and p1 and self.mapcache[0] == p1):
+ if not (changed and self._mancache and p1 and self._mancache[0] == p1):
files = sorted(map)
checkforbidden(files)
# if this is changed to support newlines in filenames,
# be sure to check the templates/ dir again (especially *-raw.tmpl)
hex, flags = revlog.hex, map.flags
- text = ["%s\000%s%s\n" % (f, hex(map[f]), flags(f))
- for f in files]
- self.listcache = array.array('c', "".join(text))
+ text = ''.join("%s\000%s%s\n" % (f, hex(map[f]), flags(f))
+ for f in files)
+ arraytext = array.array('c', text)
cachedelta = None
else:
- addlist = self.listcache
+ added, removed = changed
+ addlist = self._mancache[2]
- checkforbidden(changed[0])
+ checkforbidden(added)
# combine the changed lists into one list for sorting
- work = [[x, 0] for x in changed[0]]
- work[len(work):] = [[x, 1] for x in changed[1]]
+ work = [(x, False) for x in added]
+ work.extend((x, True) for x in removed)
+ # this could use heapq.merge() (from python2.6+) or equivalent
+ # since the lists are already sorted
work.sort()
delta = []
@@ -160,18 +158,17 @@
# start with a readonly loop that finds the offset of
# each line and creates the deltas
- for w in work:
- f = w[0]
+ for f, todelete in work:
# bs will either be the index of the item or the insert point
start, end = self._search(addbuf, f, start)
- if w[1] == 0:
+ if not todelete:
l = "%s\000%s%s\n" % (f, revlog.hex(map[f]), map.flags(f))
else:
+ if start == end:
+ # item we want to delete was not found, error out
+ raise AssertionError(
+ _("failed to remove %s from manifest") % f)
l = ""
- if start == end and w[1] == 1:
- # item we want to delete was not found, error out
- raise AssertionError(
- _("failed to remove %s from manifest") % f)
if dstart != None and dstart <= start and dend >= start:
if dend < end:
dend = end
@@ -190,12 +187,12 @@
cachedelta = addlistdelta(addlist, delta)
# the delta is only valid if we've been processing the tip revision
- if self.mapcache[0] != self.tip():
+ if p1 != self.tip():
cachedelta = None
- self.listcache = addlist
+ arraytext = addlist
+ text = buffer(arraytext)
- n = self.addrevision(buffer(self.listcache), transaction, link,
- p1, p2, cachedelta)
- self.mapcache = (n, map)
+ n = self.addrevision(text, transaction, link, p1, p2, cachedelta)
+ self._mancache = (n, map, arraytext)
return n
--- a/mercurial/match.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/match.py Mon Oct 05 22:17:39 2009 +0200
@@ -5,7 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-import util, re
+import re
+import util
class match(object):
def __init__(self, root, cwd, patterns, include=[], exclude=[],
--- a/mercurial/merge.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/merge.py Mon Oct 05 22:17:39 2009 +0200
@@ -131,11 +131,13 @@
if m == n: # flags agree
return m # unchanged
if m and n and not a: # flags set, don't agree, differ from parent
- r = repo.ui.prompt(
+ r = repo.ui.promptchoice(
_(" conflicting flags for %s\n"
"(n)one, e(x)ec or sym(l)ink?") % f,
- (_("&None"), _("E&xec"), _("Sym&link")), _("n"))
- return r != _("n") and r or ''
+ (_("&None"), _("E&xec"), _("Sym&link")), 0)
+ if r == 1: return "x" # Exec
+ if r == 2: return "l" # Symlink
+ return ""
if m and m != a: # changed from a to m
return m
if n and n != a: # changed from a to n
@@ -159,8 +161,8 @@
act("divergent renames", "dr", of, fl)
repo.ui.note(_("resolving manifests\n"))
- repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial)))
- repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2))
+ repo.ui.debug(" overwrite %s partial %s\n" % (overwrite, bool(partial)))
+ repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2))
m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
copied = set(copy.values())
@@ -191,10 +193,10 @@
f, f2, f, fmerge(f, f2, f2), False)
elif f in ma: # clean, a different, no remote
if n != ma[f]:
- if repo.ui.prompt(
+ if repo.ui.promptchoice(
_(" local changed %s which remote deleted\n"
"use (c)hanged version or (d)elete?") % f,
- (_("&Changed"), _("&Delete")), _("c")) == _("d"):
+ (_("&Changed"), _("&Delete")), 0):
act("prompt delete", "r", f)
else:
act("prompt keep", "a", f)
@@ -222,10 +224,10 @@
elif f not in ma:
act("remote created", "g", f, m2.flags(f))
elif n != ma[f]:
- if repo.ui.prompt(
+ if repo.ui.promptchoice(
_("remote changed %s which local deleted\n"
"use (c)hanged version or leave (d)eleted?") % f,
- (_("&Changed"), _("&Deleted")), _("c")) == _("c"):
+ (_("&Changed"), _("&Deleted")), 0) == 0:
act("prompt recreating", "g", f, m2.flags(f))
return action
@@ -250,7 +252,7 @@
f2, fd, flags, move = a[2:]
if f == '.hgsubstate': # merged internally
continue
- repo.ui.debug(_("preserving %s for resolve of %s\n") % (f, fd))
+ repo.ui.debug("preserving %s for resolve of %s\n" % (f, fd))
fcl = wctx[f]
fco = mctx[f2]
fca = fcl.ancestor(fco) or repo.filectx(f, fileid=nullrev)
@@ -261,7 +263,7 @@
# remove renamed files after safely stored
for f in moves:
if util.lexists(repo.wjoin(f)):
- repo.ui.debug(_("removing %s\n") % f)
+ repo.ui.debug("removing %s\n" % f)
os.unlink(repo.wjoin(f))
audit_path = util.path_auditor(repo.root)
@@ -288,7 +290,7 @@
continue
f2, fd, flags, move = a[2:]
r = ms.resolve(fd, wctx, mctx)
- if r > 0:
+ if r is not None and r > 0:
unresolved += 1
else:
if r is None:
@@ -297,7 +299,7 @@
merged += 1
util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags)
if f != fd and move and util.lexists(repo.wjoin(f)):
- repo.ui.debug(_("removing %s\n") % f)
+ repo.ui.debug("removing %s\n" % f)
os.unlink(repo.wjoin(f))
elif m == "g": # get
flags = a[2]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/minirst.py Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,347 @@
+# minirst.py - minimal reStructuredText parser
+#
+# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
+
+"""simplified reStructuredText parser.
+
+This parser knows just enough about reStructuredText to parse the
+Mercurial docstrings.
+
+It cheats in a major way: nested blocks are not really nested. They
+are just indented blocks that look like they are nested. This relies
+on the user to keep the right indentation for the blocks.
+
+It only supports a small subset of reStructuredText:
+
+- paragraphs
+
+- definition lists (must use ' ' to indent definitions)
+
+- lists (items must start with '-')
+
+- field lists (colons cannot be escaped)
+
+- literal blocks
+
+- option lists (supports only long options without arguments)
+
+- inline markup is not recognized at all.
+"""
+
+import re, sys, textwrap
+
+
+def findblocks(text):
+ """Find continuous blocks of lines in text.
+
+ Returns a list of dictionaries representing the blocks. Each block
+ has an 'indent' field and a 'lines' field.
+ """
+ blocks = [[]]
+ lines = text.splitlines()
+ for line in lines:
+ if line.strip():
+ blocks[-1].append(line)
+ elif blocks[-1]:
+ blocks.append([])
+ if not blocks[-1]:
+ del blocks[-1]
+
+ for i, block in enumerate(blocks):
+ indent = min((len(l) - len(l.lstrip())) for l in block)
+ blocks[i] = dict(indent=indent, lines=[l[indent:] for l in block])
+ return blocks
+
+
+def findliteralblocks(blocks):
+ """Finds literal blocks and adds a 'type' field to the blocks.
+
+ Literal blocks are given the type 'literal', all other blocks are
+ given type the 'paragraph'.
+ """
+ i = 0
+ while i < len(blocks):
+ # Searching for a block that looks like this:
+ #
+ # +------------------------------+
+ # | paragraph |
+ # | (ends with "::") |
+ # +------------------------------+
+ # +---------------------------+
+ # | indented literal block |
+ # +---------------------------+
+ blocks[i]['type'] = 'paragraph'
+ if blocks[i]['lines'][-1].endswith('::') and i+1 < len(blocks):
+ indent = blocks[i]['indent']
+ adjustment = blocks[i+1]['indent'] - indent
+
+ if blocks[i]['lines'] == ['::']:
+ # Expanded form: remove block
+ del blocks[i]
+ i -= 1
+ elif blocks[i]['lines'][-1].endswith(' ::'):
+ # Partially minimized form: remove space and both
+ # colons.
+ blocks[i]['lines'][-1] = blocks[i]['lines'][-1][:-3]
+ else:
+ # Fully minimized form: remove just one colon.
+ blocks[i]['lines'][-1] = blocks[i]['lines'][-1][:-1]
+
+ # List items are formatted with a hanging indent. We must
+ # correct for this here while we still have the original
+ # information on the indentation of the subsequent literal
+ # blocks available.
+ if blocks[i]['lines'][0].startswith('- '):
+ indent += 2
+ adjustment -= 2
+
+ # Mark the following indented blocks.
+ while i+1 < len(blocks) and blocks[i+1]['indent'] > indent:
+ blocks[i+1]['type'] = 'literal'
+ blocks[i+1]['indent'] -= adjustment
+ i += 1
+ i += 1
+ return blocks
+
+
+def findsections(blocks):
+ """Finds sections.
+
+ The blocks must have a 'type' field, i.e., they should have been
+ run through findliteralblocks first.
+ """
+ for block in blocks:
+ # Searching for a block that looks like this:
+ #
+ # +------------------------------+
+ # | Section title |
+ # | ------------- |
+ # +------------------------------+
+ if (block['type'] == 'paragraph' and
+ len(block['lines']) == 2 and
+ block['lines'][1] == '-' * len(block['lines'][0])):
+ block['type'] = 'section'
+ return blocks
+
+
+def findbulletlists(blocks):
+ """Finds bullet lists.
+
+ The blocks must have a 'type' field, i.e., they should have been
+ run through findliteralblocks first.
+ """
+ i = 0
+ while i < len(blocks):
+ # Searching for a paragraph that looks like this:
+ #
+ # +------+-----------------------+
+ # | "- " | list item |
+ # +------| (body elements)+ |
+ # +-----------------------+
+ if (blocks[i]['type'] == 'paragraph' and
+ blocks[i]['lines'][0].startswith('- ')):
+ items = []
+ for line in blocks[i]['lines']:
+ if line.startswith('- '):
+ items.append(dict(type='bullet', lines=[],
+ indent=blocks[i]['indent']))
+ line = line[2:]
+ items[-1]['lines'].append(line)
+ blocks[i:i+1] = items
+ i += len(items) - 1
+ i += 1
+ return blocks
+
+
+_optionre = re.compile(r'^(--[a-z-]+)((?:[ =][a-zA-Z][\w-]*)? +)(.*)$')
+def findoptionlists(blocks):
+ """Finds option lists.
+
+ The blocks must have a 'type' field, i.e., they should have been
+ run through findliteralblocks first.
+ """
+ i = 0
+ while i < len(blocks):
+ # Searching for a paragraph that looks like this:
+ #
+ # +----------------------------+-------------+
+ # | "--" option " " | description |
+ # +-------+--------------------+ |
+ # | (body elements)+ |
+ # +----------------------------------+
+ if (blocks[i]['type'] == 'paragraph' and
+ _optionre.match(blocks[i]['lines'][0])):
+ options = []
+ for line in blocks[i]['lines']:
+ m = _optionre.match(line)
+ if m:
+ option, arg, rest = m.groups()
+ width = len(option) + len(arg)
+ options.append(dict(type='option', lines=[],
+ indent=blocks[i]['indent'],
+ width=width))
+ options[-1]['lines'].append(line)
+ blocks[i:i+1] = options
+ i += len(options) - 1
+ i += 1
+ return blocks
+
+
+_fieldre = re.compile(r':(?![: ])([^:]*)(?<! ):( +)(.*)')
+def findfieldlists(blocks):
+ """Finds fields lists.
+
+ The blocks must have a 'type' field, i.e., they should have been
+ run through findliteralblocks first.
+ """
+ i = 0
+ while i < len(blocks):
+ # Searching for a paragraph that looks like this:
+ #
+ #
+ # +--------------------+----------------------+
+ # | ":" field name ":" | field body |
+ # +-------+------------+ |
+ # | (body elements)+ |
+ # +-----------------------------------+
+ if (blocks[i]['type'] == 'paragraph' and
+ _fieldre.match(blocks[i]['lines'][0])):
+ indent = blocks[i]['indent']
+ fields = []
+ for line in blocks[i]['lines']:
+ m = _fieldre.match(line)
+ if m:
+ key, spaces, rest = m.groups()
+ width = 2 + len(key) + len(spaces)
+ fields.append(dict(type='field', lines=[],
+ indent=indent, width=width))
+ # Turn ":foo: bar" into "foo bar".
+ line = '%s %s%s' % (key, spaces, rest)
+ fields[-1]['lines'].append(line)
+ blocks[i:i+1] = fields
+ i += len(fields) - 1
+ i += 1
+ return blocks
+
+
+def finddefinitionlists(blocks):
+ """Finds definition lists.
+
+ The blocks must have a 'type' field, i.e., they should have been
+ run through findliteralblocks first.
+ """
+ i = 0
+ while i < len(blocks):
+ # Searching for a paragraph that looks like this:
+ #
+ # +----------------------------+
+ # | term |
+ # +--+-------------------------+--+
+ # | definition |
+ # | (body elements)+ |
+ # +----------------------------+
+ if (blocks[i]['type'] == 'paragraph' and
+ len(blocks[i]['lines']) > 1 and
+ not blocks[i]['lines'][0].startswith(' ') and
+ blocks[i]['lines'][1].startswith(' ')):
+ definitions = []
+ for line in blocks[i]['lines']:
+ if not line.startswith(' '):
+ definitions.append(dict(type='definition', lines=[],
+ indent=blocks[i]['indent']))
+ definitions[-1]['lines'].append(line)
+ definitions[-1]['hang'] = len(line) - len(line.lstrip())
+ blocks[i:i+1] = definitions
+ i += len(definitions) - 1
+ i += 1
+ return blocks
+
+
+def addmargins(blocks):
+ """Adds empty blocks for vertical spacing.
+
+ This groups bullets, options, and definitions together with no vertical
+ space between them, and adds an empty block between all other blocks.
+ """
+ i = 1
+ while i < len(blocks):
+ if (blocks[i]['type'] == blocks[i-1]['type'] and
+ blocks[i]['type'] in ('bullet', 'option', 'field', 'definition')):
+ i += 1
+ else:
+ blocks.insert(i, dict(lines=[''], indent=0, type='margin'))
+ i += 2
+ return blocks
+
+
+def formatblock(block, width):
+ """Format a block according to width."""
+ if width <= 0:
+ width = 78
+ indent = ' ' * block['indent']
+ if block['type'] == 'margin':
+ return ''
+ elif block['type'] == 'literal':
+ indent += ' '
+ return indent + ('\n' + indent).join(block['lines'])
+ elif block['type'] == 'section':
+ return indent + ('\n' + indent).join(block['lines'])
+ elif block['type'] == 'definition':
+ term = indent + block['lines'][0]
+ defindent = indent + block['hang'] * ' '
+ text = ' '.join(map(str.strip, block['lines'][1:]))
+ return "%s\n%s" % (term, textwrap.fill(text, width=width,
+ initial_indent=defindent,
+ subsequent_indent=defindent))
+ else:
+ initindent = subindent = indent
+ text = ' '.join(map(str.strip, block['lines']))
+ if block['type'] == 'bullet':
+ initindent = indent + '- '
+ subindent = indent + ' '
+ elif block['type'] in ('option', 'field'):
+ subindent = indent + block['width'] * ' '
+
+ return textwrap.fill(text, width=width,
+ initial_indent=initindent,
+ subsequent_indent=subindent)
+
+
+def format(text, width, indent=0):
+ """Parse and format the text according to width."""
+ blocks = findblocks(text)
+ for b in blocks:
+ b['indent'] += indent
+ blocks = findliteralblocks(blocks)
+ blocks = findsections(blocks)
+ blocks = findbulletlists(blocks)
+ blocks = findoptionlists(blocks)
+ blocks = findfieldlists(blocks)
+ blocks = finddefinitionlists(blocks)
+ blocks = addmargins(blocks)
+ return '\n'.join(formatblock(b, width) for b in blocks)
+
+
+if __name__ == "__main__":
+ from pprint import pprint
+
+ def debug(func, blocks):
+ blocks = func(blocks)
+ print "*** after %s:" % func.__name__
+ pprint(blocks)
+ print
+ return blocks
+
+ text = open(sys.argv[1]).read()
+ blocks = debug(findblocks, text)
+ blocks = debug(findliteralblocks, blocks)
+ blocks = debug(findsections, blocks)
+ blocks = debug(findbulletlists, blocks)
+ blocks = debug(findoptionlists, blocks)
+ blocks = debug(findfieldlists, blocks)
+ blocks = debug(finddefinitionlists, blocks)
+ blocks = debug(addmargins, blocks)
+ print '\n'.join(formatblock(b, 30) for b in blocks)
--- a/mercurial/patch.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/patch.py Mon Oct 05 22:17:39 2009 +0200
@@ -9,7 +9,7 @@
from i18n import _
from node import hex, nullid, short
import base85, cmdutil, mdiff, util, diffhelpers, copies
-import cStringIO, email.Parser, os, re, math
+import cStringIO, email.Parser, os, re
import sys, tempfile, zlib
gitre = re.compile('diff --git a/(.*) b/(.*)')
@@ -93,12 +93,12 @@
hgpatch = False
ignoretext = False
- ui.debug(_('found patch at byte %d\n') % m.start(0))
+ ui.debug('found patch at byte %d\n' % m.start(0))
diffs_seen += 1
cfp = cStringIO.StringIO()
for line in payload[:m.start(0)].splitlines():
if line.startswith('# HG changeset patch'):
- ui.debug(_('patch generated by hg export\n'))
+ ui.debug('patch generated by hg export\n')
hgpatch = True
# drop earlier commit message content
cfp.seek(0)
@@ -188,7 +188,7 @@
if m:
if gp:
gitpatches.append(gp)
- src, dst = m.group(1, 2)
+ dst = m.group(2)
gp = patchmeta(dst)
gp.lineno = lineno
elif gp:
@@ -326,10 +326,6 @@
# looks through the hash and finds candidate lines. The
# result is a list of line numbers sorted based on distance
# from linenum
- def sorter(a, b):
- vala = abs(a - linenum)
- valb = abs(b - linenum)
- return cmp(vala, valb)
try:
cand = self.hash[l]
@@ -338,7 +334,7 @@
if len(cand) > 1:
# resort our list of potentials forward then back.
- cand.sort(sorter)
+ cand.sort(key=lambda x: abs(x - linenum))
return cand
def hashlines(self):
@@ -382,15 +378,13 @@
self.write()
self.write_rej()
- def apply(self, h, reverse):
+ def apply(self, h):
if not h.complete():
raise PatchError(_("bad hunk #%d %s (%d %d %d %d)") %
(h.number, h.desc, len(h.a), h.lena, len(h.b),
h.lenb))
self.hunks += 1
- if reverse:
- h.reverse()
if self.missing:
self.rej.append(h)
@@ -604,31 +598,6 @@
self.startb, self.lenb)
self.hunk[0] = self.desc
- def reverse(self):
- self.create, self.remove = self.remove, self.create
- origlena = self.lena
- origstarta = self.starta
- self.lena = self.lenb
- self.starta = self.startb
- self.lenb = origlena
- self.startb = origstarta
- self.a = []
- self.b = []
- # self.hunk[0] is the @@ description
- for x in xrange(1, len(self.hunk)):
- o = self.hunk[x]
- if o.startswith('-'):
- n = '+' + o[1:]
- self.b.append(o[1:])
- elif o.startswith('+'):
- n = '-' + o[1:]
- self.a.append(n)
- else:
- n = o
- self.b.append(o[1:])
- self.a.append(o)
- self.hunk[x] = o
-
def fix_newline(self):
diffhelpers.fix_newline(self.hunk, self.a, self.b)
@@ -766,7 +735,7 @@
return s
return s[:i]
-def selectfile(afile_orig, bfile_orig, hunk, strip, reverse):
+def selectfile(afile_orig, bfile_orig, hunk, strip):
def pathstrip(path, count=1):
pathlen = len(path)
i = 0
@@ -794,9 +763,18 @@
else:
goodb = not nullb and os.path.exists(bfile)
createfunc = hunk.createfile
- if reverse:
- createfunc = hunk.rmfile
missing = not goodb and not gooda and not createfunc()
+
+ # some diff programs apparently produce create patches where the
+ # afile is not /dev/null, but rather the same name as the bfile
+ if missing and afile == bfile:
+ # this isn't very pretty
+ hunk.create = True
+ if createfunc():
+ missing = False
+ else:
+ hunk.create = False
+
# If afile is "a/b/foo" and bfile is "a/b/foo.orig" we assume the
# diff is between a file and its backup. In this case, the original
# file should be patched (see original mpatch code).
@@ -970,8 +948,7 @@
if hunknum == 0 and dopatch and not gitworkdone:
raise NoHunks
-def applydiff(ui, fp, changed, strip=1, sourcefile=None, reverse=False,
- eol=None):
+def applydiff(ui, fp, changed, strip=1, sourcefile=None, eol=None):
"""
Reads a patch from fp and tries to apply it.
@@ -1001,7 +978,7 @@
if not current_file:
continue
current_hunk = values
- ret = current_file.apply(current_hunk, reverse)
+ ret = current_file.apply(current_hunk)
if ret >= 0:
changed.setdefault(current_file.fname, None)
if ret > 0:
@@ -1014,7 +991,7 @@
current_file = patchfile(ui, sourcefile, opener, eol=eol)
else:
current_file, missing = selectfile(afile, bfile, first_hunk,
- strip, reverse)
+ strip)
current_file = patchfile(ui, current_file, opener, missing, eol)
except PatchError, err:
ui.warn(str(err) + '\n')
@@ -1140,7 +1117,7 @@
raise util.Abort(_('Unsupported line endings type: %s') % eolmode)
try:
- fp = file(patchobj, 'rb')
+ fp = open(patchobj, 'rb')
except TypeError:
fp = patchobj
if cwd:
@@ -1178,7 +1155,7 @@
return internalpatch(patchname, ui, strip, cwd, files, eolmode)
except NoHunks:
patcher = util.find_exe('gpatch') or util.find_exe('patch') or 'patch'
- ui.debug(_('no valid hunks found; trying with %r instead\n') %
+ ui.debug('no valid hunks found; trying with %r instead\n' %
patcher)
if util.needbinarypatch():
args.append('--binary')
@@ -1422,23 +1399,26 @@
maxtotal = max(maxtotal, adds+removes)
countwidth = len(str(maxtotal))
- graphwidth = width - countwidth - maxname
+ graphwidth = width - countwidth - maxname - 6
if graphwidth < 10:
graphwidth = 10
- factor = max(int(math.ceil(float(maxtotal) / graphwidth)), 1)
+ def scale(i):
+ if maxtotal <= graphwidth:
+ return i
+ # If diffstat runs out of room it doesn't print anything,
+ # which isn't very useful, so always print at least one + or -
+ # if there were at least some changes.
+ return max(i * graphwidth // maxtotal, int(bool(i)))
for filename, adds, removes in stats:
- # If diffstat runs out of room it doesn't print anything, which
- # isn't very useful, so always print at least one + or - if there
- # were at least some changes
- pluses = '+' * max(adds/factor, int(bool(adds)))
- minuses = '-' * max(removes/factor, int(bool(removes)))
+ pluses = '+' * scale(adds)
+ minuses = '-' * scale(removes)
output.append(' %-*s | %*.d %s%s\n' % (maxname, filename, countwidth,
adds+removes, pluses, minuses))
if stats:
- output.append(' %d files changed, %d insertions(+), %d deletions(-)\n'
+ output.append(_(' %d files changed, %d insertions(+), %d deletions(-)\n')
% (len(stats), totaladds, totalremoves))
return ''.join(output)
--- a/mercurial/posix.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/posix.py Mon Oct 05 22:17:39 2009 +0200
@@ -7,9 +7,9 @@
from i18n import _
import osutil
-import os, sys, errno, stat, getpass, pwd, grp
+import os, sys, errno, stat, getpass, pwd, grp, fcntl
-posixfile = file
+posixfile = open
nulldev = '/dev/null'
normpath = os.path.normpath
samestat = os.path.samestat
@@ -70,20 +70,20 @@
if l:
if not stat.S_ISLNK(s):
# switch file to link
- data = file(f).read()
+ data = open(f).read()
os.unlink(f)
try:
os.symlink(data, f)
except:
# failed to make a link, rewrite file
- file(f, "w").write(data)
+ open(f, "w").write(data)
# no chmod needed at this point
return
if stat.S_ISLNK(s):
# switch link to file
data = os.readlink(f)
os.unlink(f)
- file(f, "w").write(data)
+ open(f, "w").write(data)
s = 0666 & ~umask # avoid restatting for chmod
sx = s & 0100
@@ -104,6 +104,44 @@
def localpath(path):
return path
+if sys.platform == 'darwin':
+ def realpath(path):
+ '''
+ Returns the true, canonical file system path equivalent to the given
+ path.
+
+ Equivalent means, in this case, resulting in the same, unique
+ file system link to the path. Every file system entry, whether a file,
+ directory, hard link or symbolic link or special, will have a single
+ path preferred by the system, but may allow multiple, differing path
+ lookups to point to it.
+
+ Most regular UNIX file systems only allow a file system entry to be
+ looked up by its distinct path. Obviously, this does not apply to case
+ insensitive file systems, whether case preserving or not. The most
+ complex issue to deal with is file systems transparently reencoding the
+ path, such as the non-standard Unicode normalisation required for HFS+
+ and HFSX.
+ '''
+ # Constants copied from /usr/include/sys/fcntl.h
+ F_GETPATH = 50
+ O_SYMLINK = 0x200000
+
+ try:
+ fd = os.open(path, O_SYMLINK)
+ except OSError, err:
+ if err.errno is errno.ENOENT:
+ return path
+ raise
+
+ try:
+ return fcntl.fcntl(fd, F_GETPATH, '\0' * 1024).rstrip('\0')
+ finally:
+ os.close(fd)
+else:
+ # Fallback to the likely inadequate Python builtin function.
+ realpath = os.path.realpath
+
def shellquote(s):
if os.sys.platform == 'OpenVMS':
return '"%s"' % s
@@ -127,17 +165,11 @@
return inst.errno != errno.ESRCH
def explain_exit(code):
- """return a 2-tuple (desc, code) describing a process's status"""
- if os.WIFEXITED(code):
- val = os.WEXITSTATUS(code)
- return _("exited with status %d") % val, val
- elif os.WIFSIGNALED(code):
- val = os.WTERMSIG(code)
- return _("killed by signal %d") % val, val
- elif os.WIFSTOPPED(code):
- val = os.WSTOPSIG(code)
- return _("stopped by signal %d") % val, val
- raise ValueError(_("invalid exit code"))
+ """return a 2-tuple (desc, code) describing a subprocess status
+ (codes from kill are negative - not os.system/wait encoding)"""
+ if code >= 0:
+ return _("exited with status %d") % code, code
+ return _("killed by signal %d") % -code, -code
def isowner(st):
"""Return True if the stat object st is from the current user."""
--- a/mercurial/pure/base85.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/pure/base85.py Mon Oct 05 22:17:39 2009 +0200
@@ -25,8 +25,8 @@
longs = len(text) >> 2
words = struct.unpack('>%dL' % (longs), text)
- out = ''.join(_b85chars[(word / 52200625) % 85] +
- _b85chars2[(word / 7225) % 7225] +
+ out = ''.join(_b85chars[(word // 52200625) % 85] +
+ _b85chars2[(word // 7225) % 7225] +
_b85chars2[word % 7225]
for word in words)
@@ -37,7 +37,7 @@
olen = l % 4
if olen:
olen += 1
- olen += l / 4 * 5
+ olen += l // 4 * 5
return out[:olen]
def b85decode(text):
--- a/mercurial/pure/osutil.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/pure/osutil.py Mon Oct 05 22:17:39 2009 +0200
@@ -8,7 +8,7 @@
import os
import stat as _stat
-posixfile = file
+posixfile = open
def _mode_to_kind(mode):
if _stat.S_ISREG(mode): return _stat.S_IFREG
--- a/mercurial/repair.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/repair.py Mon Oct 05 22:17:39 2009 +0200
@@ -142,3 +142,4 @@
if backup != "strip":
os.unlink(chgrpfile)
+ repo.destroyed()
--- a/mercurial/repo.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/repo.py Mon Oct 05 22:17:39 2009 +0200
@@ -40,4 +40,5 @@
url = self.url()
if url.endswith('/'):
return url + path
- return url + '/' + path
+ else:
+ return url + '/' + path
--- a/mercurial/revlog.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/revlog.py Mon Oct 05 22:17:39 2009 +0200
@@ -879,7 +879,7 @@
if len(id) < 40:
try:
# hex(node)[:...]
- l = len(id) / 2 # grab an even number of digits
+ l = len(id) // 2 # grab an even number of digits
bin_id = bin(id[:l*2])
nl = [n for n in self.nodemap if n[:l] == bin_id]
nl = [n for n in nl if hex(n).startswith(id)]
@@ -973,7 +973,7 @@
if node == nullid:
return ""
if self._cache and self._cache[0] == node:
- return str(self._cache[2])
+ return self._cache[2]
# look up what we need to read
text = None
@@ -988,7 +988,7 @@
# do we have useful data cached?
if self._cache and self._cache[1] >= base and self._cache[1] < rev:
base = self._cache[1]
- text = str(self._cache[2])
+ text = self._cache[2]
self._loadindex(base, rev + 1)
self._chunkraw(base, rev)
@@ -1111,7 +1111,8 @@
ifh.write(data[1])
self.checkinlinesize(transaction, ifh)
- self._cache = (node, curr, text)
+ if type(text) == str: # only accept immutable objects
+ self._cache = (node, curr, text)
return node
def ancestor(self, a, b):
@@ -1127,7 +1128,8 @@
return self.node(c)
def group(self, nodelist, lookup, infocollect=None):
- """calculate a delta group
+ """Calculate a delta group, yielding a sequence of changegroup chunks
+ (strings).
Given a list of changeset revs, return a set of deltas and
metadata corresponding to nodes. the first delta is
@@ -1354,7 +1356,7 @@
f.seek(0, 2)
actual = f.tell()
s = self._io.size
- i = max(0, actual / s)
+ i = max(0, actual // s)
di = actual - (i * s)
if self._inline:
databytes = 0
--- a/mercurial/sshrepo.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/sshrepo.py Mon Oct 05 22:17:39 2009 +0200
@@ -75,7 +75,7 @@
if lines[-1] == "1\n" and l == "\n":
break
if l:
- ui.debug(_("remote: "), l)
+ ui.debug("remote: ", l)
lines.append(l)
max_noise -= 1
else:
@@ -113,7 +113,7 @@
__del__ = cleanup
def do_cmd(self, cmd, **args):
- self.ui.debug(_("sending %s command\n") % cmd)
+ self.ui.debug("sending %s command\n" % cmd)
self.pipeo.write("%s\n" % cmd)
for k, v in args.iteritems():
self.pipeo.write("%s %d\n" % (k, len(v)))
--- a/mercurial/sshserver.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/sshserver.py Mon Oct 05 22:17:39 2009 +0200
@@ -59,7 +59,7 @@
try:
r = hex(self.repo.lookup(key))
success = 1
- except Exception,inst:
+ except Exception, inst:
r = str(inst)
success = 0
self.respond("%s %s\n" % (success, r))
--- a/mercurial/statichttprepo.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/statichttprepo.py Mon Oct 05 22:17:39 2009 +0200
@@ -114,7 +114,7 @@
self.manifest = manifest.manifest(self.sopener)
self.changelog = changelog.changelog(self.sopener)
- self.tagscache = None
+ self._tags = None
self.nodetagscache = None
self.encodepats = None
self.decodepats = None
--- a/mercurial/streamclone.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/streamclone.py Mon Oct 05 22:17:39 2009 +0200
@@ -46,10 +46,9 @@
# get consistent snapshot of repo, lock during scan
lock = repo.lock()
try:
- repo.ui.debug(_('scanning\n'))
+ repo.ui.debug('scanning\n')
for name, ename, size in repo.store.walk():
- # for backwards compat, name was partially encoded
- entries.append((store.encodedir(name), size))
+ entries.append((name, size))
total_bytes += size
finally:
lock.release()
@@ -57,11 +56,12 @@
raise StreamException(2)
yield '0\n'
- repo.ui.debug(_('%d files, %d bytes to transfer\n') %
+ repo.ui.debug('%d files, %d bytes to transfer\n' %
(len(entries), total_bytes))
yield '%d %d\n' % (len(entries), total_bytes)
for name, size in entries:
- repo.ui.debug(_('sending %s (%d bytes)\n') % (name, size))
- yield '%s\0%d\n' % (name, size)
+ repo.ui.debug('sending %s (%d bytes)\n' % (name, size))
+ # partially encode name over the wire for backwards compat
+ yield '%s\0%d\n' % (store.encodedir(name), size)
for chunk in util.filechunkiter(repo.sopener(name), limit=size):
yield chunk
--- a/mercurial/subrepo.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/subrepo.py Mon Oct 05 22:17:39 2009 +0200
@@ -8,7 +8,7 @@
import errno, os
from i18n import _
import config, util, node, error
-localrepo = hg = None
+hg = None
nullstate = ('', '')
@@ -63,11 +63,11 @@
wctx.sub(s).get(r)
sm[s] = r
elif l[0] != r[0]: # sources differ
- if repo.ui.prompt(
+ if repo.ui.promptchoice(
_(' subrepository sources for %s differ\n'
'use (l)ocal source (%s) or (r)emote source (%s)?')
% (s, l[0], r[0]),
- (_('&Local'), _('&Remote')), _('l')) == _('r'):
+ (_('&Local'), _('&Remote')), 0):
wctx.sub(s).get(r)
sm[s] = r
elif l[1] == a[1]: # local side is unchanged
@@ -79,10 +79,10 @@
elif l == a: # remote removed, local unchanged
wctx.sub(s).remove()
else:
- if repo.ui.prompt(
+ if repo.ui.promptchoice(
_(' local changed subrepository %s which remote removed\n'
'use (c)hanged version or (d)elete?') % s,
- (_('&Changed'), _('&Delete')), _('c')) == _('d'):
+ (_('&Changed'), _('&Delete')), 0):
wctx.sub(s).remove()
for s, r in s2.items():
@@ -92,10 +92,10 @@
wctx.sub(s).get(r)
sm[s] = r
elif r != sa[s]:
- if repo.ui.prompt(
+ if repo.ui.promptchoice(
_(' remote changed subrepository %s which local removed\n'
'use (c)hanged version or (d)elete?') % s,
- (_('&Changed'), _('&Delete')), _('c')) == _('c'):
+ (_('&Changed'), _('&Delete')), 0) == 0:
wctx.sub(s).get(r)
sm[s] = r
@@ -122,9 +122,8 @@
# because it wants to make repo objects from deep inside the stack
# so we manually delay the circular imports to not break
# scripts that don't use our demand-loading
- global localrepo, hg
- import localrepo as l, hg as h
- localrepo = l
+ global hg
+ import hg as h
hg = h
util.path_auditor(ctx._repo.root)(path)
@@ -140,10 +139,10 @@
r = ctx._repo
root = r.wjoin(path)
if os.path.exists(os.path.join(root, '.hg')):
- self._repo = localrepo.localrepository(r.ui, root)
+ self._repo = hg.repository(r.ui, root)
else:
util.makedirs(root)
- self._repo = localrepo.localrepository(r.ui, root, create=True)
+ self._repo = hg.repository(r.ui, root, create=True)
self._repo._subparent = r
self._repo._subsource = state[0]
@@ -168,7 +167,7 @@
self._repo.ui.note(_('removing subrepo %s\n') % self._path)
hg.clean(self._repo, node.nullid, False)
- def get(self, state):
+ def _get(self, state):
source, revision = state
try:
self._repo.lookup(revision)
@@ -179,9 +178,13 @@
other = hg.repository(self._repo.ui, srcurl)
self._repo.pull(other)
+ def get(self, state):
+ self._get(state)
+ source, revision = state
hg.clean(self._repo, revision, False)
def merge(self, state):
+ self._get(state)
hg.merge(self._repo, state[1], remind=False)
def push(self, force):
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/tags.py Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,341 @@
+# tags.py - read tag info from local repository
+#
+# Copyright 2009 Matt Mackall <mpm@selenic.com>
+# Copyright 2009 Greg Ward <greg@gerg.ca>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
+
+# Currently this module only deals with reading and caching tags.
+# Eventually, it could take care of updating (adding/removing/moving)
+# tags too.
+
+import os
+from node import nullid, bin, hex, short
+from i18n import _
+import encoding
+import error
+
+def _debugalways(ui, *msg):
+ ui.write(*msg)
+
+def _debugconditional(ui, *msg):
+ ui.debug(*msg)
+
+def _debugnever(ui, *msg):
+ pass
+
+_debug = _debugalways
+_debug = _debugnever
+
+def findglobaltags1(ui, repo, alltags, tagtypes):
+ '''Find global tags in repo by reading .hgtags from every head that
+ has a distinct version of it. Updates the dicts alltags, tagtypes
+ in place: alltags maps tag name to (node, hist) pair (see _readtags()
+ below), and tagtypes maps tag name to tag type ('global' in this
+ case).'''
+
+ seen = set()
+ fctx = None
+ ctxs = [] # list of filectx
+ for node in repo.heads():
+ try:
+ fnode = repo[node].filenode('.hgtags')
+ except error.LookupError:
+ continue
+ if fnode not in seen:
+ seen.add(fnode)
+ if not fctx:
+ fctx = repo.filectx('.hgtags', fileid=fnode)
+ else:
+ fctx = fctx.filectx(fnode)
+ ctxs.append(fctx)
+
+ # read the tags file from each head, ending with the tip
+ for fctx in reversed(ctxs):
+ filetags = _readtags(
+ ui, repo, fctx.data().splitlines(), fctx)
+ _updatetags(filetags, "global", alltags, tagtypes)
+
+def findglobaltags2(ui, repo, alltags, tagtypes):
+ '''Same as findglobaltags1(), but with caching.'''
+ # This is so we can be lazy and assume alltags contains only global
+ # tags when we pass it to _writetagcache().
+ assert len(alltags) == len(tagtypes) == 0, \
+ "findglobaltags() should be called first"
+
+ (heads, tagfnode, cachetags, shouldwrite) = _readtagcache(ui, repo)
+ if cachetags is not None:
+ assert not shouldwrite
+ # XXX is this really 100% correct? are there oddball special
+ # cases where a global tag should outrank a local tag but won't,
+ # because cachetags does not contain rank info?
+ _updatetags(cachetags, 'global', alltags, tagtypes)
+ return
+
+ _debug(ui, "reading tags from %d head(s): %s\n"
+ % (len(heads), map(short, reversed(heads))))
+ seen = set() # set of fnode
+ fctx = None
+ for head in reversed(heads): # oldest to newest
+ assert head in repo.changelog.nodemap, \
+ "tag cache returned bogus head %s" % short(head)
+
+ fnode = tagfnode.get(head)
+ if fnode and fnode not in seen:
+ seen.add(fnode)
+ if not fctx:
+ fctx = repo.filectx('.hgtags', fileid=fnode)
+ else:
+ fctx = fctx.filectx(fnode)
+
+ filetags = _readtags(ui, repo, fctx.data().splitlines(), fctx)
+ _updatetags(filetags, 'global', alltags, tagtypes)
+
+ # and update the cache (if necessary)
+ if shouldwrite:
+ _writetagcache(ui, repo, heads, tagfnode, alltags)
+
+# Set this to findglobaltags1 to disable tag caching.
+findglobaltags = findglobaltags2
+
+def readlocaltags(ui, repo, alltags, tagtypes):
+ '''Read local tags in repo. Update alltags and tagtypes.'''
+ try:
+ # localtags is in the local encoding; re-encode to UTF-8 on
+ # input for consistency with the rest of this module.
+ data = repo.opener("localtags").read()
+ filetags = _readtags(
+ ui, repo, data.splitlines(), "localtags",
+ recode=encoding.fromlocal)
+ _updatetags(filetags, "local", alltags, tagtypes)
+ except IOError:
+ pass
+
+def _readtags(ui, repo, lines, fn, recode=None):
+ '''Read tag definitions from a file (or any source of lines).
+ Return a mapping from tag name to (node, hist): node is the node id
+ from the last line read for that name, and hist is the list of node
+ ids previously associated with it (in file order). All node ids are
+ binary, not hex.'''
+
+ filetags = {} # map tag name to (node, hist)
+ count = 0
+
+ def warn(msg):
+ ui.warn(_("%s, line %s: %s\n") % (fn, count, msg))
+
+ for line in lines:
+ count += 1
+ if not line:
+ continue
+ try:
+ (nodehex, name) = line.split(" ", 1)
+ except ValueError:
+ warn(_("cannot parse entry"))
+ continue
+ name = name.strip()
+ if recode:
+ name = recode(name)
+ try:
+ nodebin = bin(nodehex)
+ except TypeError:
+ warn(_("node '%s' is not well formed") % nodehex)
+ continue
+ if nodebin not in repo.changelog.nodemap:
+ # silently ignore as pull -r might cause this
+ continue
+
+ # update filetags
+ hist = []
+ if name in filetags:
+ n, hist = filetags[name]
+ hist.append(n)
+ filetags[name] = (nodebin, hist)
+ return filetags
+
+def _updatetags(filetags, tagtype, alltags, tagtypes):
+ '''Incorporate the tag info read from one file into the two
+ dictionaries, alltags and tagtypes, that contain all tag
+ info (global across all heads plus local).'''
+
+ for name, nodehist in filetags.iteritems():
+ if name not in alltags:
+ alltags[name] = nodehist
+ tagtypes[name] = tagtype
+ continue
+
+ # we prefer alltags[name] if:
+ # it supercedes us OR
+ # mutual supercedes and it has a higher rank
+ # otherwise we win because we're tip-most
+ anode, ahist = nodehist
+ bnode, bhist = alltags[name]
+ if (bnode != anode and anode in bhist and
+ (bnode not in ahist or len(bhist) > len(ahist))):
+ anode = bnode
+ ahist.extend([n for n in bhist if n not in ahist])
+ alltags[name] = anode, ahist
+ tagtypes[name] = tagtype
+
+
+# The tag cache only stores info about heads, not the tag contents
+# from each head. I.e. it doesn't try to squeeze out the maximum
+# performance, but is simpler has a better chance of actually
+# working correctly. And this gives the biggest performance win: it
+# avoids looking up .hgtags in the manifest for every head, and it
+# can avoid calling heads() at all if there have been no changes to
+# the repo.
+
+def _readtagcache(ui, repo):
+ '''Read the tag cache and return a tuple (heads, fnodes, cachetags,
+ shouldwrite). If the cache is completely up-to-date, cachetags is a
+ dict of the form returned by _readtags(); otherwise, it is None and
+ heads and fnodes are set. In that case, heads is the list of all
+ heads currently in the repository (ordered from tip to oldest) and
+ fnodes is a mapping from head to .hgtags filenode. If those two are
+ set, caller is responsible for reading tag info from each head.'''
+
+ try:
+ cachefile = repo.opener('tags.cache', 'r')
+ _debug(ui, 'reading tag cache from %s\n' % cachefile.name)
+ except IOError:
+ cachefile = None
+
+ # The cache file consists of lines like
+ # <headrev> <headnode> [<tagnode>]
+ # where <headrev> and <headnode> redundantly identify a repository
+ # head from the time the cache was written, and <tagnode> is the
+ # filenode of .hgtags on that head. Heads with no .hgtags file will
+ # have no <tagnode>. The cache is ordered from tip to oldest (which
+ # is part of why <headrev> is there: a quick visual check is all
+ # that's required to ensure correct order).
+ #
+ # This information is enough to let us avoid the most expensive part
+ # of finding global tags, which is looking up <tagnode> in the
+ # manifest for each head.
+ cacherevs = [] # list of headrev
+ cacheheads = [] # list of headnode
+ cachefnode = {} # map headnode to filenode
+ if cachefile:
+ for line in cachefile:
+ if line == "\n":
+ break
+ line = line.rstrip().split()
+ cacherevs.append(int(line[0]))
+ headnode = bin(line[1])
+ cacheheads.append(headnode)
+ if len(line) == 3:
+ fnode = bin(line[2])
+ cachefnode[headnode] = fnode
+
+ tipnode = repo.changelog.tip()
+ tiprev = len(repo.changelog) - 1
+
+ # Case 1 (common): tip is the same, so nothing has changed.
+ # (Unchanged tip trivially means no changesets have been added.
+ # But, thanks to localrepository.destroyed(), it also means none
+ # have been destroyed by strip or rollback.)
+ if cacheheads and cacheheads[0] == tipnode and cacherevs[0] == tiprev:
+ _debug(ui, "tag cache: tip unchanged\n")
+ tags = _readtags(ui, repo, cachefile, cachefile.name)
+ cachefile.close()
+ return (None, None, tags, False)
+ if cachefile:
+ cachefile.close() # ignore rest of file
+
+ repoheads = repo.heads()
+ # Case 2 (uncommon): empty repo; get out quickly and don't bother
+ # writing an empty cache.
+ if repoheads == [nullid]:
+ return ([], {}, {}, False)
+
+ # Case 3 (uncommon): cache file missing or empty.
+ if not cacheheads:
+ _debug(ui, 'tag cache: cache file missing or empty\n')
+
+ # Case 4 (uncommon): tip rev decreased. This should only happen
+ # when we're called from localrepository.destroyed(). Refresh the
+ # cache so future invocations will not see disappeared heads in the
+ # cache.
+ elif cacheheads and tiprev < cacherevs[0]:
+ _debug(ui,
+ 'tag cache: tip rev decremented (from %d to %d), '
+ 'so we must be destroying nodes\n'
+ % (cacherevs[0], tiprev))
+
+ # Case 5 (common): tip has changed, so we've added/replaced heads.
+ else:
+ _debug(ui,
+ 'tag cache: tip has changed (%d:%s); must find new heads\n'
+ % (tiprev, short(tipnode)))
+
+ # Luckily, the code to handle cases 3, 4, 5 is the same. So the
+ # above if/elif/else can disappear once we're confident this thing
+ # actually works and we don't need the debug output.
+
+ # N.B. in case 4 (nodes destroyed), "new head" really means "newly
+ # exposed".
+ newheads = [head
+ for head in repoheads
+ if head not in set(cacheheads)]
+ _debug(ui, 'tag cache: found %d head(s) not in cache: %s\n'
+ % (len(newheads), map(short, newheads)))
+
+ # Now we have to lookup the .hgtags filenode for every new head.
+ # This is the most expensive part of finding tags, so performance
+ # depends primarily on the size of newheads. Worst case: no cache
+ # file, so newheads == repoheads.
+ for head in newheads:
+ cctx = repo[head]
+ try:
+ fnode = cctx.filenode('.hgtags')
+ cachefnode[head] = fnode
+ except error.LookupError:
+ # no .hgtags file on this head
+ pass
+
+ # Caller has to iterate over all heads, but can use the filenodes in
+ # cachefnode to get to each .hgtags revision quickly.
+ return (repoheads, cachefnode, None, True)
+
+def _writetagcache(ui, repo, heads, tagfnode, cachetags):
+
+ try:
+ cachefile = repo.opener('tags.cache', 'w', atomictemp=True)
+ except (OSError, IOError):
+ return
+ _debug(ui, 'writing cache file %s\n' % cachefile.name)
+
+ realheads = repo.heads() # for sanity checks below
+ for head in heads:
+ # temporary sanity checks; these can probably be removed
+ # once this code has been in crew for a few weeks
+ assert head in repo.changelog.nodemap, \
+ 'trying to write non-existent node %s to tag cache' % short(head)
+ assert head in realheads, \
+ 'trying to write non-head %s to tag cache' % short(head)
+ assert head != nullid, \
+ 'trying to write nullid to tag cache'
+
+ # This can't fail because of the first assert above. When/if we
+ # remove that assert, we might want to catch LookupError here
+ # and downgrade it to a warning.
+ rev = repo.changelog.rev(head)
+
+ fnode = tagfnode.get(head)
+ if fnode:
+ cachefile.write('%d %s %s\n' % (rev, hex(head), hex(fnode)))
+ else:
+ cachefile.write('%d %s\n' % (rev, hex(head)))
+
+ # Tag names in the cache are in UTF-8 -- which is the whole reason
+ # we keep them in UTF-8 throughout this module. If we converted
+ # them local encoding on input, we would lose info writing them to
+ # the cache.
+ cachefile.write('\n')
+ for (name, (node, hist)) in cachetags.iteritems():
+ cachefile.write("%s %s\n" % (hex(node), name))
+
+ cachefile.rename()
+ cachefile.close()
--- a/mercurial/templatefilters.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/templatefilters.py Mon Oct 05 22:17:39 2009 +0200
@@ -41,7 +41,7 @@
delta = max(1, int(now - then))
for t, s in agescales:
- n = delta / s
+ n = delta // s
if n >= 2 or s == 1:
return fmt(t, n)
@@ -73,7 +73,7 @@
def firstline(text):
'''return the first line of text'''
try:
- return text.splitlines(1)[0].rstrip('\r\n')
+ return text.splitlines(True)[0].rstrip('\r\n')
except IndexError:
return ''
@@ -105,13 +105,14 @@
'''indent each non-empty line of text after first with prefix.'''
lines = text.splitlines()
num_lines = len(lines)
+ endswithnewline = text[-1:] == '\n'
def indenter():
for i in xrange(num_lines):
l = lines[i]
if i and l.strip():
yield prefix
yield l
- if i < num_lines - 1 or text.endswith('\n'):
+ if i < num_lines - 1 or endswithnewline:
yield '\n'
return "".join(indenter())
--- a/mercurial/templater.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/templater.py Mon Oct 05 22:17:39 2009 +0200
@@ -42,7 +42,7 @@
filter uses function to transform value. syntax is
{key|filter1|filter2|...}.'''
- template_re = re.compile(r'{([\w\|%]+)}|#([\w\|%]+)#')
+ template_re = re.compile(r'{([\w\|%]+)}')
def __init__(self, loader, filters={}, defaults={}):
self.loader = loader
--- a/mercurial/transaction.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/transaction.py Mon Oct 05 22:17:39 2009 +0200
@@ -118,6 +118,7 @@
@active
def close(self):
+ '''commit the transaction'''
self.count -= 1
if self.count != 0:
return
@@ -131,6 +132,9 @@
@active
def abort(self):
+ '''abort the transaction (generally called on error, or when the
+ transaction is not explicitly committed before going out of
+ scope)'''
self._abort()
def _abort(self):
--- a/mercurial/ui.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/ui.py Mon Oct 05 22:17:39 2009 +0200
@@ -199,7 +199,7 @@
def _path(self, loc):
p = self.config('paths', loc)
if p and '%%' in p:
- self.warn('(deprecated \'%%\' in path %s=%s from %s)\n' %
+ self.warn("(deprecated '%%' in path %s=%s from %s)\n" %
(loc, p, self.configsource('paths', loc)))
p = p.replace('%%', '%')
return p
@@ -269,30 +269,35 @@
line = line[:-1]
return line
- def prompt(self, msg, choices=None, default="y"):
- """Prompt user with msg, read response, and ensure it matches
- one of the provided choices. choices is a sequence of acceptable
- responses with the format: ('&None', 'E&xec', 'Sym&link')
- No sequence implies no response checking. Responses are case
- insensitive. If ui is not interactive, the default is returned.
+ def prompt(self, msg, default="y"):
+ """Prompt user with msg, read response.
+ If ui is not interactive, the default is returned.
"""
if not self.interactive():
self.write(msg, ' ', default, "\n")
return default
+ try:
+ r = self._readline(msg + ' ')
+ if not r:
+ return default
+ return r
+ except EOFError:
+ raise util.Abort(_('response expected'))
+
+ def promptchoice(self, msg, choices, default=0):
+ """Prompt user with msg, read response, and ensure it matches
+ one of the provided choices. The index of the choice is returned.
+ choices is a sequence of acceptable responses with the format:
+ ('&None', 'E&xec', 'Sym&link') Responses are case insensitive.
+ If ui is not interactive, the default is returned.
+ """
+ resps = [s[s.index('&')+1].lower() for s in choices]
while True:
- try:
- r = self._readline(msg + ' ')
- if not r:
- return default
- if not choices:
- return r
- resps = [s[s.index('&')+1].lower() for s in choices]
- if r.lower() in resps:
- return r.lower()
- else:
- self.write(_("unrecognized response\n"))
- except EOFError:
- raise util.Abort(_('response expected'))
+ r = self.prompt(msg, resps[default])
+ if r.lower() in resps:
+ return resps.index(r.lower())
+ self.write(_("unrecognized response\n"))
+
def getpass(self, prompt=None, default=None):
if not self.interactive(): return default
@@ -344,3 +349,33 @@
self.config("ui", "editor") or
os.environ.get("VISUAL") or
os.environ.get("EDITOR", "vi"))
+
+ def progress(self, topic, pos, item="", unit="", total=None):
+ '''show a progress message
+
+ With stock hg, this is simply a debug message that is hidden
+ by default, but with extensions or GUI tools it may be
+ visible. 'topic' is the current operation, 'item' is a
+ non-numeric marker of the current position (ie the currently
+ in-process file), 'pos' is the current numeric position (ie
+ revision, bytes, etc.), unit is a corresponding unit label,
+ and total is the highest expected pos.
+
+ Multiple nested topics may be active at a time. All topics
+ should be marked closed by setting pos to None at termination.
+ '''
+
+ if pos == None or not self.debugflag:
+ return
+
+ if unit:
+ unit = ' ' + unit
+ if item:
+ item = ' ' + item
+
+ if total:
+ pct = 100.0 * pos / total
+ ui.debug('%s:%s %s/%s%s (%4.2g%%)\n'
+ % (topic, item, pos, total, unit, pct))
+ else:
+ ui.debug('%s:%s %s%s\n' % (topic, item, pos, unit))
--- a/mercurial/url.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/url.py Mon Oct 05 22:17:39 2009 +0200
@@ -197,7 +197,7 @@
proxyuser, proxypasswd or ''),
proxypath, proxyquery, proxyfrag))
proxies = {'http': proxyurl, 'https': proxyurl}
- ui.debug(_('proxying through http://%s:%s\n') %
+ ui.debug('proxying through http://%s:%s\n' %
(proxyhost, proxyport))
else:
proxies = {}
@@ -487,6 +487,8 @@
authinfo = None
return url, authinfo
+handlerfuncs = []
+
def opener(ui, authinfo=None):
'''
construct an opener suitable for urllib2
@@ -502,11 +504,12 @@
if authinfo is not None:
passmgr.add_password(*authinfo)
user, passwd = authinfo[2:4]
- ui.debug(_('http auth: user %s, password %s\n') %
+ ui.debug('http auth: user %s, password %s\n' %
(user, passwd and '*' * len(passwd) or 'not set'))
handlers.extend((urllib2.HTTPBasicAuthHandler(passmgr),
httpdigestauthhandler(passmgr)))
+ handlers.extend([h(ui, passmgr) for h in handlerfuncs])
opener = urllib2.build_opener(*handlers)
# 1.0 here is the _protocol_ version
--- a/mercurial/util.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/util.py Mon Oct 05 22:17:39 2009 +0200
@@ -266,9 +266,7 @@
def canonpath(root, cwd, myname):
"""return the canonical path of myname, given cwd and root"""
- if root == os.sep:
- rootsep = os.sep
- elif endswithsep(root):
+ if endswithsep(root):
rootsep = root
else:
rootsep = root + os.sep
@@ -359,41 +357,26 @@
if val is True:
return '1'
return str(val)
- oldenv = {}
- for k in environ:
- oldenv[k] = os.environ.get(k)
- if cwd is not None:
- oldcwd = os.getcwd()
origcmd = cmd
if os.name == 'nt':
cmd = '"%s"' % cmd
- try:
- for k, v in environ.iteritems():
- os.environ[k] = py2shell(v)
- os.environ['HG'] = hgexecutable()
- if cwd is not None and oldcwd != cwd:
- os.chdir(cwd)
- rc = os.system(cmd)
- if sys.platform == 'OpenVMS' and rc & 1:
- rc = 0
- if rc and onerr:
- errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
- explain_exit(rc)[0])
- if errprefix:
- errmsg = '%s: %s' % (errprefix, errmsg)
- try:
- onerr.warn(errmsg + '\n')
- except AttributeError:
- raise onerr(errmsg)
- return rc
- finally:
- for k, v in oldenv.iteritems():
- if v is None:
- del os.environ[k]
- else:
- os.environ[k] = v
- if cwd is not None and oldcwd != cwd:
- os.chdir(oldcwd)
+ env = dict(os.environ)
+ env.update((k, py2shell(v)) for k, v in environ.iteritems())
+ env['HG'] = hgexecutable()
+ rc = subprocess.call(cmd, shell=True, close_fds=closefds,
+ env=env, cwd=cwd)
+ if sys.platform == 'OpenVMS' and rc & 1:
+ rc = 0
+ if rc and onerr:
+ errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
+ explain_exit(rc)[0])
+ if errprefix:
+ errmsg = '%s: %s' % (errprefix, errmsg)
+ try:
+ onerr.warn(errmsg + '\n')
+ except AttributeError:
+ raise onerr(errmsg)
+ return rc
def checksignature(func):
'''wrap a function with code to check for calling errors'''
@@ -663,8 +646,9 @@
contents = _fspathcache[dir]
lpart = part.lower()
+ lenp = len(part)
for n in contents:
- if n.lower() == lpart:
+ if lenp == len(n) and n.lower() == lpart:
result.append(n)
break
else:
@@ -842,11 +826,9 @@
self.audit_path = always
self.createmode = None
- def __getattr__(self, name):
- if name == '_can_symlink':
- self._can_symlink = checklink(self.base)
- return self._can_symlink
- raise AttributeError(name)
+ @propertycache
+ def _can_symlink(self):
+ return checklink(self.base)
def _fixfilemode(self, name):
if self.createmode is None:
@@ -969,8 +951,8 @@
t, tz = date or makedate()
if "%1" in format or "%2" in format:
sign = (tz > 0) and "-" or "+"
- minutes = abs(tz) / 60
- format = format.replace("%1", "%c%02d" % (sign, minutes / 60))
+ minutes = abs(tz) // 60
+ format = format.replace("%1", "%c%02d" % (sign, minutes // 60))
format = format.replace("%2", "%02d" % (minutes % 60))
s = time.strftime(format, time.gmtime(float(t) - tz))
return s
@@ -1274,7 +1256,12 @@
pass
return 80
-def wrap(line, hangindent, width=78):
+def wrap(line, hangindent, width=None):
+ if width is None:
+ width = termwidth() - 2
+ if width <= hangindent:
+ # adjust for weird terminal size
+ width = max(78, hangindent + 1)
padding = '\n' + ' ' * hangindent
# To avoid corrupting multi-byte characters in line, we must wrap
# a Unicode string instead of a bytestring.
--- a/mercurial/verify.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/verify.py Mon Oct 05 22:17:39 2009 +0200
@@ -78,7 +78,7 @@
msg = _("rev %d points to unexpected changeset %d")
err(None, msg % (i, lr), f)
if linkrevs:
- warn(_(" (expected %s)") % " ".join(map(str,linkrevs)))
+ warn(_(" (expected %s)") % " ".join(map(str, linkrevs)))
lr = None # can't be trusted
try:
@@ -147,7 +147,7 @@
if havemf:
for c,m in sorted([(c, m) for m in mflinkrevs for c in mflinkrevs[m]]):
err(c, _("changeset refers to unknown manifest %s") % short(m))
- del mflinkrevs
+ mflinkrevs = None # del is bad here due to scope issues
for f in sorted(filelinkrevs):
if f not in filenodes:
--- a/mercurial/win32.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/win32.py Mon Oct 05 22:17:39 2009 +0200
@@ -18,7 +18,7 @@
import errno, os, sys, pywintypes, win32con, win32file, win32process
import winerror
import osutil, encoding
-from win32com.shell import shell,shellcon
+from win32com.shell import shell, shellcon
def os_link(src, dst):
try:
--- a/mercurial/windows.py Mon Oct 05 22:01:08 2009 +0200
+++ b/mercurial/windows.py Mon Oct 05 22:17:39 2009 +0200
@@ -126,6 +126,15 @@
def normpath(path):
return pconvert(os.path.normpath(path))
+def realpath(path):
+ '''
+ Returns the true, canonical file system path equivalent to the given
+ path.
+ '''
+ # TODO: There may be a more clever way to do this that also handles other,
+ # less common file systems.
+ return os.path.normpath(os.path.normcase(os.path.realpath(path)))
+
def samestat(s1, s2):
return False
--- a/setup.py Mon Oct 05 22:01:08 2009 +0200
+++ b/setup.py Mon Oct 05 22:17:39 2009 +0200
@@ -143,7 +143,7 @@
break
if version:
- f = file("mercurial/__version__.py", "w")
+ f = open("mercurial/__version__.py", "w")
f.write('# this file is autogenerated by setup.py\n')
f.write('version = "%s"\n' % version)
f.close()
@@ -246,7 +246,7 @@
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
datafiles = []
-for root in ('templates', 'i18n'):
+for root in ('templates', 'i18n', 'help'):
for dir, dirs, files in os.walk(root):
dirs[:] = [x for x in dirs if not x.startswith('.')]
files = [x for x in files if not x.startswith('.')]
--- a/templates/paper/notfound.tmpl Mon Oct 05 22:01:08 2009 +0200
+++ b/templates/paper/notfound.tmpl Mon Oct 05 22:17:39 2009 +0200
@@ -7,6 +7,6 @@
The specified repository "{repo|escape}" is unknown, sorry.
-Please go back to the main repository list page.
+Please go back to the <a href="{url}">main repository list page</a>.
{footer}
--- a/templates/spartan/notfound.tmpl Mon Oct 05 22:01:08 2009 +0200
+++ b/templates/spartan/notfound.tmpl Mon Oct 05 22:17:39 2009 +0200
@@ -7,6 +7,6 @@
The specified repository "{repo|escape}" is unknown, sorry.
-Please go back to the main repository list page.
+Please go back to the <a href="{url}">main repository list page</a>.
{footer}
--- a/tests/hghave Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/hghave Mon Oct 05 22:17:39 2009 +0200
@@ -78,7 +78,7 @@
def has_icasefs():
# Stolen from mercurial.util
- fd, path = tempfile.mkstemp(prefix=tempprefix)
+ fd, path = tempfile.mkstemp(prefix=tempprefix, dir='.')
os.close(fd)
try:
s1 = os.stat(path)
@@ -123,9 +123,15 @@
def has_git():
return matchoutput('git --version 2>&1', r'^git version')
+def has_rst2html():
+ return matchoutput('rst2html --version', r'^rst2html \(Docutils') or \
+ matchoutput('rst2html.py --version', r'^rst2html.py \(Docutils')
+
def has_svn():
- return matchoutput('svn --version 2>&1', r'^svn, version') and \
- matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
+ #return matchoutput('svn --version 2>&1', r'^svn, version') and \
+ #matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
+ # disabled until licensing issue is resolved
+ return False
def has_svn_bindings():
try:
@@ -195,6 +201,7 @@
"outer-repo": (has_outer_repo, "outer repo"),
"p4": (has_p4, "Perforce server and client"),
"pygments": (has_pygments, "Pygments source highlighting library"),
+ "rst2html": (has_rst2html, "Docutils rst2html tool"),
"svn": (has_svn, "subversion client and admin tools"),
"svn-bindings": (has_svn_bindings, "subversion python bindings"),
"symlink": (has_symlink, "symbolic links"),
--- a/tests/killdaemons.py Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/killdaemons.py Mon Oct 05 22:17:39 2009 +0200
@@ -4,7 +4,7 @@
# Kill off any leftover daemon processes
try:
- fp = file(os.environ['DAEMON_PIDS'])
+ fp = open(os.environ['DAEMON_PIDS'])
for line in fp:
try:
pid = int(line)
--- a/tests/printenv.py Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/printenv.py Mon Oct 05 22:17:39 2009 +0200
@@ -46,12 +46,9 @@
elif url.startswith("remote:http"):
os.environ["HG_URL"] = "remote:http"
-if "HG_PENDING" in os.environ:
- os.environ["HG_PENDING"] = os.environ["HG_PENDING"] and "true"
-
out.write("%s hook: " % name)
for v in env:
- out.write("%s=%s " % (v, os.environ[v]))
+ out.write("%s=%s " % (v, os.environ[v].replace(os.environ["HGTMP"], '$HGTMP')))
out.write("\n")
out.close()
--- a/tests/run-tests.py Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/run-tests.py Mon Oct 05 22:17:39 2009 +0200
@@ -119,6 +119,8 @@
help="shortcut for --with-hg=<testdir>/../hg")
parser.add_option("--pure", action="store_true",
help="use pure Python code instead of C extensions")
+ parser.add_option("-3", "--py3k-warnings", action="store_true",
+ help="enable Py3k warnings on Python 2.6+")
for option, default in defaults.items():
defaults[option] = int(os.environ.get(*default))
@@ -165,12 +167,22 @@
else:
vlog = lambda *msg: None
+ if options.tmpdir:
+ options.tmpdir = os.path.expanduser(options.tmpdir)
+ try:
+ os.makedirs(options.tmpdir)
+ except OSError, err:
+ if err.errno != errno.EEXIST:
+ raise
+
if options.jobs < 1:
- print >> sys.stderr, 'ERROR: -j/--jobs must be positive'
- sys.exit(1)
+ parser.error('--jobs must be positive')
if options.interactive and options.jobs > 1:
print '(--interactive overrides --jobs)'
options.jobs = 1
+ if options.py3k_warnings:
+ if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
+ parser.error('--py3k-warnings can only be used on Python 2.6+')
return (options, args)
@@ -299,6 +311,17 @@
f.close()
os.chmod(os.path.join(BINDIR, 'diffstat'), 0700)
+ if options.py3k_warnings and not options.anycoverage:
+ vlog("# Updating hg command to enable Py3k Warnings switch")
+ f = open(os.path.join(BINDIR, 'hg'), 'r')
+ lines = [line.rstrip() for line in f]
+ lines[0] += ' -3'
+ f.close()
+ f = open(os.path.join(BINDIR, 'hg'), 'w')
+ for line in lines:
+ f.write(line + '\n')
+ f.close()
+
if options.anycoverage:
vlog("# Installing coverage wrapper")
os.environ['COVERAGE_FILE'] = COVERAGE_FILE
@@ -402,7 +425,7 @@
vlog("# Test", test)
# create a fresh hgrc
- hgrc = file(HGRCPATH, 'w+')
+ hgrc = open(HGRCPATH, 'w+')
hgrc.write('[ui]\n')
hgrc.write('slash = True\n')
hgrc.write('[defaults]\n')
@@ -432,7 +455,8 @@
lctest = test.lower()
if lctest.endswith('.py') or firstline == '#!/usr/bin/env python':
- cmd = '%s "%s"' % (PYTHON, testpath)
+ py3kswitch = options.py3k_warnings and ' -3' or ''
+ cmd = '%s%s "%s"' % (PYTHON, py3kswitch, testpath)
elif lctest.endswith('.bat'):
# do not run batch scripts on non-windows
if os.name != 'nt':
@@ -507,7 +531,7 @@
# Kill off any leftover daemon processes
try:
- fp = file(DAEMON_PIDS)
+ fp = open(DAEMON_PIDS)
for line in fp:
try:
pid = int(line)
--- a/tests/test-add Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-add Mon Oct 05 22:17:39 2009 +0200
@@ -20,7 +20,7 @@
hg add b
hg st
-hg ci -m 0
+hg ci -m 0 --traceback
echo % should fail
hg add a
--- a/tests/test-add.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-add.out Mon Oct 05 22:17:39 2009 +0200
@@ -20,7 +20,7 @@
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
M a
? a.orig
% should fail
--- a/tests/test-casefolding Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-casefolding Mon Oct 05 22:17:39 2009 +0200
@@ -31,6 +31,9 @@
hg rm a
hg ci -Am removea
echo A > A
+# on linux hfs keeps the old case stored, force it
+mv a aa
+mv aa A
hg ci -Am addA
# Used to fail under case insensitive fs
hg up -C 0
--- a/tests/test-churn Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-churn Mon Oct 05 22:17:39 2009 +0200
@@ -28,11 +28,13 @@
hg ci -Am "add d/g/f2.txt" -u user1 -d 13:00 d/g/f2.txt
echo % churn separate directories
-hg churn d/e
+cd d
+hg churn e
echo % churn all
hg churn
echo % churn up to rev 2
hg churn -r :2
+cd ..
echo % churn with aliases
cat > ../aliases <<EOF
user1 alias1
--- a/tests/test-clone-failure Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-clone-failure Mon Oct 05 22:17:39 2009 +0200
@@ -62,4 +62,7 @@
test -d d && echo "dir is still here" || echo "dir is gone"
test -d d/.hg && echo "repo is still here" || echo "repo is gone"
+# reenable perm to allow deletion
+chmod +rx c/.hg/store/data
+
true
--- a/tests/test-command-template Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-command-template Mon Oct 05 22:17:39 2009 +0200
@@ -127,4 +127,49 @@
echo 'x = "f' >> t
hg log
+cd ..
+
+echo '# latesttag'
+hg init latesttag
+cd latesttag
+
+echo a > file
+hg ci -Am a -d '0 0'
+
+echo b >> file
+hg ci -m b -d '1 0'
+
+echo c >> head1
+hg ci -Am h1c -d '2 0'
+
+hg update -q 1
+echo d >> head2
+hg ci -Am h2d -d '3 0'
+
+echo e >> head2
+hg ci -m h2e -d '4 0'
+
+hg merge -q
+hg ci -m merge -d '5 0'
+
+echo '# No tag set'
+hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
+
+echo '# one common tag: longuest path wins'
+hg tag -r 1 -m t1 -d '6 0' t1
+hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
+
+echo '# one ancestor tag: more recent wins'
+hg tag -r 2 -m t2 -d '7 0' t2
+hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
+
+echo '# two branch tags: more recent wins'
+hg tag -r 3 -m t3 -d '8 0' t3
+hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
+
+echo '# merged tag overrides'
+hg tag -r 5 -m t5 -d '9 0' t5
+hg tag -r 3 -m at3 -d '10 0' at3
+hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
+
echo '# done'
--- a/tests/test-command-template.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-command-template.out Mon Oct 05 22:17:39 2009 +0200
@@ -672,4 +672,55 @@
1e4e1b8f71e05681d422154f5421e385fec3454f
# error on syntax
abort: t:3: unmatched quotes
+# latesttag
+adding file
+adding head1
+adding head2
+created new head
+# No tag set
+5: null+5
+4: null+4
+3: null+3
+2: null+3
+1: null+2
+0: null+1
+# one common tag: longuest path wins
+6: t1+4
+5: t1+3
+4: t1+2
+3: t1+1
+2: t1+1
+1: t1+0
+0: null+1
+# one ancestor tag: more recent wins
+7: t2+3
+6: t2+2
+5: t2+1
+4: t1+2
+3: t1+1
+2: t2+0
+1: t1+0
+0: null+1
+# two branch tags: more recent wins
+8: t3+5
+7: t3+4
+6: t3+3
+5: t3+2
+4: t3+1
+3: t3+0
+2: t2+0
+1: t1+0
+0: null+1
+# merged tag overrides
+10: t5+5
+9: t5+4
+8: t5+3
+7: t5+2
+6: t5+1
+5: t5+0
+4: at3:t3+1
+3: at3:t3+0
+2: t2+0
+1: t1+0
+0: null+1
# done
--- a/tests/test-commit-unresolved.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-commit-unresolved.out Mon Oct 05 22:17:39 2009 +0200
@@ -6,7 +6,7 @@
warning: conflicts during merge.
merging A failed!
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)
--- a/tests/test-conflict.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-conflict.out Mon Oct 05 22:17:39 2009 +0200
@@ -4,7 +4,7 @@
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
--- a/tests/test-context.py Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-context.py Mon Oct 05 22:17:39 2009 +0200
@@ -7,7 +7,7 @@
os.chdir('test1')
# create 'foo' with fixed time stamp
-f = file('foo', 'w')
+f = open('foo', 'w')
f.write('foo\n')
f.close()
os.utime('foo', (1000, 1000))
--- a/tests/test-convert-cvs-branch Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-convert-cvs-branch Mon Oct 05 22:17:39 2009 +0200
@@ -83,7 +83,8 @@
cvscall -Q -d `pwd`/cvsmaster2 init >/dev/null 2>&1
cd cvsmaster2
-export CVSROOT=`pwd`
+CVSROOT=`pwd`
+export CVSROOT
mkdir foo
cd ..
cvscall -Q co -d cvswork2 foo
--- a/tests/test-convert-svn-sink.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-convert-svn-sink.out Mon Oct 05 22:17:39 2009 +0200
@@ -265,7 +265,7 @@
warning: conflicts during merge.
merging b failed!
2 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
assuming destination b-hg
initializing svn repo 'b-hg'
initializing svn wc 'b-hg-wc'
--- a/tests/test-convert.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-convert.out Mon Oct 05 22:17:39 2009 +0200
@@ -3,6 +3,7 @@
convert a foreign SCM repository to a Mercurial one.
Accepted source formats [identifiers]:
+
- Mercurial [hg]
- CVS [cvs]
- Darcs [darcs]
@@ -14,48 +15,50 @@
- Perforce [p4]
Accepted destination formats [identifiers]:
+
- Mercurial [hg]
- Subversion [svn] (history on branches is not preserved)
- If no revision is given, all revisions will be converted.
- Otherwise, convert will only import up to the named revision
- (given in a format understood by the source).
+ If no revision is given, all revisions will be converted. Otherwise,
+ convert will only import up to the named revision (given in a format
+ understood by the source).
- If no destination directory name is specified, it defaults to the
- basename of the source with '-hg' appended. If the destination
- repository doesn't exist, it will be created.
+ If no destination directory name is specified, it defaults to the basename
+ of the source with '-hg' appended. If the destination repository doesn't
+ exist, it will be created.
- By default, all sources except Mercurial will use
- --branchsort. Mercurial uses --sourcesort to preserve original
- revision numbers order. Sort modes have the following effects:
- --branchsort: convert from parent to child revision when
- possible, which means branches are usually converted one after
- the other. It generates more compact repositories.
- --datesort: sort revisions by date. Converted repositories have
- good-looking changelogs but are often an order of magnitude
- larger than the same ones generated by --branchsort.
- --sourcesort: try to preserve source revisions order, only
- supported by Mercurial sources.
+ By default, all sources except Mercurial will use --branchsort. Mercurial
+ uses --sourcesort to preserve original revision numbers order. Sort modes
+ have the following effects:
+
+ --branchsort convert from parent to child revision when possible, which
+ means branches are usually converted one after the other. It
+ generates more compact repositories.
+ --datesort sort revisions by date. Converted repositories have good-
+ looking changelogs but are often an order of magnitude
+ larger than the same ones generated by --branchsort.
+ --sourcesort try to preserve source revisions order, only supported by
+ Mercurial sources.
If <REVMAP> isn't given, it will be put in a default location
- (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file
- that maps each source commit ID to the destination ID for that
- revision, like so:
- <source ID> <destination ID>
+ (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file that
+ maps each source commit ID to the destination ID for that revision, like
+ so:
- If the file doesn't exist, it's automatically created. It's
- updated on each commit copied, so convert-repo can be interrupted
- and can be run repeatedly to copy new commits.
+ <source ID> <destination ID>
- The [username mapping] file is a simple text file that maps each
- source commit author to a destination commit author. It is handy
- for source SCMs that use unix logins to identify authors (eg:
- CVS). One line per author mapping and the line format is:
- srcauthor=whatever string you want
+ If the file doesn't exist, it's automatically created. It's updated on
+ each commit copied, so convert-repo can be interrupted and can be run
+ repeatedly to copy new commits.
- The filemap is a file that allows filtering and remapping of files
- and directories. Comment lines start with '#'. Each line can
- contain one of the following directives:
+ The [username mapping] file is a simple text file that maps each source
+ commit author to a destination commit author. It is handy for source SCMs
+ that use unix logins to identify authors (eg: CVS). One line per author
+ mapping and the line format is: srcauthor=whatever string you want
+
+ The filemap is a file that allows filtering and remapping of files and
+ directories. Comment lines start with '#'. Each line can contain one of
+ the following directives:
include path/to/file
@@ -63,113 +66,110 @@
rename from/file to/file
- The 'include' directive causes a file, or all files under a
- directory, to be included in the destination repository, and the
- exclusion of all other files and directories not explicitly included.
- The 'exclude' directive causes files or directories to be omitted.
- The 'rename' directive renames a file or directory. To rename from
- a subdirectory into the root of the repository, use '.' as the
- path to rename to.
+ The 'include' directive causes a file, or all files under a directory, to
+ be included in the destination repository, and the exclusion of all other
+ files and directories not explicitly included. The 'exclude' directive
+ causes files or directories to be omitted. The 'rename' directive renames
+ a file or directory. To rename from a subdirectory into the root of the
+ repository, use '.' as the path to rename to.
- The splicemap is a file that allows insertion of synthetic
- history, letting you specify the parents of a revision. This is
- useful if you want to e.g. give a Subversion merge two parents, or
- graft two disconnected series of history together. Each entry
- contains a key, followed by a space, followed by one or two
- comma-separated values. The key is the revision ID in the source
- revision control system whose parents should be modified (same
- format as a key in .hg/shamap). The values are the revision IDs
- (in either the source or destination revision control system) that
+ The splicemap is a file that allows insertion of synthetic history,
+ letting you specify the parents of a revision. This is useful if you want
+ to e.g. give a Subversion merge two parents, or graft two disconnected
+ series of history together. Each entry contains a key, followed by a
+ space, followed by one or two comma-separated values. The key is the
+ revision ID in the source revision control system whose parents should be
+ modified (same format as a key in .hg/shamap). The values are the revision
+ IDs (in either the source or destination revision control system) that
should be used as the new parents for that node.
The branchmap is a file that allows you to rename a branch when it is
being brought in from whatever external repository. When used in
- conjunction with a splicemap, it allows for a powerful combination
- to help fix even the most badly mismanaged repositories and turn them
- into nicely structured Mercurial repositories. The branchmap contains
- lines of the form "original_branch_name new_branch_name".
- "original_branch_name" is the name of the branch in the source
- repository, and "new_branch_name" is the name of the branch is the
- destination repository. This can be used to (for instance) move code
- in one repository from "default" to a named branch.
+ conjunction with a splicemap, it allows for a powerful combination to help
+ fix even the most badly mismanaged repositories and turn them into nicely
+ structured Mercurial repositories. The branchmap contains lines of the
+ form "original_branch_name new_branch_name". "original_branch_name" is the
+ name of the branch in the source repository, and "new_branch_name" is the
+ name of the branch is the destination repository. This can be used to (for
+ instance) move code in one repository from "default" to a named branch.
Mercurial Source
- -----------------
+ ----------------
--config convert.hg.ignoreerrors=False (boolean)
ignore integrity errors when reading. Use it to fix Mercurial
repositories with missing revlogs, by converting from and to
Mercurial.
--config convert.hg.saverev=False (boolean)
- store original revision ID in changeset (forces target IDs to
- change)
+ store original revision ID in changeset (forces target IDs to change)
--config convert.hg.startrev=0 (hg revision identifier)
convert start revision and its descendants
CVS Source
----------
- CVS source will use a sandbox (i.e. a checked-out copy) from CVS
- to indicate the starting point of what will be converted. Direct
- access to the repository files is not needed, unless of course the
- repository is :local:. The conversion uses the top level directory
- in the sandbox to find the CVS repository, and then uses CVS rlog
- commands to find files to convert. This means that unless a
- filemap is given, all files under the starting directory will be
- converted, and that any directory reorganization in the CVS
- sandbox is ignored.
+ CVS source will use a sandbox (i.e. a checked-out copy) from CVS to
+ indicate the starting point of what will be converted. Direct access to
+ the repository files is not needed, unless of course the repository is
+ :local:. The conversion uses the top level directory in the sandbox to
+ find the CVS repository, and then uses CVS rlog commands to find files to
+ convert. This means that unless a filemap is given, all files under the
+ starting directory will be converted, and that any directory
+ reorganization in the CVS sandbox is ignored.
Because CVS does not have changesets, it is necessary to collect
- individual commits to CVS and merge them into changesets. CVS
- source uses its internal changeset merging code by default but can
- be configured to call the external 'cvsps' program by setting:
- --config convert.cvsps='cvsps -A -u --cvs-direct -q'
+ individual commits to CVS and merge them into changesets. CVS source uses
+ its internal changeset merging code by default but can be configured to
+ call the external 'cvsps' program by setting:
+
+ --config convert.cvsps='cvsps -A -u --cvs-direct -q'
+
This option is deprecated and will be removed in Mercurial 1.4.
The options shown are the defaults.
Internal cvsps is selected by setting
- --config convert.cvsps=builtin
+
+ --config convert.cvsps=builtin
+
and has a few more configurable options:
- --config convert.cvsps.cache=True (boolean)
- Set to False to disable remote log caching, for testing and
- debugging purposes.
- --config convert.cvsps.fuzz=60 (integer)
- Specify the maximum time (in seconds) that is allowed
- between commits with identical user and log message in a
- single changeset. When very large files were checked in as
- part of a changeset then the default may not be long
- enough.
- --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}'
- Specify a regular expression to which commit log messages
- are matched. If a match occurs, then the conversion
- process will insert a dummy revision merging the branch on
- which this log message occurs to the branch indicated in
- the regex.
- --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}'
- Specify a regular expression to which commit log messages
- are matched. If a match occurs, then the conversion
- process will add the most recent revision on the branch
- indicated in the regex as the second parent of the
- changeset.
- The hgext/convert/cvsps wrapper script allows the builtin
- changeset merging code to be run without doing a conversion. Its
- parameters and output are similar to that of cvsps 2.1.
+ --config convert.cvsps.cache=True (boolean)
+ Set to False to disable remote log caching, for testing and debugging
+ purposes.
+ --config convert.cvsps.fuzz=60 (integer)
+ Specify the maximum time (in seconds) that is allowed between commits
+ with identical user and log message in a single changeset. When very
+ large files were checked in as part of a changeset then the default
+ may not be long enough.
+ --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}'
+ Specify a regular expression to which commit log messages are matched.
+ If a match occurs, then the conversion process will insert a dummy
+ revision merging the branch on which this log message occurs to the
+ branch indicated in the regex.
+ --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}'
+ Specify a regular expression to which commit log messages are matched.
+ If a match occurs, then the conversion process will add the most
+ recent revision on the branch indicated in the regex as the second
+ parent of the changeset.
+
+ An additional "debugcvsps" Mercurial command allows the builtin changeset
+ merging code to be run without doing a conversion. Its parameters and
+ output are similar to that of cvsps 2.1. Please see the command help for
+ more details.
Subversion Source
-----------------
- Subversion source detects classical trunk/branches/tags layouts.
- By default, the supplied "svn://repo/path/" source URL is
- converted as a single branch. If "svn://repo/path/trunk" exists it
- replaces the default branch. If "svn://repo/path/branches" exists,
- its subdirectories are listed as possible branches. If
- "svn://repo/path/tags" exists, it is looked for tags referencing
- converted branches. Default "trunk", "branches" and "tags" values
- can be overridden with following options. Set them to paths
- relative to the source URL, or leave them blank to disable auto
- detection.
+ Subversion source detects classical trunk/branches/tags layouts. By
+ default, the supplied "svn://repo/path/" source URL is converted as a
+ single branch. If "svn://repo/path/trunk" exists it replaces the default
+ branch. If "svn://repo/path/branches" exists, its subdirectories are
+ listed as possible branches. If "svn://repo/path/tags" exists, it is
+ looked for tags referencing converted branches. Default "trunk",
+ "branches" and "tags" values can be overridden with following options. Set
+ them to paths relative to the source URL, or leave them blank to disable
+ auto detection.
--config convert.svn.branches=branches (directory name)
specify the directory containing branches
@@ -178,9 +178,9 @@
--config convert.svn.trunk=trunk (directory name)
specify the name of the trunk branch
- Source history can be retrieved starting at a specific revision,
- instead of being integrally converted. Only single branch
- conversions are supported.
+ Source history can be retrieved starting at a specific revision, instead
+ of being integrally converted. Only single branch conversions are
+ supported.
--config convert.svn.startrev=0 (svn revision number)
specify start Subversion revision.
@@ -188,20 +188,18 @@
Perforce Source
---------------
- The Perforce (P4) importer can be given a p4 depot path or a
- client specification as source. It will convert all files in the
- source to a flat Mercurial repository, ignoring labels, branches
- and integrations. Note that when a depot path is given you then
- usually should specify a target directory, because otherwise the
- target may be named ...-hg.
+ The Perforce (P4) importer can be given a p4 depot path or a client
+ specification as source. It will convert all files in the source to a flat
+ Mercurial repository, ignoring labels, branches and integrations. Note
+ that when a depot path is given you then usually should specify a target
+ directory, because otherwise the target may be named ...-hg.
- It is possible to limit the amount of source history to be
- converted by specifying an initial Perforce revision.
+ It is possible to limit the amount of source history to be converted by
+ specifying an initial Perforce revision.
--config convert.p4.startrev=0 (perforce changelist number)
specify initial Perforce revision.
-
Mercurial Destination
---------------------
--- a/tests/test-dispatch.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-dispatch.out Mon Oct 05 22:17:39 2009 +0200
@@ -5,17 +5,17 @@
output the current or given revision of files
- Print the specified files as they were at the given revision. If
- no revision is given, the parent of the working directory is used,
- or tip if no revision is checked out.
+ Print the specified files as they were at the given revision. If no
+ revision is given, the parent of the working directory is used, or tip if
+ no revision is checked out.
- Output may be to a file, in which case the name of the file is
- given using a format string. The formatting rules are the same as
- for the export command, with the following additions:
+ Output may be to a file, in which case the name of the file is given using
+ a format string. The formatting rules are the same as 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
+ %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
options:
--- a/tests/test-dispatch.py Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-dispatch.py Mon Oct 05 22:17:39 2009 +0200
@@ -15,14 +15,14 @@
os.chdir('test1')
# create file 'foo', add and commit
-f = file('foo', 'wb')
+f = open('foo', 'wb')
f.write('foo\n')
f.close()
testdispatch("add foo")
testdispatch("commit -m commit1 -d 2000-01-01 foo")
# append to file 'foo' and commit
-f = file('foo', 'ab')
+f = open('foo', 'ab')
f.write('bar\n')
f.close()
testdispatch("commit -m commit2 -d 2000-01-02 foo")
--- a/tests/test-encoding Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-encoding Mon Oct 05 22:17:39 2009 +0200
@@ -29,30 +29,31 @@
HGENCODING=latin-1 hg ci -d "1000000 0" -m 'latin1 branch'
rm .hg/branch
-echo % ascii
+echo "% hg log (ascii)"
hg --encoding ascii log
-echo % latin-1
+echo "% hg log (latin-1)"
hg --encoding latin-1 log
-echo % utf-8
+echo "% hg log (utf-8)"
hg --encoding utf-8 log
-echo % ascii
+echo "% hg tags (ascii)"
HGENCODING=ascii hg tags
-echo % latin-1
+echo "% hg tags (latin-1)"
HGENCODING=latin-1 hg tags
-echo % utf-8
+echo "% hg tags (utf-8)"
HGENCODING=utf-8 hg tags
-echo % ascii
+echo "% hg branches (ascii)"
HGENCODING=ascii hg branches
-echo % latin-1
+echo "% hg branches (latin-1)"
HGENCODING=latin-1 hg branches
-echo % utf-8
+echo "% hg branches (utf-8)"
HGENCODING=utf-8 hg branches
echo '[ui]' >> .hg/hgrc
echo 'fallbackencoding = koi8-r' >> .hg/hgrc
-echo % utf-8
+echo "% hg log (utf-8)"
HGENCODING=utf-8 hg log
+echo "% hg log (dolphin)"
HGENCODING=dolphin hg log
HGENCODING=ascii hg branch `cat latin-1-tag`
--- a/tests/test-encoding.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-encoding.out Mon Oct 05 22:17:39 2009 +0200
@@ -14,7 +14,7 @@
abort: decoding near ' encoded: é': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)!
% these should work
marked working directory as branch é
-% ascii
+% hg log (ascii)
changeset: 5:db5520b4645f
branch: ?
tag: tip
@@ -48,7 +48,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: latin-1 e': ? = u'\xe9'
-% latin-1
+% hg log (latin-1)
changeset: 5:db5520b4645f
branch: é
tag: tip
@@ -82,7 +82,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: latin-1 e': é = u'\xe9'
-% utf-8
+% hg log (utf-8)
changeset: 5:db5520b4645f
branch: é
tag: tip
@@ -116,25 +116,25 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: latin-1 e': é = u'\xe9'
-% ascii
+% hg tags (ascii)
tip 5:db5520b4645f
? 3:770b9b11621d
-% latin-1
+% hg tags (latin-1)
tip 5:db5520b4645f
é 3:770b9b11621d
-% utf-8
+% hg tags (utf-8)
tip 5:db5520b4645f
é 3:770b9b11621d
-% ascii
+% hg branches (ascii)
? 5:db5520b4645f
default 4:9cff3c980b58 (inactive)
-% latin-1
+% hg branches (latin-1)
é 5:db5520b4645f
default 4:9cff3c980b58 (inactive)
-% utf-8
+% hg branches (utf-8)
é 5:db5520b4645f
default 4:9cff3c980b58 (inactive)
-% utf-8
+% hg log (utf-8)
changeset: 5:db5520b4645f
branch: é
tag: tip
@@ -168,6 +168,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: latin-1 e': И = u'\xe9'
+% hg log (dolphin)
abort: unknown encoding: dolphin, please check your locale settings
abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)!
abort: branch name not in UTF-8!
--- a/tests/test-extdiff.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-extdiff.out Mon Oct 05 22:17:39 2009 +0200
@@ -7,14 +7,13 @@
use 'echo' to diff repository (or selected files)
- Show differences between revisions for the specified
- files, using the 'echo' program.
+ Show differences between revisions for the specified files, using the
+ 'echo' program.
- 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.
+ 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.
options:
--- a/tests/test-extension Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-extension Mon Oct 05 22:17:39 2009 +0200
@@ -55,6 +55,29 @@
hg foo
echo 'barfoo = !' >> $HGRCPATH
+# check that extensions are loaded in phases
+cat > foo.py <<EOF
+import os
+name = os.path.basename(__file__).rsplit('.', 1)[0]
+print "1) %s imported" % name
+def uisetup(ui):
+ print "2) %s uisetup" % name
+def extsetup():
+ print "3) %s extsetup" % name
+def reposetup(ui, repo):
+ print "4) %s reposetup" % name
+EOF
+
+cp foo.py bar.py
+echo 'foo = foo.py' >> $HGRCPATH
+echo 'bar = bar.py' >> $HGRCPATH
+
+# command with no output, we just want to see the extensions loaded
+hg paths
+
+echo 'foo = !' >> $HGRCPATH
+echo 'bar = !' >> $HGRCPATH
+
cd ..
cat > empty.py <<EOF
'''empty cmdtable
--- a/tests/test-extension.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-extension.out Mon Oct 05 22:17:39 2009 +0200
@@ -16,6 +16,14 @@
reposetup called for a
ui == repo.ui
Foo
+1) foo imported
+1) bar imported
+2) foo uisetup
+2) bar uisetup
+3) foo extsetup
+3) bar extsetup
+4) foo reposetup
+4) bar reposetup
empty extension - empty cmdtable
no commands defined
@@ -36,7 +44,7 @@
debugextension only debugcommands
global options:
- -R --repository repository root directory or symbolic path name
+ -R --repository repository root directory or name of overlay bundle file
--cwd change working directory
-y --noninteractive do not prompt, assume 'yes' for any required answers
-q --quiet suppress output
@@ -66,7 +74,7 @@
debugextension only debugcommands
global options:
- -R --repository repository root directory or symbolic path name
+ -R --repository repository root directory or name of overlay bundle file
--cwd change working directory
-y --noninteractive do not prompt, assume 'yes' for any required answers
-q --quiet suppress output
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-gendoc Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+"$TESTDIR/hghave" rst2html || exit 80
+RST2HTML=$(which rst2html 2> /dev/null || which rst2html.py)
+
+HGENCODING=UTF-8
+export HGENCODING
+
+for PO in C $TESTDIR/../i18n/*.po; do
+ LOCALE=$(basename $PO .po)
+ echo
+ echo "% extracting documentation from $LOCALE"
+ echo ".. -*- coding: utf-8 -*-" > gendoc-$LOCALE.txt
+ echo "" >> gendoc-$LOCALE.txt
+ LC_ALL=$LOCALE python $TESTDIR/../doc/gendoc.py >> gendoc-$LOCALE.txt || exit
+
+ # We run rst2html over the file without adding "--halt warning" to
+ # make it report all errors instead of stopping on the first one.
+ echo "checking for parse errors with rst2html"
+ $RST2HTML gendoc-$LOCALE.txt /dev/null
+done
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-gendoc.out Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,30 @@
+
+% extracting documentation from C
+checking for parse errors with rst2html
+
+% extracting documentation from da
+checking for parse errors with rst2html
+
+% extracting documentation from de
+checking for parse errors with rst2html
+
+% extracting documentation from el
+checking for parse errors with rst2html
+
+% extracting documentation from fr
+checking for parse errors with rst2html
+
+% extracting documentation from it
+checking for parse errors with rst2html
+
+% extracting documentation from ja
+checking for parse errors with rst2html
+
+% extracting documentation from pt_BR
+checking for parse errors with rst2html
+
+% extracting documentation from zh_CN
+checking for parse errors with rst2html
+
+% extracting documentation from zh_TW
+checking for parse errors with rst2html
--- a/tests/test-grep Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-grep Mon Oct 05 22:17:39 2009 +0200
@@ -22,14 +22,14 @@
echo % simple
hg grep port port
echo % all
-hg grep --all -nu port port
+hg grep --traceback --all -nu port port
echo % other
hg grep import port
hg cp port port2
hg commit -m 4 -u spam -d '5 0'
-echo '% follow'
-hg grep -f 'import$' port2
+echo % follow
+hg grep --traceback -f 'import$' port2
echo deport >> port2
hg commit -m 5 -u eggs -d '6 0'
hg grep -f --all -nu port port2
--- a/tests/test-help.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-help.out Mon Oct 05 22:17:39 2009 +0200
@@ -170,11 +170,10 @@
add the specified files on the next commit
- Schedule files to be version controlled and added to the
- repository.
+ Schedule files to be version controlled and added to the repository.
- The files will be added to the repository at the next commit. To
- undo an add before that, see hg forget.
+ The files will be added to the repository at the next commit. To undo an
+ add before that, see hg forget.
If no names are given, add all files to the repository.
@@ -190,11 +189,10 @@
add the specified files on the next commit
- Schedule files to be version controlled and added to the
- repository.
+ Schedule files to be version controlled and added to the repository.
- The files will be added to the repository at the next commit. To
- undo an add before that, see hg forget.
+ The files will be added to the repository at the next commit. To undo an
+ add before that, see hg forget.
If no names are given, add all files to the repository.
@@ -213,22 +211,21 @@
Differences between files are shown using the unified diff format.
- 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.
+ 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.
- 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.
+ 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.
- 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.
+ Without the -a/--text option, diff will avoid generating diffs of files it
+ detects as binary. With -a, diff will generate a diff anyway, probably
+ with undesirable results.
- Use the -g/--git option to generate diffs in the git extended diff
- format. For more information, read 'hg help diffs'.
+ Use the -g/--git option to generate diffs in the git extended diff format.
+ For more information, read 'hg help diffs'.
options:
@@ -252,34 +249,33 @@
show changed files in the working directory
- Show status of files in the repository. If names are given, only
- files that match are shown. Files that are clean or ignored or
- the source of a copy/move operation, are not listed unless
- -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
- Unless options described with "show only ..." are given, the
- options -mardu are used.
+ Show status of files in the repository. If names are given, only files
+ that match are shown. Files that are clean or ignored or the source of a
+ copy/move operation, are not listed unless -c/--clean, -i/--ignored,
+ -C/--copies or -A/--all are given. Unless options described with "show
+ only ..." are given, the options -mardu are used.
- Option -q/--quiet hides untracked (unknown and ignored) files
- unless explicitly requested with -u/--unknown or -i/--ignored.
+ Option -q/--quiet hides untracked (unknown and ignored) files unless
+ explicitly requested with -u/--unknown or -i/--ignored.
- 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.
+ 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.
- If one revision is given, it is used as the base revision.
- If two revisions are given, the differences between them are
- shown.
+ If one revision is given, it is used as the base revision. If two
+ revisions are given, the differences between them are shown.
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)
+
+ 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)
options:
--- a/tests/test-hgwebdir Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-hgwebdir Mon Oct 05 22:17:39 2009 +0200
@@ -29,6 +29,7 @@
root=`pwd`
cd ..
+
cat > paths.conf <<EOF
[paths]
a=$root/a
@@ -50,6 +51,7 @@
echo % should give a 404 - repo is not published
"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/c/file/tip/c?style=raw'
+
cat > paths.conf <<EOF
[paths]
t/a/=$root/a
@@ -83,6 +85,24 @@
"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/rcoll/b/d/file/tip/d?style=raw'
+"$TESTDIR/killdaemons.py"
+cat > paths.conf <<EOF
+[paths]
+t/a = $root/a
+t/b = $root/b
+c = $root/c
+[web]
+descend=false
+EOF
+
+hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf paths.conf \
+ -A access-paths.log -E error-paths-3.log
+cat hg.pid >> $DAEMON_PIDS
+echo % test descend = False
+"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw'
+"$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/t/?style=raw'
+
+
cat > collections.conf <<EOF
[collections]
$root=$root
@@ -99,9 +119,12 @@
"$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/b/file/tip/b?style=raw'
"$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/c/file/tip/c?style=raw'
+
echo % paths errors 1
cat error-paths-1.log
echo % paths errors 2
cat error-paths-2.log
+echo % paths errors 3
+cat error-paths-3.log
echo % collections errors
cat error-collections.log
--- a/tests/test-hgwebdir.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-hgwebdir.out Mon Oct 05 22:17:39 2009 +0200
@@ -307,6 +307,18 @@
200 Script output follows
d
+% test descend = False
+200 Script output follows
+
+
+/c/
+
+200 Script output follows
+
+
+/t/a/
+/t/b/
+
% collections: should succeed
200 Script output follows
@@ -327,4 +339,5 @@
c
% paths errors 1
% paths errors 2
+% paths errors 3
% collections errors
--- a/tests/test-highlight Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-highlight Mon Oct 05 22:17:39 2009 +0200
@@ -47,9 +47,6 @@
print "The first %d primes: %s" % (n, list(islice(p, n)))
EOF
-# check for UnicodeDecodeError with iso-8859-1 file contents
-python -c 'fp = open("isolatin.txt", "w"); fp.write("h\xFCbsch\n"); fp.close();'
-
hg ci -Ama
echo % hg serve
@@ -60,10 +57,6 @@
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/primes.py') \
| sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mf\"/class=\"mi\"/g"
-echo % hgweb filerevision, html
-("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/isolatin.txt') \
- | sed "s/class=\"k\"/class=\"kn\"/g"
-
echo % hgweb fileannotate, html
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/primes.py') \
| sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mi\"/class=\"mf\"/g"
--- a/tests/test-highlight.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-highlight.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,4 +1,3 @@
-adding isolatin.txt
adding primes.py
% hg serve
% hgweb filerevision, html
@@ -12,7 +11,7 @@
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
<link rel="stylesheet" href="/highlightcss" type="text/css" />
-<title>test: 3e1445510fe7 primes.py</title>
+<title>test: 853dcd4de2a6 primes.py</title>
</head>
<body>
@@ -23,27 +22,27 @@
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
-<li><a href="/shortlog/3e1445510fe7">log</a></li>
-<li><a href="/graph/3e1445510fe7">graph</a></li>
+<li><a href="/shortlog/853dcd4de2a6">log</a></li>
+<li><a href="/graph/853dcd4de2a6">graph</a></li>
<li><a href="/tags">tags</a></li>
<li><a href="/branches">branches</a></li>
</ul>
<ul>
-<li><a href="/rev/3e1445510fe7">changeset</a></li>
-<li><a href="/file/3e1445510fe7/">browse</a></li>
+<li><a href="/rev/853dcd4de2a6">changeset</a></li>
+<li><a href="/file/853dcd4de2a6/">browse</a></li>
</ul>
<ul>
<li class="active">file</li>
-<li><a href="/diff/3e1445510fe7/primes.py">diff</a></li>
-<li><a href="/annotate/3e1445510fe7/primes.py">annotate</a></li>
-<li><a href="/log/3e1445510fe7/primes.py">file log</a></li>
-<li><a href="/raw-file/3e1445510fe7/primes.py">raw</a></li>
+<li><a href="/diff/853dcd4de2a6/primes.py">diff</a></li>
+<li><a href="/annotate/853dcd4de2a6/primes.py">annotate</a></li>
+<li><a href="/log/853dcd4de2a6/primes.py">file log</a></li>
+<li><a href="/raw-file/853dcd4de2a6/primes.py">raw</a></li>
</ul>
</div>
<div class="main">
<h2><a href="/">test</a></h2>
-<h3>view primes.py @ 0:3e1445510fe7</h3>
+<h3>view primes.py @ 0:853dcd4de2a6</h3>
<form class="search" action="/log">
@@ -119,93 +118,6 @@
</body>
</html>
-% hgweb filerevision, html
-200 Script output follows
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
-<head>
-<link rel="icon" href="/static/hgicon.png" type="image/png" />
-<meta name="robots" content="index, nofollow" />
-<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
-
-<link rel="stylesheet" href="/highlightcss" type="text/css" />
-<title>test: 3e1445510fe7 isolatin.txt</title>
-</head>
-<body>
-
-<div class="container">
-<div class="menu">
-<div class="logo">
-<a href="http://mercurial.selenic.com/">
-<img src="/static/hglogo.png" alt="mercurial" /></a>
-</div>
-<ul>
-<li><a href="/shortlog/3e1445510fe7">log</a></li>
-<li><a href="/graph/3e1445510fe7">graph</a></li>
-<li><a href="/tags">tags</a></li>
-<li><a href="/branches">branches</a></li>
-</ul>
-<ul>
-<li><a href="/rev/3e1445510fe7">changeset</a></li>
-<li><a href="/file/3e1445510fe7/">browse</a></li>
-</ul>
-<ul>
-<li class="active">file</li>
-<li><a href="/diff/3e1445510fe7/isolatin.txt">diff</a></li>
-<li><a href="/annotate/3e1445510fe7/isolatin.txt">annotate</a></li>
-<li><a href="/log/3e1445510fe7/isolatin.txt">file log</a></li>
-<li><a href="/raw-file/3e1445510fe7/isolatin.txt">raw</a></li>
-</ul>
-</div>
-
-<div class="main">
-<h2><a href="/">test</a></h2>
-<h3>view isolatin.txt @ 0:3e1445510fe7</h3>
-
-<form class="search" action="/log">
-
-<p><input name="rev" id="search1" type="text" size="30" /></p>
-<div id="hint">find changesets by author, revision,
-files, or words in the commit message</div>
-</form>
-
-<div class="description">a</div>
-
-<table id="changesetEntry">
-<tr>
- <th class="author">author</th>
- <td class="author">test</td>
-</tr>
-<tr>
- <th class="date">date</th>
- <td class="date">Thu Jan 01 00:00:00 1970 +0000 (many years ago)</td>
-</tr>
-<tr>
- <th class="author">parents</th>
- <td class="author"></td>
-</tr>
-<tr>
- <th class="author">children</th>
- <td class="author"></td>
-</tr>
-
-</table>
-
-<div class="overflow">
-<div class="sourcefirst"> line source</div>
-
-<div class="parity0 source"><a href="#l1" id="l1"> 1</a> h?bsch</div>
-<div class="sourcelast"></div>
-</div>
-</div>
-</div>
-
-
-
-</body>
-</html>
-
% hgweb fileannotate, html
200 Script output follows
@@ -228,28 +140,28 @@
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
-<li><a href="/shortlog/3e1445510fe7">log</a></li>
-<li><a href="/graph/3e1445510fe7">graph</a></li>
+<li><a href="/shortlog/853dcd4de2a6">log</a></li>
+<li><a href="/graph/853dcd4de2a6">graph</a></li>
<li><a href="/tags">tags</a></li>
<li><a href="/branches">branches</a></li>
</ul>
<ul>
-<li><a href="/rev/3e1445510fe7">changeset</a></li>
-<li><a href="/file/3e1445510fe7/">browse</a></li>
+<li><a href="/rev/853dcd4de2a6">changeset</a></li>
+<li><a href="/file/853dcd4de2a6/">browse</a></li>
</ul>
<ul>
-<li><a href="/file/3e1445510fe7/primes.py">file</a></li>
-<li><a href="/diff/3e1445510fe7/primes.py">diff</a></li>
+<li><a href="/file/853dcd4de2a6/primes.py">file</a></li>
+<li><a href="/diff/853dcd4de2a6/primes.py">diff</a></li>
<li class="active">annotate</li>
-<li><a href="/log/3e1445510fe7/primes.py">file log</a></li>
-<li><a href="/raw-annotate/3e1445510fe7/primes.py">raw</a></li>
+<li><a href="/log/853dcd4de2a6/primes.py">file log</a></li>
+<li><a href="/raw-annotate/853dcd4de2a6/primes.py">raw</a></li>
</ul>
</div>
<div class="main">
<h2><a href="/">test</a></h2>
-<h3>annotate primes.py @ 0:3e1445510fe7</h3>
+<h3>annotate primes.py @ 0:853dcd4de2a6</h3>
<form class="search" action="/log">
@@ -289,225 +201,225 @@
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#1"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#1"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l1" id="l1"> 1</a> <span class="c">#!/usr/bin/env python</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#2"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#2"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l2" id="l2"> 2</a> </td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#3"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#3"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l3" id="l3"> 3</a> <span class="sd">"""Fun with generators. Corresponding Haskell implementation:</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#4"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#4"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l4" id="l4"> 4</a> </td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#5"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#5"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l5" id="l5"> 5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#6"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#6"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l6" id="l6"> 6</a> <span class="sd"> where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]</span></td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#7"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#7"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l7" id="l7"> 7</a> <span class="sd">"""</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#8"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#8"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l8" id="l8"> 8</a> </td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#9"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#9"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l9" id="l9"> 9</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#10"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#10"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l10" id="l10"> 10</a> </td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#11"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#11"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l11" id="l11"> 11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#12"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#12"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l12" id="l12"> 12</a> <span class="sd">"""Generate all primes."""</span></td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#13"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#13"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l13" id="l13"> 13</a> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#14"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#14"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l14" id="l14"> 14</a> <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#15"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#15"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l15" id="l15"> 15</a> <span class="c"># It is important to yield *here* in order to stop the</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#16"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#16"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l16" id="l16"> 16</a> <span class="c"># infinite recursion.</span></td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#17"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#17"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l17" id="l17"> 17</a> <span class="kn">yield</span> <span class="n">p</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#18"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#18"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l18" id="l18"> 18</a> <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mf">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#19"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#19"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l19" id="l19"> 19</a> <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#20"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#20"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l20" id="l20"> 20</a> <span class="kn">yield</span> <span class="n">n</span></td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#21"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#21"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l21" id="l21"> 21</a> </td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#22"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#22"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l22" id="l22"> 22</a> <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mf">2</span> <span class="o">==</span> <span class="mf">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#23"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#23"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l23" id="l23"> 23</a> <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mf">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o"><</span> <span class="mf">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#24"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#24"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l24" id="l24"> 24</a> </td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#25"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#25"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l25" id="l25"> 25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">"__main__"</span><span class="p">:</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#26"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#26"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l26" id="l26"> 26</a> <span class="kn">import</span> <span class="nn">sys</span></td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#27"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#27"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l27" id="l27"> 27</a> <span class="kn">try</span><span class="p">:</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#28"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#28"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l28" id="l28"> 28</a> <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#29"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#29"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l29" id="l29"> 29</a> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#30"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#30"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l30" id="l30"> 30</a> <span class="n">n</span> <span class="o">=</span> <span class="mf">10</span></td>
</tr>
<tr class="parity0">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#31"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#31"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l31" id="l31"> 31</a> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td>
</tr>
<tr class="parity1">
<td class="annotate">
-<a href="/annotate/3e1445510fe7/primes.py#32"
-title="3e1445510fe7: a">test@0</a>
+<a href="/annotate/853dcd4de2a6/primes.py#32"
+title="853dcd4de2a6: a">test@0</a>
</td>
<td class="source"><a href="#l32" id="l32"> 32</a> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></td>
</tr>
--- a/tests/test-hook Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-hook Mon Oct 05 22:17:39 2009 +0200
@@ -230,4 +230,22 @@
hg showconfig hooks | sed -e 's/ at .*>/>/'
+echo '# test python hook configured with python:[file]:[hook] syntax'
+cd ..
+mkdir d
+cd d
+hg init repo
+mkdir hooks
+
+cd hooks
+cat > testhooks.py <<EOF
+def testhook(**args):
+ print 'hook works'
+EOF
+echo '[hooks]' > ../repo/.hg/hgrc
+echo "pre-commit.test = python:`pwd`/testhooks.py:testhook" >> ../repo/.hg/hgrc
+
+cd ../repo
+hg commit
+
exit 0
--- a/tests/test-hook.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-hook.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,18 +1,18 @@
precommit hook: HG_PARENT1=0000000000000000000000000000000000000000
-pretxncommit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=true
+pretxncommit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$HGTMP/test-hook/a
0:29b62aeb769f
commit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000
commit.b hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
-pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=true
+pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=$HGTMP/test-hook/a
1:b702efe96888
commit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
commit.b hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
-pretxncommit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=true
+pretxncommit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=$HGTMP/test-hook/a
2:1324a5531bac
commit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
commit.b hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
@@ -20,7 +20,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
precommit hook: HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2
-pretxncommit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PENDING=true
+pretxncommit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PENDING=$HGTMP/test-hook/a
3:4c52fb2e4022
commit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2
commit.b hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2
@@ -43,7 +43,7 @@
(run 'hg update' to get a working copy)
pretag hook: HG_LOCAL=0 HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_TAG=a
precommit hook: HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321
-pretxncommit hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 HG_PENDING=true
+pretxncommit hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 HG_PENDING=$HGTMP/test-hook/a
4:8ea2ef7ad3e8
commit hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321
commit.b hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321
@@ -58,10 +58,10 @@
abort: pretag.forbid hook exited with status 1
4:8ea2ef7ad3e8
precommit hook: HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198
-pretxncommit hook: HG_NODE=fad284daf8c032148abaffcd745dafeceefceb61 HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=true
+pretxncommit hook: HG_NODE=fad284daf8c032148abaffcd745dafeceefceb61 HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=$HGTMP/test-hook/a
5:fad284daf8c0
5:fad284daf8c0
-pretxncommit.forbid hook: HG_NODE=fad284daf8c032148abaffcd745dafeceefceb61 HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=true
+pretxncommit.forbid hook: HG_NODE=fad284daf8c032148abaffcd745dafeceefceb61 HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=$HGTMP/test-hook/a
transaction abort!
rollback completed
abort: pretxncommit.forbid1 hook exited with status 1
@@ -81,7 +81,7 @@
searching for changes
abort: prechangegroup.forbid hook exited with status 1
4:8ea2ef7ad3e8
-pretxnchangegroup.forbid hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=true HG_SOURCE=pull HG_URL=file:
+pretxnchangegroup.forbid hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PENDING=$HGTMP/test-hook/b HG_SOURCE=pull HG_URL=file:
pulling from ../a
searching for changes
adding changesets
@@ -160,3 +160,6 @@
Automatically installed hook
committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708
hooks.commit.auto=<function autohook>
+# test python hook configured with python:[file]:[hook] syntax
+hook works
+nothing changed
--- a/tests/test-http Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-http Mon Oct 05 22:17:39 2009 +0200
@@ -5,6 +5,11 @@
hg init test
cd test
echo foo>foo
+mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
+echo foo>foo.d/foo
+echo bar>foo.d/bAr.hg.d/BaR
+echo bar>foo.d/baR.d.hg/bAR
+
hg commit -A -m 1
hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=../hg1.pid
hg serve -p $HGPORT1 -d --pid-file=../hg2.pid
--- a/tests/test-http.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-http.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,4 +1,7 @@
adding foo
+adding foo.d/bAr.hg.d/BaR
+adding foo.d/baR.d.hg/bAR
+adding foo.d/foo
abort: cannot start server at ':20060':
% clone via stream
streaming all changes
@@ -10,31 +13,31 @@
checking manifests
crosschecking files in changesets and manifests
checking files
-1 files, 1 changesets, 1 total revisions
+4 files, 1 changesets, 4 total revisions
% try to clone via stream, should use pull instead
requesting all changes
adding changesets
adding manifests
adding file changes
-added 1 changesets with 1 changes to 1 files
+added 1 changesets with 4 changes to 4 files
updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
% clone via pull
requesting all changes
adding changesets
adding manifests
adding file changes
-added 1 changesets with 1 changes to 1 files
+added 1 changesets with 4 changes to 4 files
updating working directory
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
-1 files, 1 changesets, 1 total revisions
+4 files, 1 changesets, 4 total revisions
adding bar
% pull
-changegroup hook: HG_NODE=cfbd11a1fa315300a080c3de8fe36b0fc5820acf HG_SOURCE=pull HG_URL=http://localhost/
+changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=http://localhost/
pulling from http://localhost/
searching for changes
adding changesets
--- a/tests/test-import Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-import Mon Oct 05 22:17:39 2009 +0200
@@ -332,3 +332,16 @@
EOF
hg import --no-commit a.patch
cd ..
+
+echo '% create file when source is not /dev/null'
+cat > create.patch <<EOF
+diff -Naur proj-orig/foo proj-new/foo
+--- proj-orig/foo 1969-12-31 16:00:00.000000000 -0800
++++ proj-new/foo 2009-07-17 16:50:45.801368000 -0700
+@@ -0,0 +1,1 @@
++a
+EOF
+hg init oddcreate
+cd oddcreate
+hg import --no-commit ../create.patch
+cat foo
--- a/tests/test-import.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-import.out Mon Oct 05 22:17:39 2009 +0200
@@ -292,3 +292,6 @@
% add empty file from the end of patch (issue 1495)
adding a
applying a.patch
+% create file when source is not /dev/null
+applying ../create.patch
+a
--- a/tests/test-inotify Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-inotify Mon Oct 05 22:17:39 2009 +0200
@@ -35,4 +35,39 @@
hg status .
cd ..
+#issue 1375
+#Testing that we can remove a folder and then add a file with the same name
+echo % issue 1375
+
+mkdir h
+echo h > h/h
+hg ci -Am t
+hg rm h
+
+echo h >h
+hg add h
+
+hg status
+hg ci -m0
+
+# Test for issue1735: inotify watches files in .hg/merge
+hg st
+
+echo a > a
+
+hg ci -Am a
+hg st
+
+echo b >> a
+hg ci -m ab
+hg st
+
+echo c >> a
+hg st
+
+hg up 0
+hg st
+
+HGMERGE=internal:local hg up
+hg st
kill `cat hg.pid`
--- a/tests/test-inotify-issue1208.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-inotify-issue1208.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,5 +1,5 @@
% fail
-could not talk to new inotify server: No such file or directory
+abort: could not start server: File exists
abort: could not start server: File exists
% inserve
% status
--- a/tests/test-inotify.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-inotify.out Mon Oct 05 22:17:39 2009 +0200
@@ -32,3 +32,15 @@
? hg.pid
M dir/x
M x
+% issue 1375
+adding h/h
+adding hg.pid
+removing h/h
+A h
+R h/h
+M a
+merging a
+1 files updated, 1 files merged, 2 files removed, 0 files unresolved
+M a
+3 files updated, 1 files merged, 0 files removed, 0 files unresolved
+M a
--- a/tests/test-keyword Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-keyword Mon Oct 05 22:17:39 2009 +0200
@@ -13,9 +13,6 @@
commit.test=cp a hooktest
EOF
-echo % help
-hg help keyword
-
echo % hg kwdemo
hg --quiet kwdemo --default \
| sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \
@@ -51,6 +48,11 @@
echo % cat
cat a b
+echo % no kwfiles
+hg kwfiles
+echo % untracked candidates
+hg -v kwfiles --unknown
+
echo % addremove
hg addremove
echo % status
@@ -165,6 +167,10 @@
echo % kwfiles
hg kwfiles
+echo % ignored files
+hg -v kwfiles --ignore
+echo % all files
+hg kwfiles --all
echo % diff --rev
hg diff --rev 1 | grep -v 'b/c'
--- a/tests/test-keyword.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-keyword.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,65 +1,3 @@
-% help
-keyword extension - expand keywords in tracked files
-
-This extension expands RCS/CVS-like or self-customized $Keywords$ in
-tracked text files selected by your configuration.
-
-Keywords are only expanded in local repositories and not stored in the
-change history. The mechanism can be regarded as a convenience for the
-current user or for archive distribution.
-
-Configuration is done in the [keyword] and [keywordmaps] sections of
-hgrc files.
-
-Example:
-
- [keyword]
- # expand keywords in every python file except those matching "x*"
- **.py =
- x* = ignore
-
-Note: the more specific you are in your filename patterns
- the less you lose speed in huge repositories.
-
-For [keywordmaps] template mapping and expansion demonstration and
-control run "hg kwdemo".
-
-An additional date template filter {date|utcdate} is provided.
-
-The default template mappings (view with "hg kwdemo -d") can be
-replaced with customized keywords and templates. Again, run "hg
-kwdemo" to control the results of your config changes.
-
-Before changing/disabling active keywords, run "hg kwshrink" to avoid
-the risk of inadvertently storing expanded keywords in the change
-history.
-
-To force expansion after enabling it, or a configuration change, run
-"hg kwexpand".
-
-Also, when committing with the record extension or using mq's qrecord,
-be aware that keywords cannot be updated. Again, run "hg kwexpand" on
-the files in question to update keyword expansions after all changes
-have been checked in.
-
-Expansions spanning more than one line and incremental expansions,
-like CVS' $Log$, are not supported. A keyword template map
-"Log = {desc}" expands to the first line of the changeset description.
-
-list of commands:
-
- kwdemo print [keywordmaps] configuration and an expansion example
- kwexpand expand keywords in the working directory
- kwfiles show files configured for keyword expansion
- kwshrink revert expanded keywords in the working directory
-
-enabled extensions:
-
- keyword expand keywords in tracked files
- mq manage a stack of patches
- notify hooks for sending email notifications at commit/push time
-
-use "hg -v help keyword" to show aliases and global options
% hg kwdemo
[extensions]
hgext.keyword =
@@ -104,6 +42,9 @@
do not process $Id:
xxx $
ignore $Id$
+% no kwfiles
+% untracked candidates
+k a
% addremove
adding a
adding b
@@ -211,6 +152,7 @@
+$Id$
+tests for different changenodes
% qpop
+popping mqtest.diff
patch queue now empty
% qgoto - should imply qpush
applying mqtest.diff
@@ -219,6 +161,7 @@
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
tests for different changenodes
% qpop and move on
+popping mqtest.diff
patch queue now empty
% copy
% kwfiles added
@@ -241,6 +184,14 @@
% kwfiles
a
c
+% ignored files
+I b
+I sym
+% all files
+K a
+K c
+I b
+I sym
% diff --rev
diff -r ef63ca68695b c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -460,7 +411,7 @@
warning: conflicts during merge.
merging m failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% keyword stays outside conflict zone
$Id$
<<<<<<< local
--- a/tests/test-log Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-log Mon Oct 05 22:17:39 2009 +0200
@@ -104,6 +104,12 @@
echo '% log -r <some unknown node id>'
hg log -r 1000000000000000000000000000000000000000
+echo '% log -k r1'
+hg log -k r1
+
+echo '% log -d -1'
+hg log -d -1
+
cd ..
hg init usertest
--- a/tests/test-log.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-log.out Mon Oct 05 22:17:39 2009 +0200
@@ -239,6 +239,13 @@
abort: 00changelog.i@: ambiguous identifier!
% log -r <some unknown node id>
abort: unknown revision '1000000000000000000000000000000000000000'!
+% log -k r1
+changeset: 1:3d5bf5654eda
+user: test
+date: Thu Jan 01 00:00:01 1970 +0000
+summary: r1
+
+% log -d -1
adding a
adding b
changeset: 0:29a4c94f1924
--- a/tests/test-merge-internal-tools-pattern.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-merge-internal-tools-pattern.out Mon Oct 05 22:17:39 2009 +0200
@@ -9,7 +9,7 @@
created new head
# merge using internal:fail tool
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
line 1
line 2
third line
--- a/tests/test-merge-tools.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-merge-tools.out Mon Oct 05 22:17:39 2009 +0200
@@ -17,7 +17,7 @@
warning: conflicts during merge.
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
<<<<<<< local
revision 1
@@ -37,7 +37,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -69,7 +69,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -86,7 +86,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -103,7 +103,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -120,7 +120,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -185,7 +185,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -204,7 +204,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -223,7 +223,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -244,7 +244,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -260,7 +260,7 @@
# hg update -C 1
# hg merge -r 2 --config ui.merge=internal:fail
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -323,7 +323,7 @@
# hg merge -r 2 --config ui.merge=internal:dump
merging f
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -354,7 +354,7 @@
merging f
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
@@ -518,7 +518,7 @@
was merge successful (yn)? n
merging f failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
# cat f
revision 1
space
--- a/tests/test-merge7.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-merge7.out Mon Oct 05 22:17:39 2009 +0200
@@ -11,7 +11,7 @@
warning: conflicts during merge.
merging test.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
pulling from ../test-a
searching for changes
adding changesets
@@ -31,7 +31,7 @@
warning: conflicts during merge.
merging test.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
one
<<<<<<< local
two-point-five
--- a/tests/test-merge9.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-merge9.out Mon Oct 05 22:17:39 2009 +0200
@@ -7,7 +7,7 @@
merging bar failed!
merging foo and baz to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
U bar
R baz
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -15,7 +15,7 @@
merging bar failed!
merging baz and foo to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% show unresolved
U bar
R baz
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-minirst.py Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,153 @@
+#!/usr/bin/env python
+
+from mercurial import minirst
+
+def debugformat(title, text, width):
+ print "%s formatted to fit within %d characters:" % (title, width)
+ print "-" * 70
+ print minirst.format(text, width)
+ print "-" * 70
+ print
+
+paragraphs = """
+This is some text in the first paragraph.
+
+ An indented paragraph
+ with just two lines.
+
+
+The third paragraph. It is followed by some
+random lines with spurious spaces.
+
+
+
+
+
+No indention
+ here, despite
+the uneven left
+ margin.
+
+ Only the
+ left-most line
+ (this line!)
+ is significant
+ for the indentation
+
+"""
+
+debugformat('paragraphs', paragraphs, 60)
+debugformat('paragraphs', paragraphs, 30)
+
+
+definitions = """
+A Term
+ Definition. The indented
+ lines make up the definition.
+Another Term
+ Another definition. The final line in the
+ definition determines the indentation, so
+ this will be indented with four spaces.
+
+ A Nested/Indented Term
+ Definition.
+"""
+
+debugformat('definitions', definitions, 60)
+debugformat('definitions', definitions, 30)
+
+
+literals = r"""
+The fully minimized form is the most
+convenient form::
+
+ Hello
+ literal
+ world
+
+In the partially minimized form a paragraph
+simply ends with space-double-colon. ::
+
+ ////////////////////////////////////////
+ long un-wrapped line in a literal block
+ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+::
+
+ This literal block is started with '::',
+ the so-called expanded form. The paragraph
+ with '::' disappears in the final output.
+"""
+
+debugformat('literals', literals, 60)
+debugformat('literals', literals, 30)
+
+
+lists = """
+- This is the first list item.
+
+ Second paragraph in the first list item.
+
+- List items need not be separated
+ by a blank line.
+- And will be rendered without
+ one in any case.
+
+We can have indented lists:
+
+ - This is an indented list item
+
+ - Another indented list item::
+
+ - A literal block in the middle
+ of an indented list.
+
+ (The above is not a list item since we are in the literal block.)
+
+::
+
+ Literal block with no indentation (apart from
+ the two spaces added to all literal blocks).
+"""
+
+debugformat('lists', lists, 60)
+debugformat('lists', lists, 30)
+
+
+options = """
+There is support for simple option lists,
+but only with long options:
+
+--all Output all.
+--both Output both (this description is
+ quite long).
+--long Output all day long.
+
+--par This option has two paragraphs in its description.
+ This is the first.
+
+ This is the second. Blank lines may be omitted between
+ options (as above) or left in (as here).
+
+The next paragraph looks like an option list, but lacks the two-space
+marker after the option. It is treated as a normal paragraph:
+
+--foo bar baz
+"""
+
+debugformat('options', options, 60)
+debugformat('options', options, 30)
+
+
+fields = """
+Field lists give a simple two-column layout:
+
+:key: The whitespace following the key is
+ significant for the wrapping of this text.
+:another key: More text.
+ The indentation on the following
+ lines is not significant.
+"""
+
+debugformat('fields', fields, 60)
+debugformat('fields', fields, 30)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-minirst.py.out Mon Oct 05 22:17:39 2009 +0200
@@ -0,0 +1,239 @@
+paragraphs formatted to fit within 60 characters:
+----------------------------------------------------------------------
+This is some text in the first paragraph.
+
+ An indented paragraph with just two lines.
+
+The third paragraph. It is followed by some random lines
+with spurious spaces.
+
+No indention here, despite the uneven left margin.
+
+ Only the left-most line (this line!) is significant for
+ the indentation
+----------------------------------------------------------------------
+
+paragraphs formatted to fit within 30 characters:
+----------------------------------------------------------------------
+This is some text in the first
+paragraph.
+
+ An indented paragraph with
+ just two lines.
+
+The third paragraph. It is
+followed by some random lines
+with spurious spaces.
+
+No indention here, despite the
+uneven left margin.
+
+ Only the left-most line
+ (this line!) is significant
+ for the indentation
+----------------------------------------------------------------------
+
+definitions formatted to fit within 60 characters:
+----------------------------------------------------------------------
+A Term
+ Definition. The indented lines make up the definition.
+Another Term
+ Another definition. The final line in the definition
+ determines the indentation, so this will be indented
+ with four spaces.
+ A Nested/Indented Term
+ Definition.
+----------------------------------------------------------------------
+
+definitions formatted to fit within 30 characters:
+----------------------------------------------------------------------
+A Term
+ Definition. The indented
+ lines make up the
+ definition.
+Another Term
+ Another definition. The
+ final line in the
+ definition determines the
+ indentation, so this will
+ be indented with four
+ spaces.
+ A Nested/Indented Term
+ Definition.
+----------------------------------------------------------------------
+
+literals formatted to fit within 60 characters:
+----------------------------------------------------------------------
+The fully minimized form is the most convenient form:
+
+ Hello
+ literal
+ world
+
+In the partially minimized form a paragraph simply ends with
+space-double-colon.
+
+ ////////////////////////////////////////
+ long un-wrapped line in a literal block
+ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+ This literal block is started with '::',
+ the so-called expanded form. The paragraph
+ with '::' disappears in the final output.
+----------------------------------------------------------------------
+
+literals formatted to fit within 30 characters:
+----------------------------------------------------------------------
+The fully minimized form is
+the most convenient form:
+
+ Hello
+ literal
+ world
+
+In the partially minimized
+form a paragraph simply ends
+with space-double-colon.
+
+ ////////////////////////////////////////
+ long un-wrapped line in a literal block
+ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
+
+ This literal block is started with '::',
+ the so-called expanded form. The paragraph
+ with '::' disappears in the final output.
+----------------------------------------------------------------------
+
+lists formatted to fit within 60 characters:
+----------------------------------------------------------------------
+- This is the first list item.
+
+ Second paragraph in the first list item.
+
+- List items need not be separated by a blank line.
+- And will be rendered without one in any case.
+
+We can have indented lists:
+
+ - This is an indented list item
+ - Another indented list item:
+
+ - A literal block in the middle
+ of an indented list.
+
+ (The above is not a list item since we are in the literal block.)
+
+ Literal block with no indentation (apart from
+ the two spaces added to all literal blocks).
+----------------------------------------------------------------------
+
+lists formatted to fit within 30 characters:
+----------------------------------------------------------------------
+- This is the first list item.
+
+ Second paragraph in the
+ first list item.
+
+- List items need not be
+ separated by a blank line.
+- And will be rendered without
+ one in any case.
+
+We can have indented lists:
+
+ - This is an indented list
+ item
+ - Another indented list
+ item:
+
+ - A literal block in the middle
+ of an indented list.
+
+ (The above is not a list item since we are in the literal block.)
+
+ Literal block with no indentation (apart from
+ the two spaces added to all literal blocks).
+----------------------------------------------------------------------
+
+options formatted to fit within 60 characters:
+----------------------------------------------------------------------
+There is support for simple option lists, but only with long
+options:
+
+--all Output all.
+--both Output both (this description is quite long).
+--long Output all day long.
+--par This option has two paragraphs in its
+ description. This is the first.
+
+ This is the second. Blank lines may be omitted
+ between options (as above) or left in (as here).
+
+The next paragraph looks like an option list, but lacks the
+two-space marker after the option. It is treated as a normal
+paragraph:
+
+--foo bar baz
+----------------------------------------------------------------------
+
+options formatted to fit within 30 characters:
+----------------------------------------------------------------------
+There is support for simple
+option lists, but only with
+long options:
+
+--all Output all.
+--both Output both (this
+ description is
+ quite long).
+--long Output all day
+ long.
+--par This option has two
+ paragraphs in its
+ description. This
+ is the first.
+
+ This is the second.
+ Blank lines may be
+ omitted between
+ options (as above)
+ or left in (as
+ here).
+
+The next paragraph looks like
+an option list, but lacks the
+two-space marker after the
+option. It is treated as a
+normal paragraph:
+
+--foo bar baz
+----------------------------------------------------------------------
+
+fields formatted to fit within 60 characters:
+----------------------------------------------------------------------
+Field lists give a simple two-column layout:
+
+key The whitespace following the key is
+ significant for the wrapping of this text.
+another key More text. The indentation on the following
+ lines is not significant.
+----------------------------------------------------------------------
+
+fields formatted to fit within 30 characters:
+----------------------------------------------------------------------
+Field lists give a simple two-
+column layout:
+
+key The whitespace
+ following the
+ key is
+ significant for
+ the wrapping of
+ this text.
+another key More text. The
+ indentation on
+ the following
+ lines is not
+ significant.
+----------------------------------------------------------------------
+
--- a/tests/test-mq Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq Mon Oct 05 22:17:39 2009 +0200
@@ -107,9 +107,18 @@
hg qpop
checkundo qpop
-echo % qpush
+echo % qpush with dump of tag cache
+# Dump the tag cache to ensure that it has exactly one head after qpush.
+rm -f .hg/tags.cache
+hg tags > /dev/null
+echo ".hg/tags.cache (pre qpush):"
+sed 's/ [0-9a-f]*//' .hg/tags.cache
hg qpush
+hg tags > /dev/null
+echo ".hg/tags.cache (post qpush):"
+sed 's/ [0-9a-f]*//' .hg/tags.cache
+
checkundo qpush
cd ..
@@ -146,18 +155,13 @@
echo % qtop
hg qtop
-echo % qprev
-hg qprev
-
-echo % qnext
-hg qnext
+echo % prev
+hg qapp -1
-echo % pop, qnext, qprev, qapplied
+echo % next
+hg qunapp -1
+
hg qpop
-hg qnext
-hg qprev
-hg qapplied
-
echo % commit should fail
hg commit
@@ -188,6 +192,42 @@
hg qpop test2.patch-2
hg qpush test1b.patch+1
+echo % pop, qapplied, qunapplied
+hg qseries -v
+echo % qapplied -1 test.patch
+hg qapplied -1 test.patch
+echo % qapplied -1 test1b.patch
+hg qapplied -1 test1b.patch
+echo % qapplied -1 test2.patch
+hg qapplied -1 test2.patch
+echo % qapplied -1
+hg qapplied -1
+echo % qapplied
+hg qapplied
+echo % qapplied test1b.patch
+hg qapplied test1b.patch
+echo % qunapplied -1
+hg qunapplied -1
+echo % qunapplied
+hg qunapplied
+echo % popping
+hg qpop
+echo % qunapplied -1
+hg qunapplied -1
+echo % qunapplied
+hg qunapplied
+echo % qunapplied test2.patch
+hg qunapplied test2.patch
+echo % qunapplied -1 test2.patch
+hg qunapplied -1 test2.patch
+echo % popping -a
+hg qpop -a
+echo % qapplied
+hg qapplied
+echo % qapplied -1
+hg qapplied -1
+hg qpush
+
echo % push should succeed
hg qpop -a
hg push ../../k
--- a/tests/test-mq-caches.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-caches.out Mon Oct 05 22:17:39 2009 +0200
@@ -5,6 +5,7 @@
No branch cache
# some regular revisions
+popping p1
patch queue now empty
tip: 1
3f910abad313ff802d3a23a7529433872df9b3ae 1
@@ -43,6 +44,9 @@
qbase: 1
# detect an invalid cache
+popping p2
+popping p1
+popping p0
patch queue now empty
applying p0
applying p1
--- a/tests/test-mq-eol.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-eol.out Mon Oct 05 22:17:39 2009 +0200
@@ -9,12 +9,14 @@
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh eol.diff
+popping eol.diff
patch queue now empty
% invalid eol
applying eol.diff
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh eol.diff
+popping eol.diff
patch queue now empty
% force LF
applying eol.diff
@@ -42,6 +44,7 @@
c<CR><LF>
d<CR><LF>
z
+popping eol.diff
patch queue now empty
% push again forcing LF and compare revisions
applying eol.diff
@@ -51,6 +54,7 @@
c<CR><LF>
d<CR><LF>
z
+popping eol.diff
patch queue now empty
% push again without LF and compare revisions
applying eol.diff
@@ -60,4 +64,5 @@
c<CR><LF>
d<CR><LF>
z
+popping eol.diff
patch queue now empty
--- a/tests/test-mq-guards.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-guards.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,4 +1,7 @@
adding x
+popping c.patch
+popping b.patch
+popping a.patch
patch queue now empty
% should fail
abort: no patch named does-not-exist.patch
@@ -9,6 +12,7 @@
% should guard a.patch
% should print +a
a.patch: +a
+popping a.patch
patch queue now empty
% should fail
cannot push 'a.patch' - guarded by ['+a']
@@ -16,6 +20,7 @@
% should push b.patch
applying b.patch
now at: b.patch
+popping b.patch
patch queue now empty
% test selection of an empty guard
abort: guard cannot be an empty string
@@ -34,6 +39,9 @@
% should push c.patch
applying c.patch
now at: c.patch
+popping c.patch
+popping b.patch
+popping a.patch
patch queue now empty
guards deactivated
number of unguarded, unapplied patches has changed from 3 to 2
@@ -41,6 +49,8 @@
applying b.patch
applying c.patch
now at: c.patch
+popping c.patch
+popping b.patch
patch queue now empty
number of unguarded, unapplied patches has changed from 1 to 2
% should push a.patch, not b.patch
@@ -48,6 +58,8 @@
now at: a.patch
applying c.patch
now at: c.patch
+popping c.patch
+popping a.patch
patch queue now empty
% should push b.patch
applying b.patch
@@ -55,6 +67,8 @@
applying c.patch
now at: c.patch
c.patch
+popping c.patch
+popping b.patch
patch queue now empty
number of unguarded, unapplied patches has changed from 2 to 3
% should push a.patch, b.patch
@@ -62,6 +76,8 @@
now at: a.patch
applying b.patch
now at: b.patch
+popping b.patch
+popping a.patch
patch queue now empty
number of unguarded, unapplied patches has changed from 3 to 2
% list patches and guards
@@ -83,6 +99,8 @@
now at: c.patch
guards deactivated
popping guarded patches
+popping c.patch
+popping b.patch
patch queue now empty
reapplying unguarded patches
applying c.patch
@@ -100,6 +118,7 @@
new.patch: +1 +2 -3
b.patch: +2
c.patch: unguarded
+popping d.patch
now at: c.patch
% should show new.patch and b.patch as Guarded, c.patch as Applied
% and d.patch as Unapplied
@@ -112,6 +131,7 @@
1 G b.patch
2 A c.patch
3 G d.patch
+popping c.patch
patch queue now empty
new.patch: +1 +2 -3
b.patch: +2
--- a/tests/test-mq-header-date.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-header-date.out Mon Oct 05 22:17:39 2009 +0200
@@ -35,6 +35,10 @@
1: [mq]: 2.patch - test
0: [mq]: 1.patch - test
==== qref -d
+# HG changeset patch
+# Date 5 0
+
+
diff -r ... 2
--- /dev/null
+++ b/2
@@ -42,6 +46,7 @@
+2
1: [mq]: 2.patch - test
0: [mq]: 1.patch - test
+popping 2.patch
now at: 1.patch
==== qnew -d -m
# HG changeset patch
@@ -117,6 +122,9 @@
1: Three (again) - test
0: [mq]: 1.patch - test
==== qref -d
+# HG changeset patch
+# Date 9 0
+
Four
diff -r ... 4
@@ -127,8 +135,10 @@
2: Four - test
1: Three (again) - test
0: [mq]: 1.patch - test
+popping 4.patch
now at: 3.patch
==== qnew with HG header
+popping 5.patch
now at: 3.patch
# HG changeset patch
# Date 10 0
@@ -174,6 +184,7 @@
1: Three (again) - test
0: [mq]: 1.patch - test
==== qref -d
+Date: 12 0
From: jane
diff -r ... 6
@@ -185,6 +196,7 @@
2: [mq]: 5.patch - test
1: Three (again) - test
0: [mq]: 1.patch - test
+popping 6.patch
now at: 5.patch
==== qnew -d
adding 7
@@ -227,7 +239,9 @@
1: Three (again) - test
0: [mq]: 1.patch - test
==== qref -u -d
-From: john
+# HG changeset patch
+# Date 14 0
+# User john
diff -r ... 8
@@ -240,6 +254,7 @@
2: [mq]: 5.patch - test
1: Three (again) - test
0: [mq]: 1.patch - test
+popping 8.patch
now at: 7.patch
==== qnew -m
adding 9
@@ -256,7 +271,9 @@
1: Three (again) - test
0: [mq]: 1.patch - test
==== qref -u -d
-From: john
+# HG changeset patch
+# Date 15 0
+# User john
Nine
@@ -270,8 +287,13 @@
2: [mq]: 5.patch - test
1: Three (again) - test
0: [mq]: 1.patch - test
+popping 9.patch
now at: 7.patch
==== qpop -a / qpush -a
+popping 7.patch
+popping 5.patch
+popping 3.patch
+popping 1.patch
patch queue now empty
applying 1.patch
applying 3.patch
--- a/tests/test-mq-header-from.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-header-from.out Mon Oct 05 22:17:39 2009 +0200
@@ -32,7 +32,8 @@
1: [mq]: 2.patch - test
0: [mq]: 1.patch - mary
==== qref -u
-From: jane
+# HG changeset patch
+# User jane
diff -r ... 2
@@ -117,7 +118,8 @@
1: [mq]: 2.patch - jane
0: [mq]: 1.patch - mary
==== qref -u
-From: jane
+# HG changeset patch
+# User jane
Four
@@ -131,6 +133,7 @@
1: [mq]: 2.patch - jane
0: [mq]: 1.patch - mary
==== qnew with HG header
+popping 5.patch
now at: 4.patch
now at: 5.patch
# HG changeset patch
@@ -184,6 +187,11 @@
1: [mq]: 2.patch - jane
0: [mq]: 1.patch - mary
==== qpop -a / qpush -a
+popping 5.patch
+popping 4.patch
+popping 3.patch
+popping 2.patch
+popping 1.patch
patch queue now empty
applying 1.patch
applying 2.patch
--- a/tests/test-mq-merge.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-merge.out Mon Oct 05 22:17:39 2009 +0200
@@ -10,6 +10,8 @@
applying rm_a
now at: rm_a
b
+popping rm_a
+popping .hg.patches.merge.marker
patch queue now empty
% init t2
--- a/tests/test-mq-missingfiles.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-missingfiles.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,4 +1,5 @@
adding b
+popping changeb
patch queue now empty
% push patch with missing target
applying changeb
@@ -26,6 +27,7 @@
+c
+c
adding b
+popping changeb
patch queue now empty
% push git patch with missing target
applying changeb
@@ -48,6 +50,7 @@
% test push creating directory during git copy or rename
adding a
+popping patch
patch queue now empty
applying patch
now at: patch
--- a/tests/test-mq-pull-from-bundle.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-pull-from-bundle.out Mon Oct 05 22:17:39 2009 +0200
@@ -13,6 +13,7 @@
1: main: one updated.
====== Setup queue
adding two
+popping two.patch
patch queue now empty
====== Bundle queue
1 changesets found
--- a/tests/test-mq-qdelete.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-qdelete.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,6 +1,7 @@
adding base
abort: qdelete requires at least one revision or patch name
abort: cannot delete applied patch c
+popping c
now at: b
a
b
@@ -8,6 +9,7 @@
b
series
status
+popping b
now at: a
a
b
@@ -30,6 +32,7 @@
no patches applied
abort: revision 0 is not managed
abort: cannot delete revision 2 above applied patches
+popping c
now at: b
abort: unknown revision 'c'!
applying c
--- a/tests/test-mq-qdiff.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-qdiff.out Mon Oct 05 22:17:39 2009 +0200
@@ -26,6 +26,7 @@
+patched
% revert
% qpop
+popping mqbase
patch queue now empty
% qdelete mqbase
% commit 2
--- a/tests/test-mq-qfold.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-qfold.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,6 +1,8 @@
% init
adding a
% fold in the middle of the queue
+popping p3
+popping p2
now at: p1
--- a/a
+++ b/a
--- a/tests/test-mq-qgoto.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-qgoto.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,17 +1,24 @@
adding a
+popping c.patch
+popping b.patch
now at: a.patch
applying b.patch
applying c.patch
now at: c.patch
+popping c.patch
now at: b.patch
% Using index
+popping b.patch
now at: a.patch
applying b.patch
applying c.patch
now at: c.patch
% No warnings when using index
+popping bug141421
+popping bug314159
+popping c.patch
now at: b.patch
applying c.patch
applying bug314159
--- a/tests/test-mq-qimport.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-qimport.out Mon Oct 05 22:17:39 2009 +0200
@@ -19,6 +19,7 @@
More text in commit message.
+popping email
patch queue now empty
% import URL
adding url.diff to series file
@@ -28,12 +29,14 @@
applying url.diff
now at: url.diff
foo
+popping url.diff
patch queue now empty
% qimport -f
adding url.diff to series file
applying url.diff
now at: url.diff
foo2
+popping url.diff
patch queue now empty
% build diff with CRLF
adding b
--- a/tests/test-mq-qnew.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-qnew.out Mon Oct 05 22:17:39 2009 +0200
@@ -20,6 +20,9 @@
abort: patch "first.patch" already exists
abort: patch "first.patch" already exists
% qnew -f from a subdirectory
+popping first.patch
+popping mtest.patch
+popping test.patch
patch queue now empty
adding d/b
M d/b
--- a/tests/test-mq-qpush-fail.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-qpush-fail.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,6 +1,9 @@
adding foo
% test qpush on empty series
no patches in series
+popping bad-patch
+popping patch2
+popping patch1
patch queue now empty
applying patch1
applying patch2
--- a/tests/test-mq-symlinks.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq-symlinks.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,9 +1,11 @@
a -> a not a symlink
a -> b
+popping symlink.patch
now at: base.patch
applying symlink.patch
now at: symlink.patch
a -> b
+popping removesl.patch
now at: symlink.patch
applying removesl.patch
now at: removesl.patch
--- a/tests/test-mq.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-mq.out Mon Oct 05 22:17:39 2009 +0200
@@ -2,25 +2,24 @@
mq extension - manage a stack of patches
This extension lets you work with a stack of patches in a Mercurial
-repository. It manages two stacks of patches - all known patches, and
-applied patches (subset of known patches).
+repository. It manages two stacks of patches - all known patches, and applied
+patches (subset of known patches).
-Known patches are represented as patch files in the .hg/patches
-directory. Applied patches are both patch files and changesets.
+Known patches are represented as patch files in the .hg/patches directory.
+Applied patches are both patch files and changesets.
Common tasks (use "hg help command" for more details):
-prepare repository to work with patches qinit
-create new patch qnew
-import existing patch qimport
+ prepare repository to work with patches qinit
+ create new patch qnew
+ import existing patch qimport
-print patch series qseries
-print applied patches qapplied
-print name of top applied patch qtop
+ print patch series qseries
+ print applied patches qapplied
-add known patch to applied stack qpush
-remove patch from applied stack qpop
-refresh contents of top applied patch qrefresh
+ add known patch to applied stack qpush
+ remove patch from applied stack qpop
+ refresh contents of top applied patch qrefresh
list of commands:
@@ -108,16 +107,26 @@
a
+a
% qpop
+popping test.patch
patch queue now empty
-% qpush
+% qpush with dump of tag cache
+.hg/tags.cache (pre qpush):
+1
+
applying test.patch
now at: test.patch
+.hg/tags.cache (post qpush):
+2
+
% pop/push outside repo
+popping test.patch
patch queue now empty
applying test.patch
now at: test.patch
% qrefresh in subdir
% pop/push -a in subdir
+popping test2.patch
+popping test.patch
patch queue now empty
applying test.patch
applying test2.patch
@@ -125,6 +134,7 @@
% qseries
test.patch
test2.patch
+popping test2.patch
now at: test.patch
0 A test.patch: foo bar
1 U test2.patch:
@@ -135,15 +145,12 @@
test2.patch
% qtop
test2.patch
-% qprev
+% prev
test.patch
-% qnext
+% next
all patches applied
-% pop, qnext, qprev, qapplied
+popping test2.patch
now at: test.patch
-test2.patch
-only one patch applied
-test.patch
% commit should fail
abort: cannot commit over an applied mq patch
% push should fail
@@ -156,17 +163,63 @@
% qpush/qpop with index
applying test2.patch
now at: test2.patch
+popping test2.patch
+popping test1b.patch
now at: test.patch
applying test1b.patch
now at: test1b.patch
applying test2.patch
now at: test2.patch
+popping test2.patch
now at: test1b.patch
+popping test1b.patch
now at: test.patch
applying test1b.patch
applying test2.patch
now at: test2.patch
+% pop, qapplied, qunapplied
+0 A test.patch
+1 A test1b.patch
+2 A test2.patch
+% qapplied -1 test.patch
+only one patch applied
+% qapplied -1 test1b.patch
+test.patch
+% qapplied -1 test2.patch
+test1b.patch
+% qapplied -1
+test1b.patch
+% qapplied
+test.patch
+test1b.patch
+test2.patch
+% qapplied test1b.patch
+test.patch
+test1b.patch
+% qunapplied -1
+all patches applied
+% qunapplied
+% popping
+popping test2.patch
+now at: test1b.patch
+% qunapplied -1
+test2.patch
+% qunapplied
+test2.patch
+% qunapplied test2.patch
+% qunapplied -1 test2.patch
+all patches applied
+% popping -a
+popping test1b.patch
+popping test.patch
+patch queue now empty
+% qapplied
+% qapplied -1
+no patches applied
+applying test.patch
+now at: test.patch
% push should succeed
+popping test.patch
patch queue now empty
pushing to ../../k
searching for changes
@@ -180,6 +233,9 @@
applying test2.patch
now at: test2.patch
% pops all patches and succeeds
+popping test2.patch
+popping test1b.patch
+popping test.patch
patch queue now empty
qpop -a succeeds
% does nothing and succeeds
@@ -193,6 +249,7 @@
now at: test.patch
qpush succeeds
% pops a patch and succeeds
+popping test.patch
patch queue now empty
qpop succeeds
% pushes up to test1b.patch and succeeds
@@ -213,6 +270,7 @@
abort: patch test2.patch is not applied
qpop test2.patch fails
% pops up to test.patch and succeeds
+popping test1b.patch
now at: test.patch
qpop test.patch succeeds
% pushes all patches and succeeds
@@ -269,6 +327,8 @@
+f
M a
% qpush failure
+popping bar
+popping foo
patch queue now empty
applying foo
applying bar
@@ -284,6 +344,7 @@
1 qbase foo
2 qtip bar tip
% bad node in status
+popping bar
now at: foo
changeset: 0:cb9a9f314b8b
mq status file refers to unknown node
@@ -308,6 +369,7 @@
diff --git a/new b/copy
copy from new
copy to copy
+popping copy
now at: new
applying copy
now at: copy
@@ -320,6 +382,7 @@
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
created new head
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+popping bar
adding branch
adding changesets
adding manifests
@@ -354,6 +417,7 @@
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+popping bar
adding branch
adding changesets
adding manifests
@@ -386,6 +450,7 @@
% refresh omitting an added file
C newfile
A newfile
+popping baz
now at: bar
% create a git patch
diff --git a/alexander b/alexander
@@ -393,6 +458,7 @@
8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
diff --git a/bucephalus b/bucephalus
% check binary patches can be popped and pushed
+popping addbucephalus
now at: addalexander
applying addbucephalus
now at: addbucephalus
@@ -461,6 +527,7 @@
rev 0: add foo
patch repo:
rev 0: checkpoint
+popping patch1
patch queue now empty
main repo:
rev 0: add foo
@@ -475,12 +542,14 @@
rev 0: checkpoint
% test applying on an empty file (issue 1033)
adding a
+popping changea
patch queue now empty
applying changea
now at: changea
% test qpush with --force, issue1087
adding bye.txt
adding hello.txt
+popping empty
patch queue now empty
% qpush should fail, local changes
abort: local changes found, refresh first
@@ -510,6 +579,7 @@
summary: imported patch empty
+popping empty
patch queue now empty
% qpush should fail, local changes
abort: local changes found, refresh first
@@ -539,4 +609,5 @@
% test popping revisions not in working dir ancestry
0 A empty
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+popping empty
patch queue now empty
--- a/tests/test-notify.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-notify.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,61 +1,61 @@
notify extension - hooks for sending email notifications at commit/push time
-Subscriptions can be managed through hgrc. Default mode is to print
+Subscriptions can be managed through a hgrc file. Default mode is to print
messages to stdout, for testing and configuring.
-To use, configure notify extension and enable in hgrc like this:
+To use, configure the notify extension and enable it in hgrc like this:
- [extensions]
- hgext.notify =
+ [extensions]
+ hgext.notify =
- [hooks]
- # one email for each incoming changeset
- incoming.notify = python:hgext.notify.hook
- # batch emails when many changesets incoming at one time
- changegroup.notify = python:hgext.notify.hook
+ [hooks]
+ # one email for each incoming changeset
+ incoming.notify = python:hgext.notify.hook
+ # batch emails when many changesets incoming at one time
+ changegroup.notify = python:hgext.notify.hook
- [notify]
- # config items go in here
+ [notify]
+ # config items go here
- config items:
+Required configuration items:
- REQUIRED:
- config = /path/to/file # file containing subscriptions
+ config = /path/to/file # file containing subscriptions
+
+Optional configuration items:
- OPTIONAL:
- test = True # print messages to stdout for testing
- strip = 3 # number of slashes to strip for url paths
- domain = example.com # domain to use if committer missing domain
- style = ... # style file to use when formatting email
- template = ... # template to use when formatting email
- incoming = ... # template to use when run as incoming hook
- changegroup = ... # template when run as changegroup hook
- maxdiff = 300 # max lines of diffs to include (0=none, -1=all)
- maxsubject = 67 # truncate subject line longer than this
- diffstat = True # add a diffstat before the diff content
- sources = serve # notify if source of incoming changes in this list
- # (serve == ssh or http, push, pull, bundle)
- [email]
- from = user@host.com # email address to send as if none given
- [web]
- baseurl = http://hgserver/... # root of hg web site for browsing commits
+ test = True # print messages to stdout for testing
+ strip = 3 # number of slashes to strip for url paths
+ domain = example.com # domain to use if committer missing domain
+ style = ... # style file to use when formatting email
+ template = ... # template to use when formatting email
+ incoming = ... # template to use when run as incoming hook
+ changegroup = ... # template when run as changegroup hook
+ maxdiff = 300 # max lines of diffs to include (0=none, -1=all)
+ maxsubject = 67 # truncate subject line longer than this
+ diffstat = True # add a diffstat before the diff content
+ sources = serve # notify if source of incoming changes in this list
+ # (serve == ssh or http, push, pull, bundle)
+ merge = False # send notification for merges (default True)
+ [email]
+ from = user@host.com # email address to send as if none given
+ [web]
+ baseurl = http://hgserver/... # root of hg web site for browsing commits
- notify config file has same format as regular hgrc. it has two
- sections so you can express subscriptions in whatever way is handier
- for you.
+The notify config file has same format as a regular hgrc file. It has two
+sections so you can express subscriptions in whatever way is handier for you.
- [usersubs]
- # key is subscriber email, value is ","-separated list of glob patterns
- user@host = pattern
+ [usersubs]
+ # key is subscriber email, value is ","-separated list of glob patterns
+ user@host = pattern
- [reposubs]
- # key is glob pattern, value is ","-separated list of subscriber emails
- pattern = user@host
+ [reposubs]
+ # key is glob pattern, value is ","-separated list of subscriber emails
+ pattern = user@host
- glob patterns are matched against path to repository root.
+Glob patterns are matched against path to repository root.
- if you like, you can put notify config file in repository that users
- can push changes to, they can manage their own subscriptions.
+If you like, you can put notify config file in repository that users can push
+changes to, they can manage their own subscriptions.
no commands defined
% commit
--- a/tests/test-patchbomb Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-patchbomb Mon Oct 05 22:17:39 2009 +0200
@@ -151,3 +151,19 @@
hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
-r 0:1 | fixheaders
+
+echo "% test single flag for single patch"
+hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
+ -r 2 | fixheaders
+
+echo "% test single flag for multiple patches"
+hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
+ -r 0:1 | fixheaders
+
+echo "% test mutiple flags for single patch"
+hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
+ -c bar -s test -r 2 | fixheaders
+
+echo "% test multiple flags for multiple patches"
+hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
+ -c bar -s test -r 0:1 | fixheaders
--- a/tests/test-patchbomb.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-patchbomb.out Mon Oct 05 22:17:39 2009 +0200
@@ -10,7 +10,7 @@
X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
Message-Id: <8580ff50825a50c8f716.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -42,7 +42,7 @@
Subject: [PATCH 0 of 2] test
Message-Id: <patchbomb.120@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:02:00 -0000
+Date: Thu, 01 Jan 1970 00:02:00 +0000
From: quux
To: foo
Cc: bar
@@ -58,7 +58,7 @@
In-Reply-To: <patchbomb.120@
References: <patchbomb.120@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:02:01 -0000
+Date: Thu, 01 Jan 1970 00:02:01 +0000
From: quux
To: foo
Cc: bar
@@ -86,7 +86,7 @@
In-Reply-To: <patchbomb.120@
References: <patchbomb.120@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:02:02 -0000
+Date: Thu, 01 Jan 1970 00:02:02 +0000
From: quux
To: foo
Cc: bar
@@ -124,7 +124,7 @@
Subject: test
Message-Id: <patchbomb.180@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:03:00 -0000
+Date: Thu, 01 Jan 1970 00:03:00 +0000
From: quux
To: foo
Cc: bar
@@ -157,13 +157,13 @@
adding utf
% no mime encoding for email --test
% md5sum of 8-bit output
-1b28ee86c937a1f9e2bf6fc5eabd00a5 mailtest
+e726c29b3008e77994c7572563e57c34 mailtest
% mime encoded mbox (base64)
This patch series consists of 1 patches.
Writing [PATCH] charset=utf-8; content-transfer-encoding: base64 ...
-From quux Thu Jan 01 00:04:01 1970
+From quux Thu Jan 1 00:04:01 1970
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
@@ -171,7 +171,7 @@
X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
Message-Id: <c3c9e37db9f4fe4882cd.240@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:04:00 -0000
+Date: Thu, 01 Jan 1970 00:04:00 +0000
From: quux
To: foo
Cc: bar
@@ -192,13 +192,13 @@
adding qp
% no mime encoding for email --test
% md5sum of qp output
-7b5f11d50349b32eff4a9b2daaa82e7f mailtest
+0402c7d033e04044e423bb04816f9dae mailtest
% mime encoded mbox (quoted-printable)
This patch series consists of 1 patches.
Writing [PATCH] charset=utf-8; content-transfer-encoding: quoted-printable ...
-From quux Thu Jan 01 00:04:01 1970
+From quux Thu Jan 1 00:04:01 1970
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
@@ -206,7 +206,7 @@
X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
Message-Id: <c655633f8c87700bb38c.240@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:04:00 -0000
+Date: Thu, 01 Jan 1970 00:04:00 +0000
From: quux
To: foo
Cc: bar
@@ -249,7 +249,7 @@
Writing [PATCH] charset=us-ascii; content-transfer-encoding: 8bit ...
% md5sum of 8-bit output
-e61684fc0bcccba4204714be37951893 mboxfix
+0920ef519c29b6a1742047ad9f203fc5 mboxfix
% test diffstat for single patch
This patch series consists of 1 patches.
@@ -267,7 +267,7 @@
X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
Message-Id: <ff2c9fa2018b15fa74b3.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -319,7 +319,7 @@
Subject: [PATCH 0 of 2] test
Message-Id: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -339,7 +339,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:01 -0000
+Date: Thu, 01 Jan 1970 00:01:01 +0000
From: quux
To: foo
Cc: bar
@@ -371,7 +371,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:02 -0000
+Date: Thu, 01 Jan 1970 00:01:02 +0000
From: quux
To: foo
Cc: bar
@@ -404,7 +404,7 @@
X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
Message-Id: <ff2c9fa2018b15fa74b3.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -440,7 +440,7 @@
X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
Message-Id: <c655633f8c87700bb38c.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -495,7 +495,7 @@
Subject: [PATCH 0 of 3] test
Message-Id: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -510,7 +510,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:01 -0000
+Date: Thu, 01 Jan 1970 00:01:01 +0000
From: quux
To: foo
Cc: bar
@@ -544,7 +544,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:02 -0000
+Date: Thu, 01 Jan 1970 00:01:02 +0000
From: quux
To: foo
Cc: bar
@@ -579,7 +579,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:03 -0000
+Date: Thu, 01 Jan 1970 00:01:03 +0000
From: quux
To: foo
Cc: bar
@@ -631,7 +631,7 @@
X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
Message-Id: <ff2c9fa2018b15fa74b3.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -676,7 +676,7 @@
X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
Message-Id: <c655633f8c87700bb38c.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -740,7 +740,7 @@
Subject: [PATCH 0 of 3] test
Message-Id: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -755,7 +755,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:01 -0000
+Date: Thu, 01 Jan 1970 00:01:01 +0000
From: quux
To: foo
Cc: bar
@@ -798,7 +798,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:02 -0000
+Date: Thu, 01 Jan 1970 00:01:02 +0000
From: quux
To: foo
Cc: bar
@@ -842,7 +842,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:03 -0000
+Date: Thu, 01 Jan 1970 00:01:03 +0000
From: quux
To: foo
Cc: bar
@@ -906,7 +906,7 @@
Subject: [PATCH 0 of 1] test
Message-Id: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -922,7 +922,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:01 -0000
+Date: Thu, 01 Jan 1970 00:01:01 +0000
From: quux
To: foo
Cc: bar
@@ -954,7 +954,7 @@
Subject: [PATCH 0 of 2] test
Message-Id: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -970,7 +970,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:01 -0000
+Date: Thu, 01 Jan 1970 00:01:01 +0000
From: quux
To: foo
Cc: bar
@@ -998,7 +998,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:02 -0000
+Date: Thu, 01 Jan 1970 00:01:02 +0000
From: quux
To: foo
Cc: bar
@@ -1028,7 +1028,7 @@
X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
Message-Id: <ff2c9fa2018b15fa74b3.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -1067,7 +1067,7 @@
Subject: [PATCH 0 of 2] test
Message-Id: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -1082,7 +1082,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:01 -0000
+Date: Thu, 01 Jan 1970 00:01:01 +0000
From: quux
To: foo
Cc: bar
@@ -1116,7 +1116,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:02 -0000
+Date: Thu, 01 Jan 1970 00:01:02 +0000
From: quux
To: foo
Cc: bar
@@ -1155,7 +1155,7 @@
In-Reply-To: <baz>
References: <baz>
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -1192,7 +1192,7 @@
In-Reply-To: <baz>
References: <baz>
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:00 -0000
+Date: Thu, 01 Jan 1970 00:01:00 +0000
From: quux
To: foo
Cc: bar
@@ -1208,7 +1208,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:01 -0000
+Date: Thu, 01 Jan 1970 00:01:01 +0000
From: quux
To: foo
Cc: bar
@@ -1236,7 +1236,7 @@
In-Reply-To: <patchbomb.60@
References: <patchbomb.60@
User-Agent: Mercurial-patchbomb
-Date: Thu, 01 Jan 1970 00:01:02 -0000
+Date: Thu, 01 Jan 1970 00:01:02 +0000
From: quux
To: foo
Cc: bar
@@ -1254,3 +1254,215 @@
@@ -0,0 +1,1 @@
+b
+% test single flag for single patch
+This patch series consists of 1 patches.
+
+
+Displaying [PATCH fooFlag] test ...
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [PATCH fooFlag] test
+X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
+Message-Id: <ff2c9fa2018b15fa74b3.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:00 +0000
+From: quux
+To: foo
+Cc: bar
+
+# HG changeset patch
+# User test
+# Date 3 0
+# Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
+# Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
+c
+
+diff -r 97d72e5f12c7 -r ff2c9fa2018b c
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/c Thu Jan 01 00:00:03 1970 +0000
+@@ -0,0 +1,1 @@
++c
+
+% test single flag for multiple patches
+This patch series consists of 2 patches.
+
+
+Write the introductory message for the patch series.
+
+
+Displaying [PATCH 0 of 2 fooFlag] test ...
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [PATCH 0 of 2 fooFlag] test
+Message-Id: <patchbomb.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:00 +0000
+From: quux
+To: foo
+Cc: bar
+
+
+Displaying [PATCH 1 of 2 fooFlag] a ...
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [PATCH 1 of 2 fooFlag] a
+X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
+Message-Id: <8580ff50825a50c8f716.61@
+In-Reply-To: <patchbomb.60@
+References: <patchbomb.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:01 +0000
+From: quux
+To: foo
+Cc: bar
+
+# HG changeset patch
+# User test
+# Date 1 0
+# Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
+# Parent 0000000000000000000000000000000000000000
+a
+
+diff -r 000000000000 -r 8580ff50825a a
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/a Thu Jan 01 00:00:01 1970 +0000
+@@ -0,0 +1,1 @@
++a
+
+Displaying [PATCH 2 of 2 fooFlag] b ...
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [PATCH 2 of 2 fooFlag] b
+X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
+Message-Id: <97d72e5f12c7e84f8506.62@
+In-Reply-To: <patchbomb.60@
+References: <patchbomb.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:02 +0000
+From: quux
+To: foo
+Cc: bar
+
+# HG changeset patch
+# User test
+# Date 2 0
+# Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
+# Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
+b
+
+diff -r 8580ff50825a -r 97d72e5f12c7 b
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/b Thu Jan 01 00:00:02 1970 +0000
+@@ -0,0 +1,1 @@
++b
+
+% test mutiple flags for single patch
+This patch series consists of 1 patches.
+
+
+Displaying [PATCH fooFlag barFlag] test ...
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [PATCH fooFlag barFlag] test
+X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
+Message-Id: <ff2c9fa2018b15fa74b3.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:00 +0000
+From: quux
+To: foo
+Cc: bar
+
+# HG changeset patch
+# User test
+# Date 3 0
+# Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
+# Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
+c
+
+diff -r 97d72e5f12c7 -r ff2c9fa2018b c
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/c Thu Jan 01 00:00:03 1970 +0000
+@@ -0,0 +1,1 @@
++c
+
+% test multiple flags for multiple patches
+This patch series consists of 2 patches.
+
+
+Write the introductory message for the patch series.
+
+
+Displaying [PATCH 0 of 2 fooFlag barFlag] test ...
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [PATCH 0 of 2 fooFlag barFlag] test
+Message-Id: <patchbomb.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:00 +0000
+From: quux
+To: foo
+Cc: bar
+
+
+Displaying [PATCH 1 of 2 fooFlag barFlag] a ...
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [PATCH 1 of 2 fooFlag barFlag] a
+X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
+Message-Id: <8580ff50825a50c8f716.61@
+In-Reply-To: <patchbomb.60@
+References: <patchbomb.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:01 +0000
+From: quux
+To: foo
+Cc: bar
+
+# HG changeset patch
+# User test
+# Date 1 0
+# Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
+# Parent 0000000000000000000000000000000000000000
+a
+
+diff -r 000000000000 -r 8580ff50825a a
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/a Thu Jan 01 00:00:01 1970 +0000
+@@ -0,0 +1,1 @@
++a
+
+Displaying [PATCH 2 of 2 fooFlag barFlag] b ...
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [PATCH 2 of 2 fooFlag barFlag] b
+X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
+Message-Id: <97d72e5f12c7e84f8506.62@
+In-Reply-To: <patchbomb.60@
+References: <patchbomb.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:02 +0000
+From: quux
+To: foo
+Cc: bar
+
+# HG changeset patch
+# User test
+# Date 2 0
+# Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
+# Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
+b
+
+diff -r 8580ff50825a -r 97d72e5f12c7 b
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/b Thu Jan 01 00:00:02 1970 +0000
+@@ -0,0 +1,1 @@
++b
+
--- a/tests/test-qrecord.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-qrecord.out Mon Oct 05 22:17:39 2009 +0200
@@ -28,8 +28,7 @@
interactively record a new patch
- See 'hg help qnew' & 'hg help record' for more information and
- usage.
+ See 'hg help qnew' & 'hg help record' for more information and usage.
options:
--- a/tests/test-rebase-mq.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-rebase-mq.out Mon Oct 05 22:17:39 2009 +0200
@@ -79,6 +79,8 @@
+mq1r1mq2
% Adding one git-style patch and one normal
+popping f2.patch
+popping f.patch
patch queue now empty
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% Git patch
--- a/tests/test-rebase-parameters.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-rebase-parameters.out Mon Oct 05 22:17:39 2009 +0200
@@ -6,9 +6,9 @@
move changeset (and descendants) to a different branch
- Rebase uses repeated merging to graft changesets from one part of
- history onto another. This can be useful for linearizing local
- changes relative to a master development tree.
+ Rebase uses repeated merging to graft changesets from one part of history
+ onto another. This can be useful for linearizing local changes relative to
+ a master development tree.
If a rebase is interrupted to manually resolve a merge, it can be
continued with --continue/-c or aborted with --abort/-a.
@@ -34,9 +34,9 @@
move changeset (and descendants) to a different branch
- Rebase uses repeated merging to graft changesets from one part of
- history onto another. This can be useful for linearizing local
- changes relative to a master development tree.
+ Rebase uses repeated merging to graft changesets from one part of history
+ onto another. This can be useful for linearizing local changes relative to
+ a master development tree.
If a rebase is interrupted to manually resolve a merge, it can be
continued with --continue/-c or aborted with --abort/-a.
@@ -62,9 +62,9 @@
move changeset (and descendants) to a different branch
- Rebase uses repeated merging to graft changesets from one part of
- history onto another. This can be useful for linearizing local
- changes relative to a master development tree.
+ Rebase uses repeated merging to graft changesets from one part of history
+ onto another. This can be useful for linearizing local changes relative to
+ a master development tree.
If a rebase is interrupted to manually resolve a merge, it can be
continued with --continue/-c or aborted with --abort/-a.
@@ -90,9 +90,9 @@
move changeset (and descendants) to a different branch
- Rebase uses repeated merging to graft changesets from one part of
- history onto another. This can be useful for linearizing local
- changes relative to a master development tree.
+ Rebase uses repeated merging to graft changesets from one part of history
+ onto another. This can be useful for linearizing local changes relative to
+ a master development tree.
If a rebase is interrupted to manually resolve a merge, it can be
continued with --continue/-c or aborted with --abort/-a.
--- a/tests/test-record.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-record.out Mon Oct 05 22:17:39 2009 +0200
@@ -3,27 +3,26 @@
interactively select changes to commit
- If a list of files is omitted, all changes reported by "hg status"
- will be candidates for recording.
+ If a list of files is omitted, all changes reported by "hg status" will be
+ candidates for recording.
See 'hg help dates' for a list of formats valid for -d/--date.
- You will be prompted for whether to record changes to each
- modified file, and for files with multiple changes, for each
- change to use. For each query, the following responses are
- possible:
+ You will be prompted for whether to record changes to each modified file,
+ and for files with multiple changes, for each change to use. For each
+ query, the following responses are possible:
- y - record this change
- n - skip this change
+ y - record this change
+ n - skip this change
- s - skip remaining changes to this file
- f - record remaining changes to this file
+ s - skip remaining changes to this file
+ f - record remaining changes to this file
- d - done, skip remaining changes and files
- a - record all changes to all remaining files
- q - quit, recording no changes
+ d - done, skip remaining changes and files
+ a - record all changes to all remaining files
+ q - quit, recording no changes
- ? - display help
+ ? - display help
options:
--- a/tests/test-resolve.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-resolve.out Mon Oct 05 22:17:39 2009 +0200
@@ -4,5 +4,5 @@
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% resolve -l, should be empty
--- a/tests/test-revlog-ancestry.py Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-revlog-ancestry.py Mon Oct 05 22:17:39 2009 +0200
@@ -10,7 +10,7 @@
repo.commit(text=text, date="%d 0" % time)
def addcommit(name, time):
- f = file(name, 'w')
+ f = open(name, 'w')
f.write('%s\n' % name)
f.close()
repo.add([name])
--- a/tests/test-subrepo.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-subrepo.out Mon Oct 05 22:17:39 2009 +0200
@@ -87,7 +87,7 @@
warning: conflicts during merge.
merging t failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should conflict
--- a/tests/test-tags Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-tags Mon Oct 05 22:17:39 2009 +0200
@@ -1,24 +1,54 @@
#!/bin/sh
+cacheexists() {
+ [ -f .hg/tags.cache ] && echo "tag cache exists" || echo "no tag cache"
+}
+
+# XXX need to test that the tag cache works when we strip an old head
+# and add a new one rooted off non-tip: i.e. node and rev of tip are the
+# same, but stuff has changed behind tip.
+
+echo "% setup"
mkdir t
cd t
hg init
+cacheexists
hg id
+cacheexists
echo a > a
hg add a
-hg commit -m "test" -d "1000000 0"
+hg commit -m "test"
hg co
hg identify
-T=`hg tip --debug | head -n 1 | cut -d : -f 3`
+cacheexists
+
+echo "% create local tag with long name"
+T=`hg identify --debug --id`
hg tag -l "This is a local tag with a really long name!"
hg tags
rm .hg/localtags
+
+echo "% create a tag behind hg's back"
echo "$T first" > .hgtags
cat .hgtags
hg add .hgtags
-hg commit -m "add tags" -d "1000000 0"
+hg commit -m "add tags"
hg tags
hg identify
+
+# repeat with cold tag cache
+echo "% identify with cold cache"
+rm -f .hg/tags.cache
+hg identify
+
+# and again, but now unable to write tag cache
+echo "% identify with unwritable cache"
+rm -f .hg/tags.cache
+chmod 555 .hg
+hg identify
+chmod 755 .hg
+
+echo "% create a branch"
echo bb > a
hg status
hg identify
@@ -28,89 +58,126 @@
hg status
echo 1 > b
hg add b
-hg commit -m "branch" -d "1000000 0"
+hg commit -m "branch"
hg id
+
+echo "% merge the two heads"
hg merge 1
hg id
hg status
-hg commit -m "merge" -d "1000000 0"
+hg commit -m "merge"
-# create fake head, make sure tag not visible afterwards
+echo "% create fake head, make sure tag not visible afterwards"
cp .hgtags tags
-hg tag -d "1000000 0" last
+hg tag last
hg rm .hgtags
-hg commit -m "remove" -d "1000000 0"
+hg commit -m "remove"
mv tags .hgtags
hg add .hgtags
-hg commit -m "readd" -d "1000000 0"
+hg commit -m "readd"
hg tags
-# invalid tags
+echo "% add invalid tags"
echo "spam" >> .hgtags
echo >> .hgtags
echo "foo bar" >> .hgtags
echo "$T invalid" | sed "s/..../a5a5/" >> .hg/localtags
-hg commit -m "tags" -d "1000000 0"
+echo "committing .hgtags:"
+cat .hgtags
+hg commit -m "tags"
-# report tag parse error on other head
+echo "% report tag parse error on other head"
hg up 3
echo 'x y' >> .hgtags
-hg commit -m "head" -d "1000000 0"
+hg commit -m "head"
hg tags
hg tip
-# test tag precedence rules
+echo "% test tag precedence rules"
cd ..
hg init t2
cd t2
echo foo > foo
hg add foo
-hg ci -m 'add foo' -d '1000000 0' # rev 0
-hg tag -d '1000000 0' bar # rev 1
+hg ci -m 'add foo' # rev 0
+hg tag bar # rev 1
echo >> foo
-hg ci -m 'change foo 1' -d '1000000 0' # rev 2
+hg ci -m 'change foo 1' # rev 2
hg up -C 1
-hg tag -r 1 -d '1000000 0' -f bar # rev 3
+hg tag -r 1 -f bar # rev 3
hg up -C 1
echo >> foo
-hg ci -m 'change foo 2' -d '1000000 0' # rev 4
+hg ci -m 'change foo 2' # rev 4
+hg tags
+hg tags # repeat in case of cache effects
+
+dumptags() {
+ rev=$1
+ echo "rev $rev: .hgtags:"
+ hg cat -r$rev .hgtags
+}
+
+echo "% detailed dump of tag info"
+echo "heads:"
+hg heads -q # expect 4, 3, 2
+dumptags 2
+dumptags 3
+dumptags 4
+echo ".hg/tags.cache:"
+[ -f .hg/tags.cache ] && cat .hg/tags.cache || echo "no such file"
+
+echo "% test tag removal"
+hg tag --remove bar # rev 5
+hg tip -vp
+hg tags
+hg tags # again, try to expose cache bugs
+
+echo '% remove nonexistent tag'
+hg tag --remove foobar
+hg tip
+
+echo "% rollback undoes tag operation"
+hg rollback # destroy rev 5 (restore bar)
+hg tags
hg tags
-# test tag removal
-hg tag --remove -d '1000000 0' bar
-hg tip
-hg tags
-
-echo '% remove nonexistent tag'
-hg tag --remove -d '1000000 0' foobar
-hg tip
-
-# test tag rank
+echo "% test tag rank"
cd ..
hg init t3
cd t3
echo foo > foo
hg add foo
-hg ci -m 'add foo' -d '1000000 0' # rev 0
-hg tag -d '1000000 0' -f bar # rev 1 bar -> 0
-hg tag -d '1000000 0' -f bar # rev 2 bar -> 1
-hg tag -d '1000000 0' -fr 0 bar # rev 3 bar -> 0
-hg tag -d '1000000 0' -fr 1 bar # rev 3 bar -> 1
-hg tag -d '1000000 0' -fr 0 bar # rev 4 bar -> 0
+hg ci -m 'add foo' # rev 0
+hg tag -f bar # rev 1 bar -> 0
+hg tag -f bar # rev 2 bar -> 1
+hg tag -fr 0 bar # rev 3 bar -> 0
+hg tag -fr 1 bar # rev 4 bar -> 1
+hg tag -fr 0 bar # rev 5 bar -> 0
hg tags
hg co 3
echo barbar > foo
-hg ci -m 'change foo' -d '1000000 0' # rev 0
+hg ci -m 'change foo' # rev 6
+hg tags
+
+echo "% don't allow moving tag without -f"
+hg tag -r 3 bar
hg tags
-hg tag -d '1000000 0' -r 3 bar # should complain
-hg tags
+echo "% strip 1: expose an old head"
+hg --config extensions.mq= strip 5 > /dev/null 2>&1
+hg tags # partly stale cache
+hg tags # up-to-date cache
+echo "% strip 2: destroy whole branch, no old head exposed"
+hg --config extensions.mq= strip 4 > /dev/null 2>&1
+hg tags # partly stale
+rm -f .hg/tags.cache
+hg tags # cold cache
-# test tag rank with 3 heads
+echo "% test tag rank with 3 heads"
cd ..
hg init t4
cd t4
@@ -124,10 +191,11 @@
hg tags
hg up -qC 0
hg tag -m 'retag rev 0' -fr 0 bar # rev 4 bar -> 0, but bar stays at 2
-echo % bar should still point to rev 2
+echo "% bar should still point to rev 2"
hg tags
+echo "% remove local as global and global as local"
# test that removing global/local tags does not get confused when trying
# to remove a tag of type X which actually only exists as a type Y
cd ..
--- a/tests/test-tags.out Mon Oct 05 22:01:08 2009 +0200
+++ b/tests/test-tags.out Mon Oct 05 22:17:39 2009 +0200
@@ -1,78 +1,150 @@
+% setup
+no tag cache
000000000000 tip
+no tag cache
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-0acdaf898367 tip
-tip 0:0acdaf898367
-This is a local tag with a really long name! 0:0acdaf898367
-0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first
-tip 1:8a3ca90d111d
-first 0:0acdaf898367
-8a3ca90d111d tip
+acb14030fe0a tip
+tag cache exists
+% create local tag with long name
+tip 0:acb14030fe0a
+This is a local tag with a really long name! 0:acb14030fe0a
+% create a tag behind hg's back
+acb14030fe0a21b60322c440ad2d20cf7685a376 first
+tip 1:b9154636be93
+first 0:acb14030fe0a
+b9154636be93 tip
+% identify with cold cache
+b9154636be93 tip
+% identify with unwritable cache
+b9154636be93 tip
+% create a branch
M a
-8a3ca90d111d+ tip
+b9154636be93+ tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-0acdaf898367+ first
-0acdaf898367+ first
+acb14030fe0a+ first
+acb14030fe0a+ first
M a
created new head
-8216907a933d tip
+c8edf04160c7 tip
+% merge the two heads
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-8216907a933d+8a3ca90d111d+ tip
+c8edf04160c7+b9154636be93+ tip
M .hgtags
-tip 6:e2174d339386
-first 0:0acdaf898367
+% create fake head, make sure tag not visible afterwards
+tip 6:35ff301afafe
+first 0:acb14030fe0a
+% add invalid tags
+committing .hgtags:
+acb14030fe0a21b60322c440ad2d20cf7685a376 first
+spam
+
+foo bar
+% report tag parse error on other head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
-.hgtags@c071f74ab5eb, line 2: cannot parse entry
-.hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed
-.hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed
-tip 8:4ca6f1b1a68c
-first 0:0acdaf898367
-changeset: 8:4ca6f1b1a68c
-.hgtags@c071f74ab5eb, line 2: cannot parse entry
-.hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed
-.hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed
+.hgtags@75d9f02dfe28, line 2: cannot parse entry
+.hgtags@75d9f02dfe28, line 4: node 'foo' is not well formed
+.hgtags@c4be69a18c11, line 2: node 'x' is not well formed
+tip 8:c4be69a18c11
+first 0:acb14030fe0a
+changeset: 8:c4be69a18c11
tag: tip
-parent: 3:b2ef3841386b
+parent: 3:ac5e980c4dc0
user: test
-date: Mon Jan 12 13:46:40 1970 +0000
+date: Thu Jan 01 00:00:00 1970 +0000
summary: head
+% test tag precedence rules
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
-tip 4:36195b728445
-bar 1:b204a97e6e8d
-changeset: 5:1f98c77278de
+tip 4:0c192d7d5e6b
+bar 1:78391a272241
+tip 4:0c192d7d5e6b
+bar 1:78391a272241
+% detailed dump of tag info
+heads:
+4:0c192d7d5e6b
+3:6fa450212aeb
+2:7a94127795a3
+rev 2: .hgtags:
+bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
+rev 3: .hgtags:
+bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
+bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
+78391a272241d70354aa14c874552cad6b51bb42 bar
+rev 4: .hgtags:
+bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
+.hg/tags.cache:
+4 0c192d7d5e6b78a714de54a2e9627952a877e25a 0c04f2a8af31de17fab7422878ee5a2dadbc943d
+3 6fa450212aeb2a21ed616a54aea39a4a27894cd7 7d3b718c964ef37b89e550ebdafd5789e76ce1b0
+2 7a94127795a33c10a370c93f731fd9fea0b79af6 0c04f2a8af31de17fab7422878ee5a2dadbc943d
+
+78391a272241d70354aa14c874552cad6b51bb42 bar
+% test tag removal
+changeset: 5:5f6e8655b1c7
tag: tip
user: test
-date: Mon Jan 12 13:46:40 1970 +0000
-summary: Removed tag bar
+date: Thu Jan 01 00:00:00 1970 +0000
+files: .hgtags
+description:
+Removed tag bar
+
-tip 5:1f98c77278de
+diff -r 0c192d7d5e6b -r 5f6e8655b1c7 .hgtags
+--- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
++++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
+@@ -1,1 +1,3 @@
+ bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
++78391a272241d70354aa14c874552cad6b51bb42 bar
++0000000000000000000000000000000000000000 bar
+
+tip 5:5f6e8655b1c7
+tip 5:5f6e8655b1c7
% remove nonexistent tag
abort: tag 'foobar' does not exist
-changeset: 5:1f98c77278de
+changeset: 5:5f6e8655b1c7
tag: tip
user: test
-date: Mon Jan 12 13:46:40 1970 +0000
+date: Thu Jan 01 00:00:00 1970 +0000
summary: Removed tag bar
-tip 5:e86d7ed95fd3
-bar 0:b409d9da318e
+% rollback undoes tag operation
+rolling back last transaction
+tip 4:0c192d7d5e6b
+bar 1:78391a272241
+tip 4:0c192d7d5e6b
+bar 1:78391a272241
+% test tag rank
+tip 5:85f05169d91d
+bar 0:bbd179dfa0a7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
-tip 6:b744fbe1f6dd
-bar 0:b409d9da318e
+tip 6:735c3ca72986
+bar 0:bbd179dfa0a7
+% don't allow moving tag without -f
abort: tag 'bar' already exists (use -f to force)
-tip 6:b744fbe1f6dd
-bar 0:b409d9da318e
+tip 6:735c3ca72986
+bar 0:bbd179dfa0a7
+% strip 1: expose an old head
+tip 5:735c3ca72986
+bar 1:78391a272241
+tip 5:735c3ca72986
+bar 1:78391a272241
+% strip 2: destroy whole branch, no old head exposed
+tip 4:735c3ca72986
+bar 0:bbd179dfa0a7
+tip 4:735c3ca72986
+bar 0:bbd179dfa0a7
+% test tag rank with 3 heads
adding foo
tip 3:197c21bbbf2c
bar 2:6fa450212aeb
% bar should still point to rev 2
tip 4:3b4b14ed0202
bar 2:6fa450212aeb
+% remove local as global and global as local
adding foo
abort: tag 'localtag' is not a global tag
abort: tag 'globaltag' is not a local tag