Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:26 +0200] rev 12272
outgoing: recurse into subrepositories with --subrepos/-S flag
As with push, the optional destination path is ignored for the
subrepositories, i.e., they are always compared with their default
push path. Fixing this is Issue1852.
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:24 +0200] rev 12271
outgoing: move code from commands to cmdutil
This makes it easier to reuse it in a recursive fashion for subrepos.
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:20 +0200] rev 12270
add: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:11 +0200] rev 12269
add: move main part to cmdutil to make it easier to reuse
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:09:09 +0200] rev 12268
narrowmatcher: propagate bad method
The full path is propagated to the original match object since this is
often used directly for printing an error to the user.
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:08:18 +0200] rev 12267
narrowmatcher: fix broken rel method
Martin Geisler <mg@lazybytes.net> [Mon, 13 Sep 2010 13:08:09 +0200] rev 12266
patch: break import cycle with cmdutil
The patch module imported cmdutil but used it only in updatedir.
Yuya Nishihara <yuya@tcha.org> [Sun, 12 Sep 2010 16:10:41 +0900] rev 12265
patchbomb: show progress when sending emails or writing mbox
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Sep 2010 18:08:00 +0200] rev 12264
patchbomb: consistent code style in getaddrs()
Pascal Quantin <pascal.quantin@gmail.com> [Sat, 11 Sep 2010 18:48:03 +0200] rev 12263
win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com> [Sat, 11 Sep 2010 09:48:10 +0200] rev 12262
win32: update Inno Setup build instructions with up-to-date software
Martin Geisler <mg@lazybytes.net> [Sun, 12 Sep 2010 14:00:40 +0200] rev 12261
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Sun, 12 Sep 2010 12:11:39 +0200] rev 12260
tests: unify test-merge-remove
Adrian Buehlmann <adrian@cadifra.com> [Sun, 12 Sep 2010 11:52:13 +0200] rev 12259
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 21:19:12 +0200] rev 12258
tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 20:04:35 +0200] rev 12257
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 17:58:37 +0200] rev 12256
tests: unify test-merge-force
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 11:44:53 +0200] rev 12255
tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 11:18:47 +0200] rev 12254
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com> [Fri, 10 Sep 2010 23:13:59 +0200] rev 12253
tests: unify test-manifest*
Brodie Rao <brodie@bitheap.org> [Fri, 10 Sep 2010 09:30:50 -0500] rev 12252
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Given a commit author or message with non-ASCII characters in a darcs
repo, convert would raise a UnicodeEncodeError when adding changesets
to the hg changelog.
This happened because etree returns back unicode objects for any text
it can't encode into ASCII. convert was passing these objects to
changelog.add(), which would then attempt encoding.fromlocal() on
them.
This patch ensures converter_source.recode() is called on each piece
of commit data returned by etree.
(Also note that darcs is currently encoding agnostic and will print
out whatever is in a patch's metadata byte-for-byte, even in the XML
changelog.)
Matt Mackall <mpm@selenic.com> [Sat, 11 Sep 2010 16:17:43 -0500] rev 12251
merge with crew
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 11 Sep 2010 10:57:35 +0200] rev 12250
tests: fix incompatibility with python-2.4 in test-hgweb
Thanks to lcantey for catching it.
Martin Geisler <mg@lazybytes.net> [Sat, 11 Sep 2010 00:40:39 +0200] rev 12249
merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 11 Sep 2010 00:40:19 +0200] rev 12248
merge with i18n-default
Martin Geisler <mg@lazybytes.net> [Sat, 11 Sep 2010 00:39:34 +0200] rev 12247
merge with i18n-stable
Wagner Bruna <wbruna@yahoo.com> [Tue, 07 Sep 2010 18:37:59 -0300] rev 12246
i18n-pt_BR: fix a couple of typos
Wagner Bruna <wbruna@yahoo.com> [Tue, 07 Sep 2010 18:13:36 -0300] rev 12245
i18n-pt_BR: added messages from crew stable up to 26d86a6cf2af
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Wed, 01 Sep 2010 10:13:55 +0200] rev 12244
i18n-ro: merged default
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Thu, 26 Aug 2010 16:32:12 +0200] rev 12243
i18n-ro: ongoing translation
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Wed, 25 Aug 2010 12:20:10 +0200] rev 12242
i18n: merged in strings from hg cset ce818cf215dc
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Thu, 19 Aug 2010 23:40:47 +0200] rev 12241
i18n-ro: ongoing translation
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Thu, 19 Aug 2010 23:27:09 +0200] rev 12240
i18n-ro: ongoing translation
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Thu, 19 Aug 2010 16:01:50 +0200] rev 12239
i18n-ro: ongoing translation
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Thu, 19 Aug 2010 15:44:38 +0200] rev 12238
i18n-ro: ongoing translation
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Thu, 19 Aug 2010 00:01:13 +0200] rev 12237
i18n-ro: ongoing translation
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Mon, 16 Aug 2010 23:40:15 +0200] rev 12236
i18n-ro: ongoing translation
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Sun, 15 Aug 2010 23:56:46 +0200] rev 12235
Continued translation
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Thu, 12 Aug 2010 17:30:36 +0200] rev 12234
i18n-ro: ongoing translation
Georg Brandl <georg@python.org> [Tue, 27 Jul 2010 10:17:31 +0200] rev 12233
i18n-de: fix awkward translation of "memory"
Martin Geisler <mg@lazybytes.net> [Fri, 27 Aug 2010 11:07:09 +0200] rev 12232
i18n-da: fix typo
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Aug 2010 22:44:21 -0300] rev 12231
i18n: merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Aug 2010 22:42:33 -0300] rev 12230
i18n: merge default heads
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Aug 2010 22:38:33 -0300] rev 12229
i18n-pt_BR: synchronized with 9617803b1acb
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Aug 2010 22:27:20 -0300] rev 12228
i18n: merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 24 Aug 2010 11:01:45 -0300] rev 12227
i18n: merge default heads
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 24 Aug 2010 11:01:00 -0300] rev 12226
i18n-pt_BR: synchronized with c6b1be675d3c
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 24 Aug 2010 10:58:12 -0300] rev 12225
i18n: merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 21 Aug 2010 11:22:49 +0200] rev 12224
i18n: merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 21 Aug 2010 11:21:49 +0200] rev 12223
i18n: merged stable heads
Paolo Giarrusso <p.giarrusso@gmail.com> [Sat, 21 Aug 2010 00:33:13 +0200] rev 12222
i18n-it: finish translating 'hg summary' output
Paolo Giarrusso <p.giarrusso@gmail.com> [Sat, 21 Aug 2010 00:33:13 +0200] rev 12221
i18n-it: remove bogus fuzzy translations for revset
The translations were all random fuzzy strings, which can only do harm, so
remove them.
Moreover, given the status of revset (it seems mostly an internal undocumented module, and
to understand it you need the source anyway), I prefer not to translate it for
now.
Paolo Giarrusso <p.giarrusso@gmail.com> [Sat, 21 Aug 2010 00:33:13 +0200] rev 12220
i18n-it: update fuzzy messages/translate patchbomb
Paolo Giarrusso <p.giarrusso@gmail.com> [Sat, 21 Aug 2010 00:33:13 +0200] rev 12219
i18n-it: update mq translation
Significant updates were performed - when translating something, I tried to
choose a term and use it consistently everywhere possible, so here I translated
a lot of messages. Additionally, I use the mq extension a lot, and now I am
using the translation, so I will be able to translate it better.
Paolo Giarrusso <p.giarrusso@gmail.com> [Sat, 21 Aug 2010 00:33:13 +0200] rev 12218
i18n-it: updates after msgmerge on stable branch, 2nd part
Paolo Giarrusso <p.giarrusso@gmail.com> [Sat, 21 Aug 2010 00:33:13 +0200] rev 12217
i18n-it: general updates fuzzy synopsis texts
This patch follows the fix on the translation of [OPTION]... with other needed
updates on the same class of messages.
Paolo Giarrusso <p.giarrusso@gmail.com> [Sat, 21 Aug 2010 00:33:13 +0200] rev 12216
i18n-it: translate [OPTION]..., not [OPTIONS]...: keep the singular
Since [OPTION]... is intended to mean more options, it was translated in Italian
as plural. However the plural is conveyed by `...', so switch to the singular.
This was also useful because for the '-o OPT' extdiff option, I have to
translate `OPT' as a singular.
Paolo Giarrusso <p.giarrusso@gmail.com> [Sat, 21 Aug 2010 00:33:13 +0200] rev 12215
i18n-it: readd other lost accented characters
The problem was introduced already in revision 9f9137cd83f5 by the original
Italian translator, according to logs. This might be due to a bug in the program
he used, "Lokalize 0.3", or maybe not - some accented characters exist also in
that commit.
Paolo Giarrusso <p.giarrusso@gmail.com> [Sat, 21 Aug 2010 00:33:13 +0200] rev 12214
i18n-it: updates after msgmerge on stable branch
Paolo Giarrusso <p.giarrusso@gmail.com> [Sat, 21 Aug 2010 00:33:13 +0200] rev 12213
i18n-it: perform msgmerge on the tip of the stable branch
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 20 Aug 2010 21:22:57 -0300] rev 12212
i18n-pt_BR: synchronized with 31dde4c3bb83
Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 23:53:51 +0200] rev 12211
dirstate: use one pass to filter out files in subrepos
Martin Geisler <mg@lazybytes.net> [Fri, 10 Sep 2010 23:53:49 +0200] rev 12210
subrepo: handle diff with working copy
We cannot unconditionally call bin(node2) since node2 is None when
comparing with the working copy.
Patrick Mezard <pmezard@gmail.com> [Fri, 10 Sep 2010 22:52:00 +0200] rev 12209
subrepos: handle diff nodeids in subrepos, not before
Subversion nodeids are integer revisions.
Patrick Mezard <pmezard@gmail.com> [Fri, 10 Sep 2010 22:36:04 +0200] rev 12208
mq: add newline after qfold warning
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
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 08 Sep 2010 12:53:15 +0200] rev 12177
bisect: allow revsets in addition to single revs (issue2360)