Augie Fackler <durin42@gmail.com> [Sat, 04 Apr 2009 20:19:51 -0500] rev 8074
convert: Improved svn source detection.
Henrik Stuart <henrik.stuart@edlund.dk> [Thu, 16 Apr 2009 15:34:03 +0200] rev 8073
strip: make repair.strip transactional to avoid repository corruption
Uses a transaction instance from the local repository to journal the
truncation of revlog files, such that if a strip only partially completes,
hg recover will be able to finish the truncate of all the files.
The potential unbundling of changes that have been backed up to be restored
later will, in case of an error, have to be unbundled manually. The
difference is that it will be possible to recover the repository state so
the unbundle can actually succeed.
Henrik Stuart <henrik.stuart@edlund.dk> [Wed, 15 Apr 2009 19:54:22 +0200] rev 8072
transaction: support multiple, separate transactions
Solves that committed (closed) transactions may linger and be returned
on subsequent transaction calls, even though a new transaction should
be made, rather than a new nested transaction.
This also fixes a race condition with the use of weakref.
Henrik Stuart <henrik.stuart@edlund.dk> [Thu, 16 Apr 2009 15:41:25 +0200] rev 8071
transaction: only delete journal on successful abort/commit
This solves that the journal file was always deleted when the transaction
was deleted, no matter whether the abort (rollback) succeeded or not.
Thus, never supporting a hg recover. The journal file is now only deleted
on close (commit) or a successful abort.
Tobias Bell <tobias.bell@gmail.com> [Tue, 14 Apr 2009 18:16:04 +0200] rev 8070
i18n-de: synchronised with hg.pot
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 08 Apr 2009 14:15:18 +0900] rev 8069
inotify: Do not raise TypeError when client.query returns None
When something went wrong in client.query, it returns None.
If inotify.debug=True, we will attempt in this case a zip(A, None, B), which
would raise a TypeError.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 08 Apr 2009 13:29:51 +0900] rev 8068
inotify: Simplifying init code
simplifying
retry = False
try:
try:
doA()
retry = True
except X:
doB()
retry = True
except:
doC()
pass
if retry:
doD()
-- into --
try:
try:
doA()
except X:
doB()
except:
doC()
pass
else:
doD()
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 08 Apr 2009 13:27:28 +0900] rev 8067
inotify: files is always a list: 'files or []' is redundant
files comes from match.files() : it always returns a list.
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Apr 2009 21:57:17 +0200] rev 8066
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Apr 2009 14:32:44 +0200] rev 8065
extdiff: preserve execute-bit across copies (issue1562)
Bug report and test by Mads Kiilerich <mads@kiilerich.com>
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Apr 2009 21:21:01 +0200] rev 8064
extdiff: merge node and working dir snapshot modes
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Apr 2009 16:15:45 +0200] rev 8063
convert/p4: win32 fixes
* cmd.exe does not know single quotes
* win32 does not like trailing whitespace very much. Trade test coverage for
maintenance time and drop the trailing whitespaces tests.
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Apr 2009 21:18:53 +0200] rev 8062
test-issue1438: make executable
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Apr 2009 19:47:11 +0200] rev 8061
context: fix workingctx.__contains__
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 08 Apr 2009 02:38:23 +0900] rev 8060
run-tests: detect when hghave fails to check for a feature and fail test
hghave exitcode != 0 might mean that hghave failed to check for feature
avaibility. Detect those cases, and fail the test, instead of skipping it.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 08 Apr 2009 02:34:00 +0900] rev 8059
hghave: checking that all targets are Exception-free
Pascal Quantin <pascal.quantin@gmail.com> [Sat, 11 Apr 2009 21:58:28 +0200] rev 8058
Add Python 2.6 support to win32 installer
With Python 2.6, win32 installer should try to package MSVC9.0 dlls instead of
MSVC7.1 dlls
Pascal Quantin <pascal.quantin@gmail.com> [Sun, 25 Jan 2009 21:08:36 +0100] rev 8057
Bundle python dll in win32 installer if present
in case hg.exe is generated with the py2exe '-b 2' option instead of '-b 1',
python2?.dll is not included in library.zip file and must also be packaged.
The file will be integrated in the installer only if it is present in the dist
directory. Generating hg.exe with the '-b 2' option is mandatory to avoid a
crash when pyreadline is installed.
Pascal Quantin <pascal.quantin@gmail.com> [Sun, 25 Jan 2009 21:55:18 +0100] rev 8056
Win32 installer: add hgrc.5.html and hgignore.5.html links to Start Menu folder
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Apr 2009 14:36:55 +0200] rev 8055
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Apr 2009 14:33:47 +0200] rev 8054
httprepo: hide password in debug traces too
Steve Borho <steve@borho.org> [Sat, 11 Apr 2009 18:34:21 -0500] rev 8053
hide passwords in httprepo error messages
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Apr 2009 23:43:24 +0200] rev 8052
convert/mtn: allow monotone database files as sources
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Apr 2009 23:21:39 +0200] rev 8051
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Apr 2009 23:12:42 +0200] rev 8050
convert/mtn: record changes from directory renames (issue1587)
Bug report and initial path by Pavel Volkovitskiy <int@mtx.ru>
Augie Fackler <durin42@gmail.com> [Sat, 04 Apr 2009 20:39:46 -0500] rev 8049
test-convert-svn-sink: rewrite output for svn compatibility
Addition by Patrick Mezard <pmezard@gmail.com>:
* drop 'kind=' lines from svn 1.6 output
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Apr 2009 21:17:11 +0200] rev 8048
convert/cvs: delay CVS log parsing after initialization (issue1581/2)
Source and destination constructors should be fast so configurations issues are
hit quickly, including authentication and filemap/authormap/splicemap issues.
Delaying might be a problem if the remove side disconnects idle connections
while the log is being read. It did not happen when converting openafs
repository, where log retrieval took at least 10mn.
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Apr 2009 21:15:27 +0200] rev 8047
convert: better mapfile parsing errors (issue1581/1)
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Apr 2009 20:49:47 +0200] rev 8046
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Apr 2009 20:18:51 +0200] rev 8045
convert/bzr: fix file rename replaced by a dir case (issue1583)
We were not checking entry types, and getting file content was working with
directories instead of raising IOError.
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Apr 2009 00:13:18 +0200] rev 8044
purge: fix b777dd8f7836 (remove read-only files)
- use try/except to avoid unnecessary work
- edit only mode bits
Patrick Mezard <pmezard@gmail.com> [Fri, 10 Apr 2009 21:20:28 +0200] rev 8043
purge: remove read-only files under Windows (issue583)
Initial version by Benoit Boissinot <bboissin@gmail.com>
Patrick Mezard <pmezard@gmail.com> [Fri, 10 Apr 2009 13:06:02 +0200] rev 8042
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 10 Apr 2009 13:00:28 +0200] rev 8041
Fix manifest default rev doc when no rev is checked out (issue1603)
Martin Geisler <mg@lazybytes.net> [Thu, 09 Apr 2009 20:00:48 +0200] rev 8040
commands: more informative description of "!" files in status
This makes the description more similar to the one used by Subversion.
Suggestion by Dennis Brakhane.
Martin Geisler <mg@lazybytes.net> [Thu, 09 Apr 2009 14:43:02 +0200] rev 8039
commands: automatically word-wrap cmdline options
Some of the descriptions of command line options were getting quite
long, and when translated they are likely to grow even longer. This
word-wraps them at 70 characters, just like the help texts.
We could have opted to wrap them at the terminal width instead, but I
think it looks better to have them be consistent with the help texts.
Martin Geisler <mg@lazybytes.net> [Thu, 09 Apr 2009 10:48:07 +0200] rev 8038
commands: removed bad linebreak in import help
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Apr 2009 23:24:22 +0200] rev 8037
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Apr 2009 23:17:33 +0200] rev 8036
test-convert-bzr: check renamed files are removed (issue1505)
Xavier ALT <dex@phoenix-ind.net> [Wed, 08 Apr 2009 22:59:02 +0200] rev 8035
convert: remove renamed source files (issue1505)
Martin Geisler <mg@lazybytes.net> [Wed, 08 Apr 2009 22:07:20 +0200] rev 8034
commands: lower-case --import-branch help text
Martin Geisler <mg@lazybytes.net> [Wed, 08 Apr 2009 21:20:31 +0200] rev 8033
commands: consistently write switches as -a/--abc
Martin Geisler <mg@lazybytes.net> [Wed, 08 Apr 2009 20:51:09 +0200] rev 8032
commands: use double quotes consistently in help texts
Martin Geisler <mg@lazybytes.net> [Wed, 08 Apr 2009 20:43:19 +0200] rev 8031
upper-case command line meta variables
Martin Geisler <mg@lazybytes.net> [Wed, 08 Apr 2009 00:48:05 +0200] rev 8030
i18n-da: synchronized
Martin Geisler <mg@lazybytes.net> [Wed, 08 Apr 2009 00:41:07 +0200] rev 8029
notify, commands: word-wrap help strings
Martin Geisler <mg@lazybytes.net> [Tue, 07 Apr 2009 23:06:50 +0200] rev 8028
expand "rev" to "revision" in help texts
Martin Geisler <mg@lazybytes.net> [Tue, 07 Apr 2009 22:58:05 +0200] rev 8027
expand "repo" to "repository" in help texts
Martin Geisler <mg@lazybytes.net> [Tue, 07 Apr 2009 22:47:56 +0200] rev 8026
expand "dir" to "directory" in help texts
Henrik Stuart <henrik.stuart at edlund.dk> [Wed, 08 Apr 2009 19:32:16 +0200] rev 8025
patchbomb: Support initial in-reply-to header
This allows follow-up/revised patches to appear properly threaded
in mail readers and in the archives, reducing noise.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 08 Apr 2009 14:20:57 +0200] rev 8024
profiling: Adding support for kcachegrind output format, using lsprofcalltree
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 02 Apr 2009 16:01:30 +0900] rev 8023
profiling: Adding a profiling.format config variable
Allows defining other output formats for profiling.
If an invalid format is given, output a warning and ignore it.
For now, only the standard 'text' value is supported.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 08 Apr 2009 14:19:41 +0200] rev 8022
profiling: Adding profiling.output config variable
If specified, outputs profiling data to the said file.
Prints to stderr by default
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 08 Apr 2009 14:18:20 +0200] rev 8021
profiling: dropping hotshot profiling. --profile as a unique profiling option
hotshot was an experimental module, which is broken for Python < 2.5
And even for Python >= 2.5 users, hotshot usage is discouraged: cProfile
(formerly lsprof) should be used instead.
Henrik Stuart <hg@hstuart.dk> [Tue, 07 Apr 2009 20:57:25 +0200] rev 8020
log: fix broken multiple user search
This fix also allows partial user matches so the full name and email
does not have to be written out in verbatim.
Martin Geisler <mg@daimi.au.dk> [Tue, 07 Apr 2009 17:42:55 +0200] rev 8019
i18n-da: updated, translated status help
Martin Geisler <mg@daimi.au.dk> [Tue, 07 Apr 2009 17:32:40 +0200] rev 8018
commands: describe "!" files as "missing" in help for status
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 06 Apr 2009 20:11:00 +0200] rev 8017
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 06 Apr 2009 19:48:11 +0200] rev 8016
raise RevlogError when parser can't parse the revlog index
Initial patch and test thanks to Nicolas Dumazet.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 06 Apr 2009 16:26:57 +0200] rev 8015
templatefilters: strings are iterators, but shouldn't be joined anyway
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 06 Apr 2009 10:51:45 +0200] rev 8014
templatefilters: split out jsonescape() function
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 06 Apr 2009 10:51:27 +0200] rev 8013
cmdutil: prevent code repetition by abstraction in changeset_templater
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 06 Apr 2009 10:53:01 +0200] rev 8012
tests: use unified diff in test-command-template for better error reports
Sune Foldager <cryo@cyanite.org> [Sat, 04 Apr 2009 18:12:43 +0200] rev 8011
util: don't overwrite os-specific functions with general ones
Martin Geisler <mg@daimi.au.dk> [Sun, 05 Apr 2009 13:20:30 +0200] rev 8010
convert: align option types in help text
Wagner Bruna <wbruna@yahoo.com> [Sun, 05 Apr 2009 05:12:43 -0300] rev 8009
commands: fix typo on flag description
Wagner Bruna <wbruna@yahoo.com> [Sun, 05 Apr 2009 05:11:46 -0300] rev 8008
commands, i18n: avoid untranslated strings as message parameters
Tobias Bell <tobias.bell@gmail.com> [Sat, 04 Apr 2009 20:16:01 +0200] rev 8007
commands: enable 'hg help' translation of extensions
Martin Geisler <mg@daimi.au.dk> [Sun, 05 Apr 2009 00:57:30 +0200] rev 8006
i18n-da: bring translations up-to-date
This incorporates the word-wrap changes made to help strings, as well
as new translations for the updated clone, push and pull help strings.
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:21:33 +0200] rev 8005
help: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:21:23 +0200] rev 8004
commands: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:20:10 +0200] rev 8003
zeroconf: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:19:52 +0200] rev 8002
win32text: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:19:42 +0200] rev 8001
win32mbcs: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:19:29 +0200] rev 8000
transplant: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:19:11 +0200] rev 7999
rebase: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:18:51 +0200] rev 7998
purge: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:18:41 +0200] rev 7997
patchbomb: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:18:27 +0200] rev 7996
parentrevspec: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:18:13 +0200] rev 7995
pager: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:18:03 +0200] rev 7994
mq: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:17:53 +0200] rev 7993
keyword: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:17:33 +0200] rev 7992
hgk: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:17:21 +0200] rev 7991
fetch: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:17:12 +0200] rev 7990
extdiff: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:16:55 +0200] rev 7989
convert: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:16:32 +0200] rev 7988
color: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:16:21 +0200] rev 7987
churn: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:15:37 +0200] rev 7986
children: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:15:23 +0200] rev 7985
bugzilla: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:15:10 +0200] rev 7984
bookmarks: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 21:09:43 +0200] rev 7983
Change double spaces to single spaces in help texts.
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 18:31:01 +0200] rev 7982
commands: explain when to use resolve -m
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 18:03:03 +0200] rev 7981
commands: clarify push help text
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 17:51:31 +0200] rev 7980
commands: make pull help point to the incoming command
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 17:44:18 +0200] rev 7979
commands, help: consistently write 'URL' in upper-case
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 17:41:22 +0200] rev 7978
help: expand command names in 'Url Paths' help text
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 17:33:42 +0200] rev 7977
commands: better merge help text
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 16:46:50 +0200] rev 7976
commands: removed redundant text in manifest help
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 00:32:06 +0200] rev 7975
commands: stress that commit is a local operation
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 00:27:55 +0200] rev 7974
commands: use single-quotes for 'hg help ...' hints
Matt Mackall <mpm@selenic.com> [Sat, 04 Apr 2009 12:28:13 -0500] rev 7973
convert: attempt to check repo type before checking for tool
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 04 Apr 2009 19:43:00 +0200] rev 7972
merge with crew-stable
Vsevolod Solovyov <vsevolod.solovyov@gmail.com> [Tue, 24 Mar 2009 23:28:55 +0000] rev 7971
Fix issue1495, corner case of adding empty files via patching
Matt Mackall <mpm@selenic.com> [Fri, 03 Apr 2009 11:50:42 -0500] rev 7970
Merge with crew-stable
Rocco Rutte <pdmef@gmx.net> [Sat, 04 Apr 2009 18:08:41 +0200] rev 7969
convert: simple fix for non-existent synthetic/mergepoint attributes
Marti Raudsepp <marti@juffo.org> [Sat, 04 Apr 2009 18:04:38 +0200] rev 7968
convert: handle comments starting with '#' in authormap files
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 04 Apr 2009 17:55:52 +0200] rev 7967
cmdutil: refactor handling of templating in show_changeset()
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 04 Apr 2009 17:46:11 +0200] rev 7966
templater: move stylemap function from hgweb to templater
Tobias Bell <tobias.bell@gmail.com> [Sat, 04 Apr 2009 10:51:52 +0200] rev 7965
i18n-de: translated record
Tobias Bell <tobias.bell@gmail.com> [Fri, 03 Apr 2009 22:35:07 +0200] rev 7964
i18n-de: translated archival.py, bundlerepo.py, changegroup.py and changelog.py
Fabian Kreutz <fabian.kreutz@starnet.fi> [Fri, 03 Apr 2009 11:57:05 +0300] rev 7963
i18n-de: docu for resolve
Marti Raudsepp <marti@juffo.org> [Sat, 04 Apr 2009 15:41:32 +0200] rev 7962
convert: fix authormap handling of lines without '='
Unpacking the result from str.split raises ValueError, not IndexError, if the
line does not contain a '='.
Marti Raudsepp <marti@juffo.org> [Sat, 14 Mar 2009 14:31:08 +0200] rev 7961
convert: Add testcase for convert authormap.
Alexander Solovyov <piranha@piranha.org.ua> [Wed, 01 Apr 2009 12:11:14 +0300] rev 7960
extensions loading: don't fail if path to extension ends with a '/'
Christian Ebert <blacktrash@gmx.net> [Sat, 04 Apr 2009 15:14:36 +0200] rev 7959
tests: guess lexer by filename for recent pygments
Recent pygments guess AntlrJavaLexer for the isolatin text, converted to ascii
by util.tolocal, which yields class="err". Guess lexer by extension instead.
Jeremy Whitlock <jcscoobyrs@gmail.com> [Thu, 02 Apr 2009 18:18:43 -0600] rev 7958
Fix how setup.py identifies the Mercurial version.
There is a problem with setup.py where it will not identify the Mercurial
version properly when not being ran in within a repository even if
mercurial/__version__.py exists.
To fix, use mercurial.__version__.version when available before defaulting
to "unknown". (Using mercurial.util.version() is not an option due to a
dependency issue where osutil can be referenced before it is built.)
Pavel Volkovitskiy <int@mtx.ru> [Thu, 02 Apr 2009 22:25:49 +0400] rev 7957
right way to check if file was in renamed directory, fixes import monotone
repos with renamed directories
Henrik Stuart <henrik.stuart@edlund.dk> [Thu, 02 Apr 2009 14:48:06 +0200] rev 7956
convert: added cvsnt mergepoint support
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Thu, 26 Mar 2009 16:58:50 +0200] rev 7955
rebase: keep original mq patch format (Issue1574)
Rebase now doesn't make assumptions about which format has been
used for a mq patch (git or normal).
Before finalizing a patch it keeps track of the original format,
by reading its header, and then restores the format when reimporting
it.
This way it also allows for having mixed styles.
Note: this version corrects a failure in the test