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)
Martin Geisler <mg@lazybytes.net> [Tue, 07 Sep 2010 16:34:07 +0200] rev 12176
subrepos: add function for iterating over ctx subrepos
Martin Geisler <mg@lazybytes.net> [Tue, 07 Sep 2010 16:23:55 +0200] rev 12175
subrepos: handle modified but uncommitted .hgsub
Martin Geisler <mg@lazybytes.net> [Tue, 07 Sep 2010 15:31:56 +0200] rev 12174
localrepo: check nested repos against working directory
This checks against what is really in the filesystem, including
subrepositories that have been added to .hgsub but not yet committed.
Martin Geisler <mg@lazybytes.net> [Tue, 07 Sep 2010 10:30:29 +0200] rev 12173
add: clarify that repo[None].add returns rejected filenames
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Sep 2010 07:14:18 +0200] rev 12172
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 05 Sep 2010 21:00:04 +0200] rev 12171
store: Removed extra space in _data list
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 05 Sep 2010 22:32:11 +0200] rev 12170
verify: fix "missing revlog!" errors for revlog format v0 and add test
With revlog format v0 the .d files are empty if the only revision stored is an
empty file. Since Mercurial can no longer create format v0 repositories, but
still use it, add a script which creates a repository with a single empty file.
This can be used in other tests if wanted.
Brendan Cully <brendan@kublai.com> [Sun, 05 Sep 2010 13:37:17 -0700] rev 12169
zsh completion: bookmarks support
Brendan Cully <brendan@kublai.com> [Sat, 04 Sep 2010 01:32:01 -0700] rev 12168
zsh completion: patchbomb support
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 12167
diff: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 12166
status: recurse into subrepositories with --subrepos/-S flag
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 12165
match: add narrowmatcher class
This class can be used to adapt an existing match object to a new
match object that only cares about paths within a certain
subdirectory.
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 12164
cmdutil: use repo.auditor when constructing match object
This gives the repository control over which nested repository paths
that should be allowed via the custom path auditor.
Since paths into subrepositories are now allowed, dirstate.walk must
now filter away more paths than before.
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 12163
match: accept auditor argument
This is used when normalizing filenames and patterns.
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 12162
localrepo: add auditor attribute which knows about subrepos
Martin Geisler <mg@lazybytes.net> [Thu, 02 Sep 2010 23:45:47 +0200] rev 12161
tests: remove unneeded -u flags
Martin Geisler <mg@lazybytes.net> [Thu, 02 Sep 2010 23:36:43 +0200] rev 12160
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Sep 2010 18:12:07 +0200] rev 12159
tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Sep 2010 17:32:22 +0200] rev 12158
tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Sep 2010 17:13:23 +0200] rev 12157
tests: unify test-dispatch
Martin Geisler <mg@lazybytes.net> [Thu, 02 Sep 2010 23:22:51 +0200] rev 12156
tests: remove unneeded -d flags
Many tests fixed the commit date of their changesets at '1000000 0' or
similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not
better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is
the default run-tests.py installs.
Removing the unnecessary flag removes some clutter and will hopefully
make it clearer what the tests are really trying to test. Some tests
did not even change their output when the dates were changed, in which
case the -d flag was truly irrelevant.
Dates used in sequence (such as '0 0', '1 0', etc...) were left alone
since they may make the test easier to understand.
Martin Geisler <mg@lazybytes.net> [Thu, 02 Sep 2010 22:17:22 +0200] rev 12155
test-merge5: removed unnecessary parts of test
- no need to initialize a new directory
- no need to fix the commit time, already done by run-tests
- no need to exit 0, use exit code from hg instead
- better spacing around comments
Brodie Rao <brodie@bitheap.org> [Thu, 02 Sep 2010 12:48:46 -0400] rev 12154
test-merge5: ensure updating to tip across branches is tested
When doing "hg update" across branches (without any revision
specified), hg will abort and ask the user to merge or do hg update
-c. This tests for that error.
Mads Kiilerich <mads@kiilerich.com> [Thu, 02 Sep 2010 22:38:12 +0200] rev 12153
test-convert-cvs: add a sleep to make test more stable
The recent addition of fuzzy tests introduced a new cvs commit which sometimes
fails.
This adds a sleep to make sure that cvs notices that the file has changed,
similar to how it is done in other tests.
Martin Geisler <mg@lazybytes.net> [Thu, 02 Sep 2010 17:28:20 +0200] rev 12152
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Sep 2010 14:45:16 +0200] rev 12151
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Sep 2010 15:08:36 +0200] rev 12150
tests: unify test-diff-copy-depth
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Sep 2010 15:39:55 +0200] rev 12149
tests: unify test-diff-upgrade
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Thu, 02 Sep 2010 14:58:47 +0200] rev 12148
tests: unify test-convert-hg-startrev.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Sep 2010 16:29:04 +0200] rev 12147
tests: unify test-diffstat
Martin Geisler <mg@lazybytes.net> [Thu, 02 Sep 2010 17:07:02 +0200] rev 12146
bookmarks: break long line found by check-code
Martin Geisler <mg@lazybytes.net> [Thu, 02 Sep 2010 12:53:28 +0200] rev 12145
help: make "hg help hgrc" an alias for "hg help config"
Martin Geisler <mg@lazybytes.net> [Thu, 02 Sep 2010 12:08:13 +0200] rev 12144
clone, patch, convert: use hex(nullid) instead of '0'*40
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Sep 2010 11:20:23 +0200] rev 12143
tests: unify test-diff-newlines
Martin Geisler <mg@aragost.com> [Wed, 01 Sep 2010 15:23:21 +0200] rev 12142
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Tue, 31 Aug 2010 11:57:02 +0200] rev 12141
tests: unify test-diff-unified
Adrian Buehlmann <adrian@cadifra.com> [Tue, 31 Aug 2010 11:14:48 +0200] rev 12140
tests: unify test-diff-subdir
Adrian Buehlmann <adrian@cadifra.com> [Tue, 31 Aug 2010 10:21:24 +0200] rev 12139
tests: unify test-diff-reverse
Adrian Buehlmann <adrian@cadifra.com> [Mon, 30 Aug 2010 23:13:52 +0200] rev 12138
tests: unify test-diff-ignore-whitespace
Adrian Buehlmann <adrian@cadifra.com> [Mon, 30 Aug 2010 16:52:21 +0200] rev 12137
tests: unify test-diff-hashes
Adrian Buehlmann <adrian@cadifra.com> [Mon, 30 Aug 2010 14:38:15 +0200] rev 12136
tests: unify test-diff-change
Brodie Rao <brodie@bitheap.org> [Mon, 30 Aug 2010 11:16:21 -0400] rev 12135
test-serve: ensure KILLQUIETLY is only used once
49463314c24f introduced a feature to the hgserve() function that
suppresses errors from kill(1). It wrongly assumed that setting an
environment variable when calling a function would make it local to
the function. It ended up suppressing kill errors for every call
thereafter.
This patch sets KILLQUIETLY=N after use.
Martin Geisler <mg@aragost.com> [Mon, 30 Aug 2010 17:17:20 +0200] rev 12134
dagparser: translate and lowercase error messages
Martin Geisler <mg@aragost.com> [Mon, 30 Aug 2010 17:11:51 +0200] rev 12133
match: mark error messages for translation
Sune Foldager <sune.foldager@edlund.dk> [Wed, 01 Sep 2010 15:03:45 +0200] rev 12132
debugindex(dot): try to access filelogs through repo, if possible
If a repository is accesible, first treat the filename as a working copy file
and try to open its filelog. Fallback to opening the file directly as a
revlog, as before.