Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 20:19:16 +0200] rev 12207
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 10 Sep 2010 19:41:45 +0200] rev 12206
tests: unify test-locate
Adrian Buehlmann <adrian@cadifra.com> [Fri, 10 Sep 2010 19:05:49 +0200] rev 12205
tests: unify test-journal-exists
Adrian Buehlmann <adrian@cadifra.com> [Fri, 10 Sep 2010 17:59:17 +0200] rev 12204
tests: unify test-
issue1438 and test-
issue2137
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 16:58:13 +0200] rev 12203
keyword: explain file-wise expansion in help
Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 20:11:42 +0200] rev 12202
convert: move -A option to --authormap
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 15:32:22 +0200] rev 12201
patchbomb: add --confirm option to show series details and ask for confirmation
--confirm presents same prompt as --diffstat, but does not write
a diffstat to the messages' bodies.
A simple test simulating a negative response is included.
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 15:32:14 +0200] rev 12200
patchbomb: let diffstat prompt only once with complete summary
This changes the behaviour of --diffstat.
Before the user was asked for confirmation of each patch with its
description and diffstat, and a final summary.
Now there is only one prompt right before sending with a final
summary which does not include the patch descriptions, but the
message details and the diffstats:
Final summary:
From: sender
To: recipient(s)
Cc: (if present)
Bcc: (if present)
Reply-To: (if present)
Subject: [patch 0 of x [flags]] intro (if present)
a | 28 ++++++++++++++++++++++++++++
b | 15 +++++++++++++++
Subject: [patch 1 of x [flags]] subject
a | 28 ++++++++++++++++++++++++++++
[ ... ]
are you sure you want to send (yn)?
Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 15:56:13 +0200] rev 12199
patchbomb: rename argument to avoid shadowing patch module
Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 01:34:14 +0200] rev 12198
convert: deprecate --authors in preference for --authormap
This aligns the authormap option with the other three mapping options.
The old --authors option is still supported and 'hg help convert -v'
will still show it.
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Sep 2010 08:31:07 +0200] rev 12197
patchbomb: show prompt and selection in non-interactive mode
Akin to
01ada7b1861d for the custom patchbomb prompt.
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Sep 2010 08:31:07 +0200] rev 12196
patchbomb: use ui.promptchoice for diffstat to allow localization of choices
The extra check for ui.interacive from patchbomb's prompt function is not
needed here.
Format boolean prompt as in filemerge.py.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Sep 2010 23:34:37 +0200] rev 12195
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Sep 2010 22:10:08 +0200] rev 12194
tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Sep 2010 14:29:28 +0200] rev 12193
tests: unify test-git-*
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Sep 2010 11:47:24 +0200] rev 12192
tests: unify test-filebranch
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Sep 2010 11:19:50 +0200] rev 12191
tests: unify test-extension
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Sep 2010 09:46:17 +0200] rev 12190
tests: unify test-execute-bit
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Sep 2010 09:12:36 +0200] rev 12189
tests: unify test-empty-group
Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 01:04:32 +0200] rev 12188
merge with stable
Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 00:07:38 +0200] rev 12187
convert: better grouping of command line flags in help
We normally put related command line flags after one another.
Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 00:36:01 +0200] rev 12186
convert: help string cleanups
Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 00:30:36 +0200] rev 12185
convert: better quoting in help text
Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 00:22:46 +0200] rev 12184
convert: show example splice, author, and branch map entries in help
Also document that
- empty lines are skipped and comment are supported in author map
- whitespace is not allowed in branch map entries since we split on it
when parsing the file
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 08 Sep 2010 15:23:48 +0200] rev 12183
hgweb: support very simple caching model (
issue1845)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 08 Sep 2010 15:11:35 +0200] rev 12182
tests: extend get-with-headers to support cache testing
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 08 Sep 2010 15:19:35 +0200] rev 12181
tests: fix test output for test-hgweb-no* tests
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 08 Sep 2010 15:18:33 +0200] rev 12180
tests: rename test for better grouping
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 08 Sep 2010 15:16:03 +0200] rev 12179
check-code: fix ternary expression introduced in
1ef9b0b5efec
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 08 Sep 2010 13:48:25 +0200] rev 12178
bisect: warn about ending on a merge with only one side marked