timeless <timeless@gmail.com> [Thu, 10 Jun 2010 15:35:06 +0200] rev 11355
relink/progress: Adding progress for collecting stage
timeless <timeless@gmail.com> [Thu, 10 Jun 2010 13:09:50 +0200] rev 11354
relink/progress: Adding progress for pruning stage
Greg Ward <greg-hg@gerg.ca> [Mon, 14 Jun 2010 16:06:52 -0400] rev 11353
merge: when current branch has 1 or > 2 heads, actually abort.
Currently merge just prints abort-like messages to stderr and then
exits with a misleading status 0 (cleverly disguised as "False").
With this change it raises Abort, just like every other fatal error.
Greg Ward <greg-hg@gerg.ca> [Tue, 15 Jun 2010 16:10:32 -0400] rev 11352
tags: remove inactive debugging code.
It was left in just in case things went wrong with the tag cache in
Mercurial 1.4, so we could easily crank up the verbosity with a
one-line change. There have been no problems in 1.4 or 1.5, so it
should be safe to drop this now.
Greg Ward <greg-hg@gerg.ca> [Tue, 15 Jun 2010 15:02:54 -0400] rev 11351
tags: remove the old non-caching implementation of findglobaltags().
It was left behind just in case the tag cache blew up in Mercurial
1.4, so we could easily revert to the non-caching code. There have
been no problems with the tag cache in 1.4 or 1.5, so it should be
safe to get rid of this code now.
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Jun 2010 17:15:31 +0200] rev 11350
keyword: postpone manifest calculation in kwtemplater.overwrite
We can check for file existence in the working directory (needed
in case of recording) by simply using the given context and
calculate the manifest only when there are in fact candidates
for expansion/shrinking.
Georg Brandl <georg@python.org> [Sun, 13 Jun 2010 23:25:27 +0200] rev 11349
revset: fix call to ctx.extra() in closed()
Martin Geisler <mg@aragost.com> [Tue, 15 Jun 2010 11:05:17 +0200] rev 11348
p4: fix long line and bad spacing around %
Frank Kingswood <frank@kingswood-consulting.co.uk> [Mon, 14 Jun 2010 16:38:36 +0100] rev 11347
Fix shell quoting on p4 conversion
Greg Ward <greg-hg@gerg.ca> [Mon, 14 Jun 2010 13:39:00 -0400] rev 11346
tests: rename test-merge3 to test-add-remove.
It tests that 'hg commit' does not crash if the user removes a newly
added file, which has nothing to do with merging.
Martin Geisler <mg@aragost.com> [Tue, 15 Jun 2010 10:01:55 +0200] rev 11345
check-code: reformat long lines
Martin Geisler <mg@aragost.com> [Tue, 15 Jun 2010 10:00:07 +0200] rev 11344
dagparser: replace format with str
Martin Geisler <mg@aragost.com> [Tue, 15 Jun 2010 09:55:59 +0200] rev 11343
check-code: catch format(), introduced in Python 2.6
Martin Geisler <mg@aragost.com> [Tue, 15 Jun 2010 09:53:50 +0200] rev 11342
commands: get rid of generic exception in debugbuilddag
Martin Geisler <mg@aragost.com> [Tue, 15 Jun 2010 09:51:52 +0200] rev 11341
check-code: fix check for any/all function
The old check would only detect any/all at the beginning of a line.
The regexp was probably just modeled after the preceding regexp which
(correctly) finds the 'with' keyword at the beginning of a line.
We now complain about 'any(' and 'all(' anywhere in a line, unless it
is preceded by 'def'. This allows us to define our own compatibility
wrapper in util and use 'util.any(' in the code.
Renato Cunha <renatoc@gmail.com> [Mon, 14 Jun 2010 16:56:20 -0300] rev 11340
hgext/zeroconf/__init__.py: Separate relative and absolute imports.
2to3 complains when relative and absolute imports are mixed, this fix just
separates them on the zeroconf extension. According to 2to3, the other modules
are fine.
Matt Mackall <mpm@selenic.com> [Fri, 11 Jun 2010 15:30:12 -0500] rev 11339
revset: improve filter argument handling
Martin Geisler <mg@aragost.com> [Fri, 11 Jun 2010 18:54:10 +0200] rev 11338
commands: format is a Python2.6 function
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 10 Jun 2010 11:49:48 +0200] rev 11337
debugbuilddag: build a changelog dag from a concise description
Useful in tests to quickly build a complex DAG in an empty repo.
Handles local tags and named branches.
Options to, at each rev,
- create a new file,
- overwrite the same file,
- append to the same file,
- write to a specific line in a mergeable file.
Can run shell commands during DAG buildup.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 10 Jun 2010 11:48:45 +0200] rev 11336
debugdag and debugindexdag: emit changelog/revlog DAGs as concise text
Mainly useful for reusing DAGs somewhere else, for example for attaching
them to a bug report, or for importing them into other environments
(like my test environment for incoming/outgoing discovery).
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 10 Jun 2010 11:48:15 +0200] rev 11335
dagparser: parses and formats DAGs as concise text
As discussed during the sprint. See the doc comment and doctests
for specification and examples. This is used in subsequent patches
to export revlog and changelog DAGs, and to generate a repo with
a given changelog DAG.
Matt Mackall <mpm@selenic.com> [Thu, 10 Jun 2010 15:30:15 -0500] rev 11334
tests: fix up webraw encoding
Matt Mackall <mpm@selenic.com> [Thu, 10 Jun 2010 15:23:31 -0500] rev 11333
strip: backup bundles should use the .hg extension
Julian Cowley <julian@lava.net> [Wed, 09 Jun 2010 12:41:44 -1000] rev 11332
hgweb: specify a charset when sending raw text files
Gets the charset from encoding.encoding parameter.
Matt Mackall <mpm@selenic.com> [Wed, 09 Jun 2010 16:39:25 -0500] rev 11331
summary: report copies and renames
Chad Dombrova <chadrik@gmail.com> [Thu, 10 Jun 2010 09:32:19 -0700] rev 11330
provide pre- and post- hooks with parsed command line arguments.
python hooks are passed two new keyword arguments:
- opts: a dict of options; unsepcified options are set to their default
- pats: a list of arguments
shell hooks receive two new variables containing string representations
of the above data:
- $HG_OPTS
- $HG_PATS
for example, the opts and pats for 'hg -f v1.1' would be:
{'force': True, 'message': '', 'rev': '', 'user': '', 'date': '', 'local': None, 'remove': None, 'mq': None}
['v1.1']
Matt Mackall <mpm@selenic.com> [Wed, 09 Jun 2010 16:25:28 -0500] rev 11329
tests: fix some branch head fallout
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 07 Jun 2010 15:34:48 +0200] rev 11328
pager: set ui.formatted() prior to redirecting stdout.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 07 Jun 2010 15:33:03 +0200] rev 11327
mq: use ui.formatted() instead of ui.plain().
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 07 Jun 2010 15:28:54 +0200] rev 11326
color: use ui.formatted().