Matt Mackall <mpm@selenic.com> [Tue, 29 Dec 2009 16:16:25 -0600] rev 10155
Merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Dec 2009 19:02:26 -0200] rev 10154
run-tests.py: clears http_proxy for all tests
Robert Bachmann <rbachm@gmail.com> [Mon, 28 Dec 2009 16:48:57 +0100] rev 10153
Added XML output for hg log
The XML format is based on the one used by Subversion.
Currently the closing "</log>" tag is not written, since cmdutil.py does not support the "footer" template variable.
Robert Bachmann <rbachm@gmail.com> [Mon, 28 Dec 2009 17:55:52 +0100] rev 10152
Added support for templatevar "footer" to cmdutil.py
Patrick Mezard <pmezard@gmail.com> [Tue, 29 Dec 2009 16:00:38 +0100] rev 10151
patch: make git diffline generation more explicit
Patrick Mezard <pmezard@gmail.com> [Tue, 29 Dec 2009 16:00:29 +0100] rev 10150
mq: untangle git patch detection
Patrick Mezard <pmezard@gmail.com> [Tue, 29 Dec 2009 16:00:24 +0100] rev 10149
test-mq: better tests delimitation
Patrick Mezard <pmezard@gmail.com> [Tue, 29 Dec 2009 01:32:40 +0100] rev 10148
Merge with crew-stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 29 Dec 2009 01:03:10 +0100] rev 10147
test-bisect: test handling of invalid commands without relying on sh
Patrick Mezard <pmezard@gmail.com> [Mon, 28 Dec 2009 18:29:35 +0100] rev 10146
diffhelpers: fix variable declaration for MSVC (not C99)
Martin Geisler <mg@lazybytes.net> [Sun, 27 Dec 2009 23:24:05 +0100] rev 10145
dirstate: improve docstring formatting
Triple-quoted strings are easier to spot than single-quoted strings.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:36 +0200] rev 10144
test-help: improve test coverage
Adds a test for displaying a help topic.
Extends test coverage of commands.help_ by 5 lines.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:35 +0200] rev 10143
test-help: improve test coverage
Adds a test for displaying a command list with a command with no help text.
Extends test coverage of commands.help_ by 1 line.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:35 +0200] rev 10142
test-help: improve test coverage
Adds a test that extension commands are omitted from the default
command list.
Extends test coverage of commands.help_ by 1 line.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:35 +0200] rev 10141
test-help: improve test coverage
Adds a test for commands without help text.
Extends test coverage of commands.help_ by 1 line.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:35 +0200] rev 10140
test-help: improve test coverage
Adds a test for help on a command with no options.
Extends test coverage of commands.help_ by 2 lines.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:34 +0200] rev 10139
test-help: improve test coverage
Adds a test for handling ambiguous command help
Extends test coverage of commands.help_ by 4 lines.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 24 Dec 2009 11:41:06 +0100] rev 10138
merge with stable
Johan Samyn <johan.samyn@gmail.com> [Thu, 24 Dec 2009 11:40:39 +0100] rev 10137
monoblue: fix title for branches page
Patrick Mezard <pmezard@gmail.com> [Thu, 24 Dec 2009 00:01:13 +0100] rev 10136
Merge with crew-stable
Greg Onufer <gonufer@jazzhaiku.com> [Wed, 09 Dec 2009 16:56:00 -0800] rev 10135
patch: better handling of sequence of offset patch hunks (issue1941)
The built-in patch implementation applied the hunks to the wrong lines of the
file if the file in the repo has been modified to skew the patch line numbers
and the file contains repetitive sequences of lines.
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 23:28:53 +0100] rev 10134
Makefile: added instructions on how to override PREFIX
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 20:34:09 +0100] rev 10133
Merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 20:31:35 +0100] rev 10132
win32text: do not mention hgext in warning
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Dec 2009 19:31:48 +0100] rev 10131
patch: drop unused hunk.newctrl()
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Dec 2009 19:31:48 +0100] rev 10130
test-import-eol: improve binary hunks test
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Dec 2009 19:31:48 +0100] rev 10129
diffhelpers: handle CRLF in hunk last line without EOL
Note that diff generation code always ends last lines without newline with a
LF, so this is a tolerance.
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Dec 2009 19:31:48 +0100] rev 10128
patch: drop eol normalization fast-path for 'lf' and 'crlf'
With eolmode set to 'lf' or 'crlf' we avoided the hunk duplication and
normalization by reading the input patch in text mode. Dropping this
optimization simplifies code expectations for a small overhead.
The change in test-mq-eol comes from a tolerance to CRLF instead of LF for last
lines without newlines being broken by this revision. This tolerance was only
partially supported and will be added again in a better way.
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Dec 2009 19:31:47 +0100] rev 10127
patch: fix eolmode=auto with new files
If target file does not exist or has no eol, current code was normalizing eols
to LF. Preserve patch file eols instead.
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 19:18:03 +0100] rev 10126
Merge with stable