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.
Sune Foldager <cryo@cyanite.org> [Wed, 01 Sep 2010 14:55:03 +0200] rev 12131
debugdata: 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.
Martin Geisler <mg@lazybytes.net> [Wed, 01 Sep 2010 12:28:34 +0200] rev 12130
merge with stable
Brodie Rao <brodie@bitheap.org> [Mon, 30 Aug 2010 20:27:25 -0400] rev 12129
remove: properly set return code when warnings are issued
This removes the warn() function in favor of issuing warnings directly
for each kind of file that Mercurial won't remove.
This also uses three separate translatable strings instead of using
string formatting to build the message. This should make it easier to
localize.
Martin Geisler <mg@lazybytes.net> [Wed, 01 Sep 2010 12:05:57 +0200] rev 12128
pull: lowercase error message
Martin Geisler <mg@lazybytes.net> [Tue, 31 Aug 2010 16:36:31 +0200] rev 12127
commit: sort subrepos before committing for stable test output
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 19:05:13 +0900] rev 12126
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 31 Aug 2010 15:47:13 +0900] rev 12125
test-custom-filter: heredoc is not required for single line operations
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 18:57:48 +0900] rev 12124
tests: unify test-custom-filters
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 18:55:00 +0900] rev 12123
tests: unify test-parse-date