Steve Borho <steve@borho.org> [Mon, 15 Feb 2010 21:18:16 -0600] rev 10486
mergetools: improve configuration for several merge tools
* meld - provide labels for the three panes
* diffmerge - add registry key for detection, improve arguments
* beyond compare - add linux version
* winmerge - improve arguments
* araxis - add configuration, including registry key for detection
* misc - provide default priorities for more tools
Steve Borho <steve@borho.org> [Mon, 15 Feb 2010 20:28:42 -0600] rev 10485
hgrc.5: document use of environment variables on Windows
This feature was introduced in
c31ac3f7fd8f
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Feb 2010 22:39:36 +0100] rev 10484
url: correctly quote '/' in user and password embedded in urls
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 15 Feb 2010 16:34:59 -0200] rev 10483
i18n-pt_BR: synchronized with
44b4a2a31623
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Feb 2010 18:12:50 +0100] rev 10482
url: fix python < 2.6 with ssl installed
_GLOBAL_DEFAULT_TIMEOUT isn't related to ssl, but to python < 2.6, move it to
the right hunk.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 15 Feb 2010 09:57:11 +0100] rev 10481
bugzilla: revert unhelpful check-code changes, module is actually called MySQLdb
Brendan Cully <brendan@kublai.com> [Mon, 15 Feb 2010 00:16:59 -0800] rev 10480
mq: unify implementation of qinit and init -Q
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 16:10:05 -0500] rev 10479
bundle: exclude csets given in --base, unless they are in --rev (
issue1910)
Thanks Jesse Glick for the first version of this patch.
Martin Geisler <mg@lazybytes.net> [Mon, 15 Feb 2010 00:17:18 +0100] rev 10478
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 15 Feb 2010 00:14:16 +0100] rev 10477
Merge with default
Martin Geisler <mg@lazybytes.net> [Mon, 15 Feb 2010 00:12:10 +0100] rev 10476
mq: more instructive use of "--" in qguard help (
issue2040)
Brodie Rao <me+hg@dackz.net> [Sun, 14 Feb 2010 17:08:52 -0500] rev 10475
color: don't crash on invalid status codes (
issue2036)
If an unknown file with a newline appears in the status output, color
shouldn't raise a KeyError trying to parse second line in the filename.
Pascal Quantin <pascal.quantin@gmail.com> [Sun, 14 Feb 2010 23:17:28 +0100] rev 10474
Add progress extension to win32 default config file
Martin Geisler <mg@lazybytes.net> [Sun, 14 Feb 2010 20:28:49 +0100] rev 10473
test-interhg: test the extension
Wagner Bruna <wbruna@yahoo.com> [Sat, 06 Feb 2010 21:25:02 -0200] rev 10472
interhg: fixes regression introduced by
38170eeed18c
Martin Geisler <mg@lazybytes.net> [Sun, 14 Feb 2010 17:09:52 +0100] rev 10471
progress: use inline literals in help string
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 19:15:56 +0100] rev 10470
Fix test-pull under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 18:39:16 +0100] rev 10469
Fix test-push-validation under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 18:19:18 +0100] rev 10468
Fix test-share and test-subrepo under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 17:53:23 +0100] rev 10467
patch: remove useless copy, cleanup
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 11 Feb 2010 11:22:57 -0200] rev 10466
patch: separate reverse copy data (
issue1959)
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 15:45:12 +0100] rev 10465
Add test for progress extension
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 15:42:47 +0100] rev 10464
progress: make progress.refresh=0 always display the progress line
This has no effect in real world where progress.refresh in unlikely to be set
to zero, but is very useful in tests where all progress output is to be traced.
It failed on platforms with coarse time.time() granularity, like Windows+py25.
Brodie Rao <me+hg@dackz.net> [Sun, 14 Feb 2010 01:52:31 -0500] rev 10463
remove unused imports
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 13:58:30 +0100] rev 10462
progress: make use of progress.refresh
Martin Geisler <mg@lazybytes.net> [Sun, 14 Feb 2010 13:29:11 +0100] rev 10461
i18n: merge default into stable
Martin Geisler <mg@lazybytes.net> [Sun, 14 Feb 2010 13:28:34 +0100] rev 10460
Merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Sun, 14 Feb 2010 00:08:26 +0100] rev 10459
i18n-sv: nine basic commands translated
Translated the following commands:
bundle, branch, branches, cat, copy, grep, heads, identify, incoming
Also did a sync with
956498af9812.
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Feb 2010 13:05:51 +0100] rev 10458
Merge with crew-stable
David Soria Parra <dsp@php.net> [Tue, 09 Feb 2010 18:32:57 +0100] rev 10457
subrepo: make sure that the source path is stripped
Test by Patrick Mézard <pmezard@gmail.com>
Matt Mackall <mpm@selenic.com> [Sat, 13 Feb 2010 23:50:38 -0600] rev 10456
1.5 code freeze: merge default into stable
Brodie Rao <me+hg@dackz.net> [Sun, 07 Feb 2010 14:56:18 +0100] rev 10455
ui: add HGPLAIN environment variable for easier scripting
If HGPLAIN is set, the following settings are ignored when read from
hgrc files:
- ui.debug
- ui.fallbackencoding
- ui.quiet
- ui.traceback
- ui.verbose
- defaults.*
Localization is also disabled.
Equivalent options set via command line are honored.
Matt Mackall <mpm@selenic.com> [Sat, 13 Feb 2010 23:24:27 -0600] rev 10454
tests: update help for add
Brodie Rao <me+hg@dackz.net> [Sat, 13 Feb 2010 23:34:15 -0500] rev 10453
progress: make determinate bar more like wget progress bar
foo [ ] 0/58
foo [> ] 1/58
foo [=> ] 2/58
...
foo [=======================================================> ] 56/58
foo [========================================================> ] 57/58
foo [=========================================================>] 58/58
The bar now has a '>' character at the end. This indicates the direction,
is consistent with the indeterminate '<=>' bar, and looks much nicer.
Brodie Rao <me+hg@dackz.net> [Sat, 13 Feb 2010 23:34:20 -0500] rev 10452
progress: simplify spacejoin()
Matt Mackall <mpm@selenic.com> [Sat, 13 Feb 2010 23:20:17 -0600] rev 10451
check-code: two more rules
- no plain Exceptions
- complain about unmarked ui messages
timeless <timeless@mozdev.org> [Sun, 14 Feb 2010 00:46:13 +0200] rev 10450
progress: fix description
Matt Mackall <mpm@selenic.com> [Sat, 13 Feb 2010 17:37:44 -0600] rev 10449
parsers: fix some signed comparison issues
(spotted by Steve Borho)
Martin Geisler <mg@lazybytes.net> [Sat, 13 Feb 2010 22:10:31 +0100] rev 10448
commands: correct example in add help text
Martin Geisler <mg@lazybytes.net> [Sat, 13 Feb 2010 21:21:40 +0100] rev 10447
minirst: support line blocks
Martin Geisler <mg@lazybytes.net> [Sat, 13 Feb 2010 18:44:19 +0100] rev 10446
commands: add verbose example to help text for add
Martin Geisler <mg@lazybytes.net> [Sat, 13 Feb 2010 18:36:24 +0100] rev 10445
commands: support verbose help
Martin Geisler <mg@lazybytes.net> [Sat, 13 Feb 2010 18:11:08 +0100] rev 10444
minirst: report pruned container types
Martin Geisler <mg@lazybytes.net> [Sun, 04 Oct 2009 22:03:41 +0200] rev 10443
minirst: support containers
Text can be grouped into generic containers in reStructuredText:
.. container:: foo
This is text inside a "foo" container.
.. container:: bar
This is nested inside two containers.
The minirst parser now recognizes these containers. The containers are
either pruned completely from the output (included all nested blocks)
or they are simply un-indented. So if 'foo' and 'bar' containers are
kept, the above example will result in:
This is text inside a "foo" container.
This is nested inside two containers.
If only 'foo' containers are kept, we get:
This is text inside a "foo" container.
No output is made if only 'bar' containers are kept.
This feature will come in handy for implementing different levels of
help output (e.g., verbose and debug level help texts).
Martin Geisler <mg@lazybytes.net> [Sat, 13 Feb 2010 02:08:27 +0100] rev 10442
test-mq-qclone-http: hide port number
Augie Fackler <durin42@gmail.com> [Sat, 13 Feb 2010 09:49:06 -0600] rev 10441
progress: only reset state if finishing progress for the current topic
This prevents some visual glitches when doing a clone --pull locally.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Feb 2010 15:34:44 +0100] rev 10440
shrink: use progress API
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Feb 2010 09:55:28 +0100] rev 10439
progress: correctly handle empty progress topic
Steve Losh <steve@stevelosh.com> [Fri, 12 Feb 2010 19:59:09 -0500] rev 10438
util: add any() and all() functions for Python 2.4 compatibility
This patch adds these two very useful functions to the mercurial.util module,
because they are not present in Python 2.4.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Feb 2010 10:56:43 +0100] rev 10437
merge with mpm
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Fri, 12 Feb 2010 15:17:10 +0100] rev 10436
rebase: split line longer than 80 chars
Matt Mackall <mpm@selenic.com> [Sat, 13 Feb 2010 00:38:29 -0600] rev 10435
progress: add progress calls to changeset discovery
Augie Fackler <durin42@gmail.com> [Fri, 12 Feb 2010 21:53:32 -0600] rev 10434
Progress bar extension
Augie Fackler <durin42@gmail.com> [Wed, 10 Feb 2010 18:46:19 -0600] rev 10433
verify: call ui.progress()
Augie Fackler <durin42@gmail.com> [Tue, 09 Feb 2010 10:02:01 -0600] rev 10432
localrepo: provide indeterminate progress information while bundling
Augie Fackler <durin42@gmail.com> [Sun, 07 Feb 2010 17:44:30 -0600] rev 10431
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com> [Sun, 07 Feb 2010 12:00:40 -0600] rev 10430
localrepo: show indeterminate progress for incoming data
This has some quirks, like showing progress bars for importing
bundles, including during rebase.
Patrick Mezard <pmezard@gmail.com> [Sat, 13 Feb 2010 02:06:13 +0100] rev 10429
Merge with crew-stable
Giorgos Keramidas <keramida@ceid.upatras.gr> [Thu, 11 Feb 2010 23:15:42 +0200] rev 10428
convert: differentiate between IOError and OSError on commitctx()
The IOError exception is overloaded to mean 'this file was deleted in
the current commit'. Separate the code that handles IOError and file
deletion from general OSError exceptions. The latter are real errors,
but IOError is not always a throwable error.
This solves the accidental marking of files as 'deleted' in commits that
try to write for example in .hg/store/data revlogs that the current user
has no permission to modify (a normal OSError that should abort the
current commit).
Changed by pmezard: use getattr() to be on the safe side.
Patrick Mezard <pmezard@gmail.com> [Fri, 12 Feb 2010 21:30:24 +0100] rev 10427
test-mq-qclone: test --mq option
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 12 Feb 2010 16:04:00 +0100] rev 10426
merge with crew
Augie Fackler <durin42@gmail.com> [Sun, 07 Feb 2010 10:25:18 -0600] rev 10425
ui.progress: clarify termination requirement
Augie Fackler <durin42@gmail.com> [Sun, 07 Feb 2010 10:25:18 -0600] rev 10424
relink: properly use the progress API
Augie Fackler <durin42@gmail.com> [Tue, 09 Feb 2010 12:49:47 -0600] rev 10423
test-subrepo-svn: handle svn output changes gracefully
Augie Fackler <durin42@gmail.com> [Mon, 08 Feb 2010 08:18:49 -0600] rev 10422
util: fix trailing whitespace found by check-code
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 12 Feb 2010 15:46:48 +0100] rev 10421
ui: look before you leap on sys.stderr.closed (and look nicer)
f83291e5643e introduced a fix if sys.stdout.closed does not exist.
This change uses a getattr with default instead of hasattr (which just calls
getattr) and accessing the attribute.
Additionally it applies the same fix for sys.stderr.closed as this is not
available in the bpython shell (reported by Roger Gammans).
Matt Mackall <mpm@selenic.com> [Thu, 11 Feb 2010 17:44:01 -0600] rev 10420
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 11 Feb 2010 17:13:22 -0600] rev 10419
hgrc: update docs for the server section
Augie Fackler <durin42@gmail.com> [Thu, 11 Feb 2010 16:37:43 -0600] rev 10418
localrepo: add optional validation (defaults to off) for incoming changes
This verifies that all manifests are present for incoming changes,
and all files for those manifests are also present. This is a simple
first-pass, and could be better, but seems like a valuable thing to
have, as I've seen pushes in the past that propagated revlog corruption.
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 11 Feb 2010 12:02:48 -0200] rev 10417
branch: avoid using reserved tag names
Reported as Debian bug #552423.
Henrik Stuart <hg@hstuart.dk> [Thu, 11 Feb 2010 21:11:59 +0100] rev 10416
doc: add missing documentation for http_proxy.always
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 Feb 2010 20:42:20 +0100] rev 10415
url: proxy handling, simplify and correctly deal with IPv6
Thanks to Henrik for testing.
Matt Mackall <mpm@selenic.com> [Tue, 09 Feb 2010 14:12:34 -0600] rev 10414
streaming: actually change default
Matt Mackall <mpm@selenic.com> [Tue, 09 Feb 2010 14:12:22 -0600] rev 10413
fix up a bunch of check-code warnings
Matt Mackall <mpm@selenic.com> [Tue, 09 Feb 2010 13:53:24 -0600] rev 10412
check-code: import some pylint checks
Matt Mackall <mpm@selenic.com> [Wed, 10 Feb 2010 17:42:57 -0600] rev 10411
ssl: fix compatibility with pre-2.6 Python
Henrik Stuart <hg@hstuart.dk> [Wed, 10 Feb 2010 21:17:58 +0100] rev 10410
mq: remove unused import
Henrik Stuart <hg@hstuart.dk> [Wed, 10 Feb 2010 20:27:46 +0100] rev 10409
url: SSL server certificate verification using web.cacerts file (
issue1174)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Feb 2010 20:08:18 +0100] rev 10408
url: httplib.HTTPSConnection already handles IPv6 and port parsing fine
Brendan Cully <brendan@kublai.com> [Wed, 10 Feb 2010 10:58:11 -0800] rev 10407
mq: incorporate mq repo config when using --mq
For example, incoming should use the paths defined in .hg/patches/hgrc
instead of .hg/hgrc.
Mads Kiilerich <mads@kiilerich.com> [Tue, 09 Feb 2010 01:12:29 +0100] rev 10406
run-tests.py: skipped tests shouldn't change working directory
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 08 Feb 2010 20:51:23 +0100] rev 10405
whitespace cleanup
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Feb 2010 14:02:07 +0100] rev 10404
revlog.size: remove alternate implementation (revlogv0 specific)
it's only useful for revlogv0 anyway, revlogNG has the uncompressed size in
the index.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Feb 2010 13:48:52 +0100] rev 10403
pylintrc: string isn't deprecated, only some of its methods
Brendan Cully <brendan@kublai.com> [Mon, 08 Feb 2010 10:50:00 +0100] rev 10402
mq: make init -Q do what qinit -c did
Brendan Cully <brendan@kublai.com> [Mon, 08 Feb 2010 10:23:44 +0100] rev 10401
mq: add -Q option to all commands not in norepo
Adrian Buehlmann <adrian@cadifra.com> [Sun, 07 Feb 2010 23:07:58 +0100] rev 10400
setup.py: fixing version info for Windows hg.exe (py2exe)
Fixes
warning: py2exe: Version Info will not be included:
could not parse version number ...
which was seen when doing nightly builds. hg.exe files
of nightly builds did not have any version info resoure,
which may cause problems with installers.
Also setting a copyright string for the version resource
(was missing).
Patrick Mezard <pmezard@gmail.com> [Mon, 08 Feb 2010 23:47:23 +0100] rev 10399
test-branch-option: make it executable
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Feb 2010 02:53:41 +0100] rev 10398
tests: don't just silently strip port numbers
Steve Losh <steve@stevelosh.com> [Sun, 07 Feb 2010 10:47:54 -0500] rev 10397
mq: add parent node IDs to MQ patches on qrefresh/qnew
The goal of this patch is to add the IDs of the parents of applied MQ patches
into the patch file headers whenever qnew or qrefresh are run.
This will serve as a reminder of when the patches last applied cleanly and
will let us do more intelligent things in the future, such as:
* Resolve conflicts found when qpushing to a new location by merging
instead of simply showing rejects.
* Display better diffs of versioned MQ patches because we can tell how the
patched files have changed in the meantime.
Here are the new rules this patch introduces. They are checked in this order:
* If a patch currently has old, plain-style patch headers ("From:" and
"Date:") do not change the style or add any new headers.
* If the 'mq.plain' configuration setting is true, only plain-style
headers will be used for all MQ patches.
* qnew will initialize new patches with HG-style headers and fill in the
"# Parent" header with the appropriate parent node.
* qrefresh will refresh the "# Parent" header with the current parent of
the current patch.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 19:44:04 +0100] rev 10396
prepush: add more precise error messages
Part of the patch is from timeless@mozdev.org
- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
between discovery and the call to branchmap(). In that case, asking the user
to merge isn't helpful, since only remote has the changes.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 17:28:19 +0100] rev 10395
revlog: don't silently discard revlog flags on revlogv0
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 15:36:34 +0100] rev 10394
fix coding style (reported by pylint)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 15:06:26 +0100] rev 10393
add pylintrc with some mercurial specific configuration
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 14:52:28 +0100] rev 10392
localrepo: cleanup branch tip computation
Steve Borho <steve@borho.org> [Mon, 08 Feb 2010 06:24:34 -0600] rev 10391
hgrc.5: Fix a typo