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
Matt Mackall <mpm@selenic.com> [Mon, 08 Feb 2010 11:04:38 +0100] rev 10390
summary: various fixes, add a test
fix breakage from recent parseurl changes
fix reporting of resolved
fix reporting of update in certain cases
Sune Foldager <cryo@cyanite.org> [Mon, 08 Feb 2010 10:32:44 +0100] rev 10389
fix remaining hg.parseurl uses
Steve Borho <steve@borho.org> [Sun, 07 Feb 2010 05:34:22 -0600] rev 10388
win32: allow hgrc.d on Windows
Brendan Cully <brendan@kublai.com> [Mon, 08 Feb 2010 00:01:08 +0100] rev 10387
zeroconf: use DNS length field to safely skip unknown record types
Brendan Cully <brendan@kublai.com> [Sun, 07 Feb 2010 19:39:29 +0100] rev 10386
zeroconf: better fix for readName error
Stop parsing when an unknown type is seen, since it is impossible
to resynchronize on the stream.
Brendan Cully <brendan@kublai.com> [Sun, 07 Feb 2010 18:37:14 +0100] rev 10385
zeroconf: try utf-16 decoding if utf-8 fails
Brendan Cully <brendan@kublai.com> [Sun, 07 Feb 2010 18:06:52 +0100] rev 10384
import: import each patch in a file or stream as a separate change
Supports hg export <revrange>, mail messages, and mailboxes.
Does not support multiple patches in a single MIME attachment.
Closes issue167.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 07 Feb 2010 16:44:55 +0100] rev 10383
ui: look before you leap on sys.stdout.closed
Augie Fackler <durin42@gmail.com> [Sun, 07 Feb 2010 16:03:38 +0100] rev 10382
mq: fix deprecation mention, line length
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 07 Feb 2010 16:04:42 +0100] rev 10381
merge with mpm
Sune Foldager <cryo@cyanite.org> [Sun, 07 Feb 2010 15:57:16 +0100] rev 10380
addbranchrevs: fallback for older servers
Sune Foldager <cryo@cyanite.org> [Sun, 07 Feb 2010 15:23:46 +0100] rev 10379
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
Saint Germain <saintger@gmail.com> [Sat, 06 Feb 2010 19:14:37 +0100] rev 10378
subrepo: change default path in hgrc of subrepo after cloning
Previous behavior was to put in the cloned subrepos the path found in the original main repo.
However it isn't valid for relative path and it seems more logical to reference instead the subrepos
working copy path of the original main repo.
Matt Mackall <mpm@selenic.com> [Sun, 07 Feb 2010 15:31:53 +0100] rev 10377
streamclone: allow uncompressed clones by default
timeless <timeless@mozdev.org> [Sun, 07 Feb 2010 15:08:26 +0100] rev 10376
help: Improved body text
timeless@mozdev.org [Fri, 20 Nov 2009 14:37:36 +0200] rev 10375
commands: Try to improve help options text for basic commands
Mostly rewrite -r text
Martin Geisler <mg@lazybytes.net> [Sun, 07 Feb 2010 10:58:51 +0100] rev 10374
check-code.py: make help strings consistent
Mads Kiilerich <mads@kiilerich.com> [Sun, 07 Feb 2010 01:52:10 +0100] rev 10373
check-code.py: escape backslash
Augie Fackler <durin42@gmail.com> [Sun, 07 Feb 2010 07:37:05 -0600] rev 10372
qnew: ignore force option
This makes the default behavior the same as qnew --force, and
deprecates the force option.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 07 Feb 2010 15:09:02 +0100] rev 10371
strip apostrophes from an error messages
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 07 Feb 2010 14:53:17 +0100] rev 10370
mq: fix typo, thanks pmezard
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 07 Feb 2010 14:51:52 +0100] rev 10369
commands: annotate follows by default, separate -f/--file option
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Feb 2010 14:43:21 +0100] rev 10368
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Feb 2010 11:38:36 +0100] rev 10367
test-mq-qrefresh: test qrefresh when tip != qtip
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 06 Feb 2010 18:36:27 +0100] rev 10366
mq: remove qrefresh slow path (issue2025)
The slow path/fast path distinction has existed since mq was added to Mercurial
in 2006. The slow path was used whenever the refreshed revision wasn't the tip
Sune Foldager <cryo@cyanite.org> [Sun, 07 Feb 2010 14:29:07 +0100] rev 10365
interpret repo#name url syntax as branch instead of revision
Previously, the name part of an repo#name url was interpreted as a
revision, similar to using the --rev option. Now it is instead looked
up as a branch first, and if that succeeds all the heads of the branch
will be processed instead of just its tip-most head. If the branch
lookup fails, it will be assumed to be an revision as before (e.g. for
tags).
Brodie Rao <me+hg@dackz.net> [Sun, 07 Feb 2010 14:01:43 +0100] rev 10364
dispatch: provide help for disabled extensions and commands
Before a command is declared unknown, each extension in hgext is searched,
starting with hgext.<cmdname>. If there's a matching command, a help message
suggests the appropriate extension and how to enable it.
Every extension could potentially be imported, but for cases like rebase,
relink, etc. only one extension is imported.
For the case of "hg help disabledext", if the extension is in hgext, the
extension description is read and a similar help suggestion is printed.
No extension import occurs.
Brodie Rao <me+hg@dackz.net> [Sun, 07 Feb 2010 11:32:08 +0100] rev 10363
extensions: refactor disabled()
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Sun, 07 Feb 2010 14:06:05 +0100] rev 10362
mq: don't warn on qpush against a branch head
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Sun, 07 Feb 2010 13:49:52 +0100] rev 10361
mq: deprecate qinit and qcommit
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Sun, 07 Feb 2010 12:34:02 +0100] rev 10360
mq: deprecate qsave, qrestore and related options
Brendan Cully <brendan@kublai.com> [Tue, 23 Dec 2008 09:46:40 -0800] rev 10359
mq: add --mq option to some commands
This causes them to operate on the queue repository as qcommit does, and
is nicer than hg -R $(hg root)
Sune Foldager <cryo@cyanite.org> [Sat, 06 Feb 2010 20:24:51 +0100] rev 10358
pull: with -u and -r, update to the first revision given
This makes pull consistent with clone. The actual change is in
mercurial.hg.parseurl, changing its checkout result, which is only
used for pull.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 07 Feb 2010 10:01:55 +0100] rev 10357
localrepo: inline single-use nested function
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 07 Feb 2010 09:58:41 +0100] rev 10356
localrepo: unify changegroup and changegroupsubset code paths a bit
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 07 Feb 2010 00:51:59 +0100] rev 10355
merge: add hints about the use of 'hg heads' to find the rev to merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 07 Feb 2010 00:43:24 +0100] rev 10354
prepush: warn about every new outgoing named branch, not just the first
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 07 Feb 2010 00:43:22 +0100] rev 10353
prepush: rename variables, refactor
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 06 Feb 2010 10:51:50 +0100] rev 10352
rebase: add --detach option to detach intermediate revisions (issue1950)
When rebasing an intermediate revision, rebase keeps a parent relationship
with the original parent. This option forces the removal of this relationship.
In more depth, it 'fakes' null merges between the target revision and the
ancestors of source, dropping every change from the ancestors.
The result is that every change in source and its descendants will be rebased,
ignoring the changes in its ancestors.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sun, 31 Jan 2010 13:30:17 +0100] rev 10351
rebase: refactoring
Separate rebase-specific functions, in order to provide a better base to
extend rebase's capabilities.
Note that this will be useful especially to share functions with 'adapt'.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 19:38:39 +0100] rev 10350
commands: do all branch heads by default, demote topological to -t/--topo
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 19:33:40 +0100] rev 10349
commands: actually implement --closed for topological heads
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 19:06:02 +0100] rev 10348
commands: externalize branchheads so we can do it for all branches at once
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 19:33:33 +0100] rev 10347
commands: move inactive/closed out so they can have more effect
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 19:33:28 +0100] rev 10346
commands: don't do too much work for error messages
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 19:00:50 +0100] rev 10345
commands: allow --closed even for topological heads displays
But it actually only starts working later on.
Patrick Mezard <pmezard@gmail.com> [Sat, 06 Feb 2010 16:50:00 +0100] rev 10344
util: make spawndetached() handle subprocess early terminations
The file-based synchronization introduced by e22695b4472f hangs when the child
process fails before terminating the handshake, which the previous pipe-based
version handled correctly. To fix this, the parent polling loop was fixed to
detect premature terminations of the child process.
Henrik Stuart <hg@hstuart.dk> [Sat, 06 Feb 2010 17:31:54 +0100] rev 10343
zeroconf: do not try to encode encoded strings (issue1942)
Henrik Stuart <hg@hstuart.dk> [Sat, 06 Feb 2010 17:31:49 +0100] rev 10342
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk> [Sat, 06 Feb 2010 17:37:52 +0100] rev 10341
merge with main
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Feb 2010 17:11:18 +0100] rev 10340
merge with main
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 05 Feb 2010 18:50:08 +0100] rev 10339
fix spaces/identation issues
Matt Mackall <mpm@selenic.com> [Sat, 06 Feb 2010 15:21:48 +0100] rev 10338
Merge with crew
Brendan Cully <brendan@kublai.com> [Sat, 06 Feb 2010 15:18:52 +0100] rev 10337
Merge with crew
Brendan Cully <brendan@kublai.com> [Sat, 06 Feb 2010 15:18:36 +0100] rev 10336
run-tests: kill daemons on ^C with -j.
This is not perfect, but the problem is fundamentally racy.
Steve Losh <steve@stevelosh.com> [Sat, 06 Feb 2010 08:57:57 -0500] rev 10335
commands: fix more changeset header information in 'hg help export'
Steve Losh <steve@stevelosh.com> [Sat, 06 Feb 2010 08:28:39 -0500] rev 10334
commands: fix the list of changeset header information in 'hg help export'
Christian Ebert <blacktrash@gmx.net> [Wed, 03 Feb 2010 16:09:19 +0000] rev 10333
graphlog: remove unused import
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Feb 2010 20:58:42 +0000] rev 10332
keyword: fix utcdate filter
So far the utcdate filter only omitted the timezone,
now it actually converts to utc.
Thanks to Kevin Grover for pointing out the issue.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 12:47:33 +0100] rev 10331
commands: always order heads recent to oldest
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 12:47:24 +0100] rev 10330
commands: fix up stupidly untested heads simplification
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 12:47:17 +0100] rev 10329
revlog: fix up previously stupid API change
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 11:29:48 +0100] rev 10328
commands: simplify heads a little bit before I start hacking it up
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 11:29:23 +0100] rev 10327
localrepo: add a quick docstring for localrepo.branchmap()
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 11:28:03 +0100] rev 10326
commands: deprecate the heads -a option
Hopefully we can remove it entirely in two releases or so.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 11:27:22 +0100] rev 10325
revlog: add a fast path for checking ancestry
David Soria Parra <dsp@php.net> [Sat, 06 Feb 2010 10:23:18 +0100] rev 10324
subrepo: correct copyright
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 05 Feb 2010 18:46:22 +0100] rev 10323
record: function variable naming & signature cleanup.
No functionality change. All tests pass.
Vsevolod Solovyov <vsevolod.solovyov@gmail.com> [Fri, 05 Feb 2010 19:10:26 +0100] rev 10322
add options dict to localrepo.store.opener and use it for defversion
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 05 Feb 2010 18:23:01 +0100] rev 10321
merge with main
Henri Wiechers <hwiechers@gmail.com> [Fri, 05 Feb 2010 17:02:27 +0200] rev 10320
localrepo: minor formatting - remove double space
Henri Wiechers <hwiechers@gmail.com> [Mon, 01 Feb 2010 22:29:11 +0200] rev 10319
coverage.py: fixed syntax error
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 05 Feb 2010 17:24:38 +0100] rev 10318
merge with stable
Augie Fackler <durin42@gmail.com> [Fri, 05 Feb 2010 10:16:52 -0600] rev 10317
zeroconf: gethostbyaddr may also fail with socket.herror
Steve Borho <steve@borho.org> [Fri, 05 Feb 2010 07:07:53 -0600] rev 10316
Merge with stable
Steve Borho <steve@borho.org> [Fri, 05 Feb 2010 04:33:08 -0600] rev 10315
commands: label from user is in local encoding
repo.branchtags().keys() are in UTF-8, so the label should be converted to UTF-8
before checking for a naming conflict. Keep the original label for ui.status()
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Feb 2010 09:13:59 +0100] rev 10314
merge with main
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Feb 2010 09:05:20 +0100] rev 10313
copies: check if revisions are related (bug found with pylint)
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 11:34:44 -0600] rev 10312
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 09:34:35 -0600] rev 10311
Added signature for changeset 4aa619c4c2c0
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 09:34:35 -0600] rev 10310
Added tag 1.4.3 for changeset 4aa619c4c2c0
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 09:18:58 -0600] rev 10309
Merge with i18n
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 09:18:25 -0600] rev 10308
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 01 Feb 2010 11:11:30 -0200] rev 10307
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 01 Feb 2010 11:10:43 -0200] rev 10306
i18n-pt_BR: synchronized with b08ffd27dfc8
Martin Geisler <mg@lazybytes.net> [Sun, 31 Jan 2010 16:01:20 +0100] rev 10305
Merge with stable.
Georg Brandl <georg@python.org> [Sat, 30 Jan 2010 19:49:52 +0100] rev 10304
i18n: fix typo in German translation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 31 Jan 2010 02:34:50 +0900] rev 10303
i18n-ja: synchronized with e7727a545c48
Matt Mackall <mpm@selenic.com> [Sun, 31 Jan 2010 13:43:33 -0600] rev 10302
Merge with stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 24 Jan 2010 20:51:53 +0100] rev 10301
templates: rename `Last change' column in hgwebdir repository list.
This patch changes column headers in the templates that previously
said `Last change' to `Last modified'. Neither code nor functionality
are changed other than that.
For some time now, I have been annoyed by the fact the `Last change'
column didn't list the age of the youngest changeset in the
repository, or at least tip. It just occurred to me that this is
because the wording is slightly misleading; what the column in fact
lists is when the repository was last *modified*, that is, when
changesets was last added or removed from it.
The word `change' can be understood as referring to the changeset
itself. Using `changed' would be ever so slightly less
amigous. However, the standard nomenclature in this case is
`modification date' and `Last modified', which is incidentally entirely
unambigous. Hence, `Last modified' is the wording used.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 10 Dec 2009 17:21:31 +0900] rev 10300
run-tests: split tests/blacklist in tests/blacklists/*
Following discussions with Gilles Morris [1], it seems that it is preferable to
use several blacklist files in a blacklists/ directory. It is easier to add an
unversioned file for experiments than modifying a tracked file.
Also fall back to a simpler syntax, giving up ConfigParser, now that section
names are not needed anymore.
And allow --blacklist parameter to be a complete path, instead of only one
of the filenames contained in tests/blacklists/
[1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 31 Jan 2010 18:02:16 +0100] rev 10299
subrepo: fix errors reported by pylint
Matt Mackall <mpm@selenic.com> [Sun, 31 Jan 2010 12:19:52 -0600] rev 10298
copies: revert d1cd09bb4d18
The behavior of rebase both before and after the fix was actually
incorrect, and this change regressed other parts of copy behavior.
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 23:13:45 -0600] rev 10297
Merge with i18n
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 23:13:10 -0600] rev 10296
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 23:07:28 -0600] rev 10295
config: handle short continuations (issue1999)
Thanks to Greg Ward for spotting and testing
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:45:46 -0600] rev 10294
copies: fix issue1994
Unscramble divergence test
Jens Bäckman <jens.backman@gmail.com> [Mon, 18 Jan 2010 19:57:36 +0100] rev 10293
i18n-sv: Translated twelve basic commands
The help text and output strings surrounding these commands are now
available in glorious Swedish: outgoing, paths, recover, rename,
resolve, revert, rollback, root, showconfig, tag, tags, tip
This also syncs with 279c8a73fde1.
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:45:04 -0600] rev 10292
bugzilla: lowercase mysqldb var
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:44:54 -0600] rev 10291
check-code: del isn't a function
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:44:45 -0600] rev 10290
check-code: fix copyright date
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:44:36 -0600] rev 10289
test-minirst: hide trailing whitespace from check-code
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:44:25 -0600] rev 10288
zeroconf: flag third-party Zeroconf.py for ignore in check-code
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:44:18 -0600] rev 10287
check-code: add some ignore hints
Matt Mackall <mpm@selenic.com> [Mon, 25 Jan 2010 01:23:34 -0600] rev 10286
check-code: check thyself
Martin Geisler <mg@lazybytes.net> [Fri, 29 Jan 2010 01:04:38 +0100] rev 10285
Merge with stable.
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Jan 2010 11:27:09 +0000] rev 10284
patchbomb: document [patchbomb] config section for addresses
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Jan 2010 10:38:29 +0000] rev 10283
hgrc.5: whether bcc is prompted for is up to the extension
There is no code in mail.py that forbids an extension to prompt for bcc.
Matt Mackall <mpm@selenic.com> [Mon, 25 Jan 2010 00:05:27 -0600] rev 10282
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com> [Mon, 25 Jan 2010 00:05:22 -0600] rev 10281
Introduce check-code.py
check-code is a simple regex-based framework for checking our code and
tests for common style and portability errors. Currently, it knows a
fair amount about our Python and C style, and a little about common
shell script portability problems.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Jan 2010 18:44:12 +0100] rev 10280
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 23 Jan 2010 02:03:42 +0100] rev 10279
test-encode: Use tr chacter classes instead of character ranges
Solaris ...
Martin Geisler <mg@lazybytes.net> [Sat, 23 Jan 2010 16:55:46 +0100] rev 10278
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 23 Jan 2010 16:54:53 +0100] rev 10277
templates: do not add "ago" twice
After 1d75c683ada1, "ago" is added by the ago template filter.
Martin Geisler <mg@lazybytes.net> [Fri, 22 Jan 2010 17:15:58 +0100] rev 10276
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 22 Jan 2010 17:13:55 +0100] rev 10275
tests: Don't use $PWD
$PWD doesn't work with solaris sh - use `pwd` instead
David Soria Parra <dsp@php.net> [Wed, 20 Jan 2010 23:23:18 +0100] rev 10274
mq: Do not translate import message that are appended to commits.
We should not translate the "imported patch" message. The translated message
confuses the detection whether the user has not updated the commit message yet.
We try to avoid to translate generated commit messages.
Patrick Mezard <pmezard@gmail.com> [Thu, 21 Jan 2010 13:26:26 +0100] rev 10273
subrepo: handle svn externals and meta changes (issue1982)
- Detect changes to meta on regular and external entries
- Do not try to commit external entries
Patrick Mezard <pmezard@gmail.com> [Thu, 21 Jan 2010 15:13:40 +0100] rev 10272
subrepo: svn xml output is much easier to parse
That's especially true with status flags: there are different fields and values
for regular changes, meta changes, externals changes and externals meta
changes.
Patrick Mezard <pmezard@gmail.com> [Thu, 21 Jan 2010 15:13:03 +0100] rev 10271
subrepo: make svn use C locale for portability
My reasons to do c2e2a5e6c36b were wrong. We want to have non-localized svn
output while preserving current locale for input arguments and svn internals.
This is achieved by setting LC_MESSAGE=C.
Martin Geisler <mg@lazybytes.net> [Wed, 20 Jan 2010 16:58:48 +0100] rev 10270
Merge with stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 20 Jan 2010 13:50:06 +0900] rev 10269
summary: L10N messages hide clean-ness of workdir from 'hg summary'
'hg summary' recognizes workdir as clean by searching for 'clean' is
in own output text. But 'clean' is one of I18N target texts, so 'hg
summary --quiet' behaves incorrectly in non-English locale.
Martin Geisler <mg@lazybytes.net> [Wed, 20 Jan 2010 16:48:20 +0100] rev 10268
mercurial.el: add forgotten version number
The number was accidentally removed in the change from GPLv2 to GPLv2+
in 25e572394f5c.
Mads Kiilerich <mads@kiilerich.com> [Sun, 17 Jan 2010 01:53:04 +0100] rev 10267
test-subrepo-svn: remove bashism
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jan 2010 09:49:15 +0100] rev 10266
Merge with crew-stable
Mads Kiilerich <mads@kiilerich.com> [Sun, 17 Jan 2010 01:52:36 +0100] rev 10265
test-patch-offset: Don't use unified diff
Solaris diff -u likes to be "helpful" and tell that "No differences encountered"
Matt Mackall <mpm@selenic.com> [Tue, 19 Jan 2010 22:45:09 -0600] rev 10264
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 19 Jan 2010 22:20:08 -0600] rev 10263
Update license to GPLv2+
Matt Mackall <mpm@selenic.com> [Tue, 19 Jan 2010 22:20:05 -0600] rev 10262
copies: speed up copy detection
On some large repos, copy detection could spend > 10min using
fctx.ancestor() to determine if file revisions were actually related.
Because ancestor must traverse history to the root to determine the
GCA, it was doing a lot more work than necessary. With this
replacement, same status -r a:b takes ~3 seconds.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 28 Dec 2009 12:14:26 +0900] rev 10261
hgweb: request: strip() form values
Entering "<correct_cset_hash> " in the search form was not returning anything.
This happens relatively often, due to HTML formatting: when copy/pasting a cset
hash from the web, selection might contain surrounding spaces.
Patrick Mezard <pmezard@gmail.com> [Mon, 18 Jan 2010 22:59:32 +0100] rev 10260
templatekw: fix extras, manifest and showlist args (issue1989)
Removing the explicit parameters from keywords signature is easier than copying
and reproducing the original argument list.
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 18 Jan 2010 15:38:31 -0200] rev 10259
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 18 Jan 2010 15:37:45 -0200] rev 10258
i18n-pt_BR: synchronized with 279c8a73fde1
Martin Geisler <mg@lazybytes.net> [Sat, 16 Jan 2010 02:40:00 +0100] rev 10257
Merge with stable
Greg Ward <greg-hg@gerg.ca> [Wed, 13 Jan 2010 22:05:06 -0500] rev 10256
share: be more explicit about the dangers of rollback.
Mads Kiilerich <mads@kiilerich.com> [Wed, 06 Jan 2010 03:27:15 +0100] rev 10255
mercurial.spec: Alignment with AIX spec by Jim Hague
* Require Python 2.4 or later
* Note that hgk uses tk - but don't require it
* Remove bashism to support ksh
* Install mq.el
* Handle uncompressed man pages
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 16 Jan 2010 02:33:06 +0100] rev 10254
hgweb: changenav: separate pages before and after the current position
This should allow styles to customize more precisely navigation bar,
for example inserting a cursor to show where we are in the navigation bar.
Jim Hague <jim.hague@acm.org> [Wed, 06 Jan 2010 18:03:33 +0000] rev 10253
Work around AIX shell builtin printf not handling \NNN.
On AIX, ksh builtin printf does not understand \NNN. Some tests use this
to generate test data, and so fail on AIX. Rework these tests to use python
to generate the correct characters. This fixes the tests on AIX and should
be more generally portable.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 15 Jan 2010 21:32:53 +0100] rev 10252
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 15 Jan 2010 21:08:04 +0100] rev 10251
subrepo: fix merging of already merged subrepos (issue1986)
This fixes a bug seen when merging a main repo which contains a subrepo when
both repos have been merged before. Each repo (main and sub) has two
branches, both of which have been merged before.
In a subrepo, if the revision to merge to is an ancestor of the current rev,
then the merge should be a noop.
Test provided by Steve Losh.
Patrick Mezard <pmezard@gmail.com> [Fri, 15 Jan 2010 10:38:11 +0100] rev 10250
Merge with crew-stab le
Patrick Mezard <pmezard@gmail.com> [Fri, 15 Jan 2010 09:50:52 +0100] rev 10249
cmdutil: expand style paths (issue1948)
Fix suggested by Andrea Riciputi <andrea.riciputi@gmail.com>
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:43:14 +0100] rev 10248
hgweb: add a test for search logs
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:42:10 +0100] rev 10247
hgweb: add less/more links for search logs (issue1972)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:28:21 +0100] rev 10246
hgweb: add less/more links to shortlog/filelog nav
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:07:34 +0100] rev 10245
hgweb: make graph page size equal to shortlog
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 13 Jan 2010 12:00:06 +0100] rev 10244
merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 13 Jan 2010 11:53:55 +0100] rev 10243
ui: just return it if it's already a bool
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 13 Jan 2010 11:57:32 +0100] rev 10242
demandimport: ignore _winreg (used in python-2.7 mimetypes)
Patrick Mezard <pmezard@gmail.com> [Tue, 12 Jan 2010 22:20:21 +0100] rev 10241
shrink-revlog: add --dry-run option
Patrick Mezard <pmezard@gmail.com> [Sun, 10 Jan 2010 18:13:34 +0100] rev 10240
cmdutil: hide child window created by win32 spawndetached()
Hiding the child process window is not strictly necessary but it avoids opening
an empty shell window when running hg serve as well as a task in the task bar.
The window is hidden after the process is already started causing a single
flicker.
Patrick Mezard <pmezard@gmail.com> [Wed, 06 Jan 2010 21:11:58 +0100] rev 10239
Find right hg command for detached process
On Windows, Mercurial can be run from the python script of from a frozen
executable. In the first case, we have to call the python interpreter since the
script is not executable. Frozen executable can be called directly.
Fix 3/3 for issue421
Patrick Mezard <pmezard@gmail.com> [Wed, 06 Jan 2010 21:11:58 +0100] rev 10238
cmdutil: replace unix pipe handshake with file lock
The pipe handshake cannot be implemented with Windows detached process, which
disables handle inheritance.
Fix 2/3 for issue421
Patrick Mezard <pmezard@gmail.com> [Fri, 10 Apr 2009 21:20:25 +0200] rev 10237
serve: add and use portable spawnvp replacement
There is no standard python command to really detach a process under Windows.
Instead we use the low level API wrapped by subprocess module with all
necessary options to avoid any kind of context inheritance. Unfortunately, this
version still opens a new window for the child process.
The following have been tried:
- os.spawnv(os.P_NOWAIT): works but the child process is killed when parent
console terminates.
- os.spawnv(os.P_DETACH): works on python25, hang on python26 when writing to
the hgweb output socket.
- subprocess.CreateProcess() hack without shell mode: similar to
os.spawnv(os.P_DETACH).
Fix 1/3 for issue421
Greg Ward <greg-hg@gerg.ca> [Tue, 12 Jan 2010 15:12:53 +0100] rev 10236
shrink-revlog: help/doc tweaks
- make it look right in 'hg help extensions'
- clarify --revlog option
- add a main program to tell users this is no longer a standalone script
Pascal Quantin <pascal.quantin@gmail.com> [Thu, 07 Jan 2010 23:04:53 +0100] rev 10235
Add shrink-revlog.py to win32 installer
Patrick Mezard <pmezard@gmail.com> [Mon, 11 Jan 2010 21:15:53 +0100] rev 10234
shrink-revlog: make it work on windows (issue1976)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Jan 2010 22:41:49 +0100] rev 10233
merge main with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Jan 2010 22:41:24 +0100] rev 10232
merge crew together
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Jan 2010 22:41:02 +0100] rev 10231
merge stable together
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Jan 2010 21:45:28 +0100] rev 10230
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Jan 2010 21:44:04 +0100] rev 10229
shrink-revlog: avoid cryptic error when used as an extension
When shrink-revlog is used as an extension, it would produce an error when
switching back to stable because the script will try to execute itself.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Jan 2010 21:40:19 +0100] rev 10228
transaction: initialize self.journal to None after deletion
This avoid a warning when having an empty transaction, where hg would try to
delete the journal twice.
Jens Bäckman <jens.backman@gmail.com> [Sat, 09 Jan 2010 23:12:21 +0100] rev 10227
subrepo: fix typo in help text
Martin Geisler <mg@lazybytes.net> [Sat, 09 Jan 2010 23:16:48 +0100] rev 10226
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 09 Jan 2010 23:16:36 +0100] rev 10225
relink: ensure consistent candidate order
Jens Bäckman <jens.backman@gmail.com> [Sat, 09 Jan 2010 23:03:33 +0100] rev 10224
commands: fix typo in help text
Georg Brandl <georg@python.org> [Sat, 09 Jan 2010 10:47:47 +0100] rev 10223
color: colorize output of hg resolve -l
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Jan 2010 20:56:28 +0100] rev 10222
color: improve coding style
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Jan 2010 00:25:56 +0100] rev 10221
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 08 Jan 2010 23:15:24 +0100] rev 10220
ui: display progress with decimal notation
Patrick Mezard <pmezard@gmail.com> [Fri, 08 Jan 2010 23:15:22 +0100] rev 10219
win32: close file when leaving _getfileinfo()
Siddharth Agarwal <sid.bugzilla@gmail.com> [Fri, 08 Jan 2010 18:48:39 +0530] rev 10218
Add support for relinking on Windows.
Test and minor code change by Patrick Mézard <pmezard@gmail.com>
Patrick Mezard <pmezard@gmail.com> [Fri, 08 Jan 2010 22:30:07 +0100] rev 10217
Add test for relink extension
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 07 Jan 2010 16:06:36 +0100] rev 10216
contrib: small documentation fixes in shrink-revlog.py
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 07 Jan 2010 16:06:12 +0100] rev 10215
contrib: turn shrink-revlog.py into an extension
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 07 Jan 2010 15:12:16 +0100] rev 10214
contrib: fix error handling in shrink-revlog.py to be more hg-like
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 07 Jan 2010 15:07:18 +0100] rev 10213
contrib: use ui to write in shrink-revlog.py
Martin Geisler <mg@lazybytes.net> [Tue, 05 Jan 2010 22:41:39 +0100] rev 10212
Merge with stable.
Mads Kiilerich <mads@kiilerich.com> [Tue, 05 Jan 2010 03:20:45 +0100] rev 10211
Update test and man page for multiple matching encode/decode filters
Greg Ward <greg-hg@gerg.ca> [Tue, 05 Jan 2010 15:07:38 -0500] rev 10210
commands: fix help string for pull -u and unbundle -u.
They update to new branch head, not new tip -- same as 'hg update'.
Pascal Quantin <pascal.quantin@gmail.com> [Mon, 04 Jan 2010 23:45:45 +0100] rev 10209
Update copyright year to 2010
Steve Borho <steve@borho.org> [Tue, 05 Jan 2010 10:20:28 -0600] rev 10208
httprepo: always store the response url (issue1968)
Fixes a regression caused by 54b518fc6671
Martin Geisler <mg@lazybytes.net> [Mon, 04 Jan 2010 01:11:18 +0100] rev 10207
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 04 Jan 2010 01:09:23 +0100] rev 10206
commands: update copyright year to 2010
Patrick Mezard <pmezard@gmail.com> [Sun, 03 Jan 2010 19:13:55 +0100] rev 10205
test-convert-svn-branches: filter unwanted output
Windows cmd.exe emits a different message than sh:
"""
foobar is not recognized as an internal or external command,
operable program or batch file.
"""
Filter it.
Patrick Mezard <pmezard@gmail.com> [Sun, 03 Jan 2010 20:36:30 +0100] rev 10204
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 03 Jan 2010 19:47:07 +0100] rev 10203
patch: explicitely close input patch files when leaving
If applydiff() raises an exception, the opened patch file is kept alive in the
exception context. If it is a temporary file (for instance supplied by import
command with stdin input), Windows cannot clean it up.
Patrick Mezard <pmezard@gmail.com> [Sun, 03 Jan 2010 18:16:42 +0100] rev 10202
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 03 Jan 2010 17:26:39 +0100] rev 10201
hgweb: improve IIS PATH_INFO fix ee8af8a4d905 (issue1580)
Copy PHP IIS detection.
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Jan 2010 18:14:45 +0100] rev 10200
Minor svn conversion tests cleanup
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Jan 2010 16:42:00 +0100] rev 10199
subrepo: force en_US.UTF-8 locale when calling svn
Parser only knows about en_US output. Forcing the encoding to UTF-8 might not
be the best thing to do since the caller may receive some of the subversion
output, but at least it should prevent conversion errors from svn client.
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Jan 2010 16:03:29 +0100] rev 10198
test-subrepo-svn: normalize OS specific path separator
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Jan 2010 16:03:25 +0100] rev 10197
subrepo: normalize svn output line-endings
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Jan 2010 15:48:05 +0100] rev 10196
test-subrepo-svn: avoid pushd/popd
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 18:10:10 -0600] rev 10195
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 17:58:35 -0600] rev 10194
Added signature for changeset 296a0b14a686
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 17:58:34 -0600] rev 10193
Added tag 1.4.2 for changeset 296a0b14a686
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 15:45:48 -0600] rev 10192
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 21:49:05 +0100] rev 10191
mq: qdiff with the same diff options than qrefresh (issue1350)
Specifically, if current patch is a git patch and mq.git=keep, diff in git
mode.
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 21:21:34 +0100] rev 10190
mq: upgrade to git patch when necessary (issue767)
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 20:54:05 +0100] rev 10189
patch: support diff data loss detection and upgrade
In worst case, generating diff in upgrade mode can be two times more expensive
than generating it in git mode directly: we may have to regenerate the whole
diff again whenever a git feature is detected. Also, the first diff attempt is
completely buffered instead of being streamed. That said, even without having
profiled it yet, I am convinced we can fast-path the upgrade mode if necessary
were it to be used in regular diff commands, and not only in mq where avoiding
data loss is worth the price.
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 20:52:05 +0100] rev 10188
Merge with crew-stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 15:33:51 -0600] rev 10187
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 19:53:05 +0100] rev 10186
mq: preserve --git flag when folding patches
Without this, folding a git patch into a regular one downgrades the resulting
patch to a regular patch.
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 19:53:05 +0100] rev 10185
mq: preserve --git flag when merging patches
Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 19:53:05 +0100] rev 10184
mq: stop caching and sharing diff options
Several mq commands mutate the shared options which causes hard to track bugs
when multiple calls are combined.
Martin Geisler <mg@lazybytes.net> [Fri, 01 Jan 2010 18:46:24 +0100] rev 10183
subrepo: mark string for translation and fix case
Pascal Quantin <pascal.quantin@gmail.com> [Fri, 01 Jan 2010 15:30:21 +0100] rev 10182
Add RelaxNG schema to win32 installer
Martin Geisler <mg@lazybytes.net> [Fri, 01 Jan 2010 17:11:48 +0100] rev 10181
Merge with mpm
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 14:29:36 +0100] rev 10180
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 13:58:30 +0100] rev 10179
copies: don't report copies with unrelated branch
Augie Fackler <durin42@gmail.com> [Thu, 31 Dec 2009 13:16:03 -0600] rev 10178
subrepo: Subversion support
Augie Fackler <durin42@gmail.com> [Thu, 31 Dec 2009 17:10:03 -0600] rev 10177
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com> [Thu, 31 Dec 2009 17:19:30 -0600] rev 10176
dirstate: don't check state of subrepo directories
Augie Fackler <durin42@gmail.com> [Thu, 31 Dec 2009 16:30:34 -0600] rev 10175
subrepo: load from a context where the subrepo exists
Matt Mackall <mpm@selenic.com> [Thu, 31 Dec 2009 17:25:46 -0600] rev 10174
subrepo: fix includes support in .hgsub
Martin Geisler <mg@lazybytes.net> [Thu, 31 Dec 2009 00:03:19 +0100] rev 10173
Merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 30 Dec 2009 20:39:59 -0200] rev 10172
i18n: update po files for 703db37d186b and 0ddbc0299742
Matt Mackall <mpm@selenic.com> [Wed, 30 Dec 2009 14:32:37 -0600] rev 10171
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Wed, 30 Dec 2009 20:59:23 +0100] rev 10170
Merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 30 Dec 2009 20:37:53 +0100] rev 10169
Merge with i18n.
Martin Geisler <mg@lazybytes.net> [Wed, 30 Dec 2009 20:36:48 +0100] rev 10168
Merge with i18n-stable
Martin Geisler <mg@lazybytes.net> [Wed, 30 Dec 2009 03:39:34 +0100] rev 10167
i18n: merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 30 Dec 2009 03:26:49 +0100] rev 10166
i18n-da: import strings from default branch
Jens Bäckman <jens.backman@gmail.com> [Tue, 29 Dec 2009 00:47:23 +0100] rev 10165
i18n-sv: synchronized with 37679dbf2ee3
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 28 Dec 2009 15:08:07 -0200] rev 10164
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 28 Dec 2009 15:01:10 -0200] rev 10163
i18n-it: removed extraneous '\r' from message
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 28 Dec 2009 14:59:14 -0200] rev 10162
i18n-pt_BR: synchronized with 37679dbf2ee3
Robert Bachmann <rbachm@gmail.com> [Wed, 30 Dec 2009 02:44:37 +0100] rev 10161
Added RelaxNG schema for hg log XML output format
Robert Bachmann <rbachm@gmail.com> [Wed, 30 Dec 2009 02:41:19 +0100] rev 10160
Bugfix and test for hg log XML output
Robert Bachmann <rbachm@gmail.com> [Wed, 30 Dec 2009 02:38:53 +0100] rev 10159
Added output of "extras" to hg log XML output
Matt Mackall <mpm@selenic.com> [Tue, 29 Dec 2009 16:16:25 -0600] rev 10158
Merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Dec 2009 19:02:26 -0200] rev 10157
run-tests.py: clears http_proxy for all tests
Steve Borho <steve@borho.org> [Tue, 29 Dec 2009 23:59:41 -0600] rev 10156
windows: expand environment vars in find_exe
This allows us to use ${ProgramFiles} in our [merge-tools] sections so
we can provide locale safe program paths.
Matt Mackall <mpm@selenic.com> [Tue, 29 Dec 2009 16:16:25 -0600] rev 10155
Merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Dec 2009 19:02:26 -0200] rev 10154
run-tests.py: clears http_proxy for all tests
Robert Bachmann <rbachm@gmail.com> [Mon, 28 Dec 2009 16:48:57 +0100] rev 10153
Added XML output for hg log
The XML format is based on the one used by Subversion.
Currently the closing "</log>" tag is not written, since cmdutil.py does not support the "footer" template variable.
Robert Bachmann <rbachm@gmail.com> [Mon, 28 Dec 2009 17:55:52 +0100] rev 10152
Added support for templatevar "footer" to cmdutil.py
Patrick Mezard <pmezard@gmail.com> [Tue, 29 Dec 2009 16:00:38 +0100] rev 10151
patch: make git diffline generation more explicit
Patrick Mezard <pmezard@gmail.com> [Tue, 29 Dec 2009 16:00:29 +0100] rev 10150
mq: untangle git patch detection
Patrick Mezard <pmezard@gmail.com> [Tue, 29 Dec 2009 16:00:24 +0100] rev 10149
test-mq: better tests delimitation
Patrick Mezard <pmezard@gmail.com> [Tue, 29 Dec 2009 01:32:40 +0100] rev 10148
Merge with crew-stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 29 Dec 2009 01:03:10 +0100] rev 10147
test-bisect: test handling of invalid commands without relying on sh
Patrick Mezard <pmezard@gmail.com> [Mon, 28 Dec 2009 18:29:35 +0100] rev 10146
diffhelpers: fix variable declaration for MSVC (not C99)
Martin Geisler <mg@lazybytes.net> [Sun, 27 Dec 2009 23:24:05 +0100] rev 10145
dirstate: improve docstring formatting
Triple-quoted strings are easier to spot than single-quoted strings.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:36 +0200] rev 10144
test-help: improve test coverage
Adds a test for displaying a help topic.
Extends test coverage of commands.help_ by 5 lines.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:35 +0200] rev 10143
test-help: improve test coverage
Adds a test for displaying a command list with a command with no help text.
Extends test coverage of commands.help_ by 1 line.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:35 +0200] rev 10142
test-help: improve test coverage
Adds a test that extension commands are omitted from the default
command list.
Extends test coverage of commands.help_ by 1 line.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:35 +0200] rev 10141
test-help: improve test coverage
Adds a test for commands without help text.
Extends test coverage of commands.help_ by 1 line.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:35 +0200] rev 10140
test-help: improve test coverage
Adds a test for help on a command with no options.
Extends test coverage of commands.help_ by 2 lines.
Henri Wiechers <hwiechers@gmail.com> [Thu, 24 Dec 2009 18:53:34 +0200] rev 10139
test-help: improve test coverage
Adds a test for handling ambiguous command help
Extends test coverage of commands.help_ by 4 lines.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 24 Dec 2009 11:41:06 +0100] rev 10138
merge with stable
Johan Samyn <johan.samyn@gmail.com> [Thu, 24 Dec 2009 11:40:39 +0100] rev 10137
monoblue: fix title for branches page
Patrick Mezard <pmezard@gmail.com> [Thu, 24 Dec 2009 00:01:13 +0100] rev 10136
Merge with crew-stable
Greg Onufer <gonufer@jazzhaiku.com> [Wed, 09 Dec 2009 16:56:00 -0800] rev 10135
patch: better handling of sequence of offset patch hunks (issue1941)
The built-in patch implementation applied the hunks to the wrong lines of the
file if the file in the repo has been modified to skew the patch line numbers
and the file contains repetitive sequences of lines.
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 23:28:53 +0100] rev 10134
Makefile: added instructions on how to override PREFIX
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 20:34:09 +0100] rev 10133
Merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 20:31:35 +0100] rev 10132
win32text: do not mention hgext in warning
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Dec 2009 19:31:48 +0100] rev 10131
patch: drop unused hunk.newctrl()
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Dec 2009 19:31:48 +0100] rev 10130
test-import-eol: improve binary hunks test
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Dec 2009 19:31:48 +0100] rev 10129
diffhelpers: handle CRLF in hunk last line without EOL
Note that diff generation code always ends last lines without newline with a
LF, so this is a tolerance.
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Dec 2009 19:31:48 +0100] rev 10128
patch: drop eol normalization fast-path for 'lf' and 'crlf'
With eolmode set to 'lf' or 'crlf' we avoided the hunk duplication and
normalization by reading the input patch in text mode. Dropping this
optimization simplifies code expectations for a small overhead.
The change in test-mq-eol comes from a tolerance to CRLF instead of LF for last
lines without newlines being broken by this revision. This tolerance was only
partially supported and will be added again in a better way.
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Dec 2009 19:31:47 +0100] rev 10127
patch: fix eolmode=auto with new files
If target file does not exist or has no eol, current code was normalizing eols
to LF. Preserve patch file eols instead.
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 19:18:03 +0100] rev 10126
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 17:46:48 +0000] rev 10125
tests highlight, keyword: load extensions with "ext ="
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 19:11:37 +0100] rev 10124
setup.py: keep Python 2.3 compatibility
Though we only support Python 2.4 or greater, we should keep setup.py
compatible with earlier versions on the syntactic level. Otherwise
people will simply get a SyntaxError when trying to install Mercurial
with an old version of Python. With this change, the setup.py file can
be imported with Python 2.3 and we then issue a friendly error message
when we detect that Python is too old.
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 18:40:57 +0100] rev 10123
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 18:40:21 +0100] rev 10122
extensions help: make disabling example analogous to enabling example
The example for enabling an extension in the module search path is:
foo =
foo can only be disabled by:
foo = !
and not by:
hgext.foo = !
As the examples now omit "hgext." the example
hgext.bar = !
is misleading.
Henri Wiechers <hwiechers@gmail.com> [Mon, 21 Dec 2009 23:01:46 +0200] rev 10121
test-help: improve test coverage
Adds a test for using the help option with the version option.
Extends test coverage of commands.help_ by another 2 lines.
Steve Borho <steve@borho.org> [Sat, 05 Dec 2009 14:18:31 -0600] rev 10120
setup: ignore 'not importing' warnings during version detection
Python will issue an ImportWarning when seeing 'import locale' if
there is a locale/ directory present without a __init__.py file.
The warning is silent by default, but it somehow shows up anyway on
Windows when setup.py executed hg. The warning causes runcmd to panic
since it sees output on stderr.
This patch ignores warnings on stderr about not importing a package.
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 18:13:15 +0100] rev 10119
tests: load with "ext =" instead of "hgext.ext ="
Martin Geisler <mg@lazybytes.net> [Wed, 23 Dec 2009 18:04:57 +0100] rev 10118
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:17 +0000] rev 10117
keyword: go into restricted mode when transplanting
Expanded keyword is read into diff with transplant -b otherwise.
Test this scenario.
Thanks to Adam Berkes for providing an example case.
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:04 +0000] rev 10116
keyword: do not monkeypatch diff when in restricted mode
kw_diff actually disabled restricted mode when 2 revisions were given,
because it effectively disables the extension in this case.
But the commands working with diff and patch need restricted mode
always enabled, i.e. expansion enabled when writing to the
working directory and - crucial for these commands - no expansion
when reading the filelog.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 23 Dec 2009 13:12:36 +0100] rev 10115
merge with default
timeless <timeless@mozdev.org> [Wed, 23 Dec 2009 13:09:11 +0100] rev 10114
mq: qnew -f should reject merge working directories
Martin Geisler <mg@lazybytes.net> [Tue, 22 Dec 2009 00:50:15 +0100] rev 10113
Merge with stable
Martin Geisler <mg@lazybytes.net> [Tue, 22 Dec 2009 00:50:03 +0100] rev 10112
hgext: enable extensions without "hgext." prefix in help texts
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 14 Dec 2009 00:32:29 +0900] rev 10111
cmdutil: replace sys.maxint with None as default value in loglimit
Semantically, it is better to use None over any other value when there is
"no value". Using maxint in this context is quite hackish, and is not forward
compatible.
Henri Wiechers <hwiechers@gmail.com> [Mon, 21 Dec 2009 12:18:43 +0200] rev 10110
test-help: improve test coverage
Adds a test for displaying the short list of commands with
the verbose option i.e. 'hg -v help shortlist'.
Extends test coverage of commands.help_ by 2 lines.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 21 Dec 2009 20:30:37 +0100] rev 10109
bookmarks: move parse() and current() into property definitions
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 21 Dec 2009 15:17:28 +0900] rev 10108
bookmarks: refactor code responsible for updates of bookmarks
introduce _bookmarksupdate for common parts from commitctx and addchangegroup
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 21 Dec 2009 20:19:21 +0100] rev 10107
bookmarks: repo._bookmarkcurrent should be a propertycache
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 21 Dec 2009 15:23:03 +0900] rev 10106
bookmarks: write() can simply access repo._bookmarks
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 21 Dec 2009 13:55:56 +0900] rev 10105
bookmarks: turn repo._bookmarks into a propertycache
Sune Foldager <cryo@cyanite.org> [Mon, 21 Dec 2009 16:13:20 +0100] rev 10104
Merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 21 Dec 2009 16:12:43 +0100] rev 10103
hook: fix bug (reuse of variable) introduced in 872d49dd577a
For binary installs, the 'name' argument would be reused as a local variable,
destroying its original value. The patch fixes that, and also avoids copying
sys.path when it's not necessary.
Martin Geisler <mg@lazybytes.net> [Sun, 20 Dec 2009 17:18:04 +0100] rev 10102
patch: implement patch.eol=auto mode
EOLs in patched files are restored to their original value after
patching. We use the first EOL found in the file, files with
inconsistent EOLs will thus be normalized during this process.
Martin Geisler <mg@lazybytes.net> [Sun, 20 Dec 2009 17:18:02 +0100] rev 10101
patch: propagate eolmode down to patchfile
The old code mapped the value of eolmode ('strict', 'crlf' or 'lf') to
eol (None, '\r\n' or '\n') at the entry point in internalpatch. The
value of eol was then used directly as the desired EOL in patchfile.
We now delay the mapping and let patchfile do it instead. This allows
for more complicated behavior where it does not make sense to map
eolmode directly to the target EOLs.
Brendan Cully <brendan@kublai.com> [Sat, 19 Dec 2009 22:56:01 -0800] rev 10100
Merge with stable
Brendan Cully <brendan@kublai.com> [Sat, 19 Dec 2009 22:55:33 -0800] rev 10099
share: use defaultdest to compute unspecified destination
This harmonizes with clone, and avoids creating a .hg in the current directory if
the source ends with a /
Martin Geisler <mg@lazybytes.net> [Sat, 19 Dec 2009 13:10:46 +0100] rev 10098
Merge with stable
Greg Ward <greg-hg@gerg.ca> [Fri, 18 Dec 2009 15:05:42 -0500] rev 10097
glog: fix "incompatible option" error message.
Options like 'only_branch' should be presented to the user as
'--only-branch'.
Matt Mackall <mpm@selenic.com> [Fri, 18 Dec 2009 14:27:30 -0600] rev 10096
Merge with crew
Frank Kingswood <frank@kingswood-consulting.co.uk> [Tue, 15 Dec 2009 10:37:23 +0000] rev 10095
convert: implement two hooks in builtin cvsps
Matt Mackall <mpm@selenic.com> [Wed, 16 Dec 2009 17:39:42 -0600] rev 10094
Merge with crew
Martin Geisler <mg@lazybytes.net> [Thu, 17 Dec 2009 00:32:26 +0100] rev 10093
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Dec 2009 23:59:50 +0100] rev 10092
doc/Makefile: Fix rst2html detection
Displaying the output from the failing call to "which" didn't prevent
make from doing stupid things later. We now only search for "rst2html"
and fallback to "rst2html.py". If neither name is found, make will
eventually abort when we try to use $(RST2HTML).
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 11 Dec 2009 16:17:39 +0900] rev 10091
inotify: completely ignore events on the repository root
They can only be events on the top directory object. Those events are
meaningless for us: permission changes, repository-wide moves...
And they break the assertion that all events happen in repo/*.
Just ignore them.
Fixes one of the failures of run-test.py --inotify test-permissions
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 11 Dec 2009 15:58:09 +0900] rev 10090
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
stat() is not reliable when several events happen quickly. Which means
that if two hg actions occur in the same second, stat() result will not
reflect the second change. And only _one_ invalidate() call was done.
Also ignore the events that occur when wlock is held, since wlock release
will trigger a full rescan anyway.
Fixes 17 run-tests.py --inotify tests.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 27 Nov 2009 09:23:10 +0900] rev 10089
inotify: follow new files if they are regular or a symlink.
Fixes run-tests.py --inotify symlink-basic
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Dec 2009 12:09:25 +0100] rev 10088
run-tests.py: Show paths to failing tests, .err and .out
I think this is very convenient when investigating and fixing test failures,
but perhaps it must be tweaked further to show paths if and only if
it is appropriate.
Matt Mackall <mpm@selenic.com> [Wed, 16 Dec 2009 16:46:12 -0600] rev 10087
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 16 Dec 2009 16:42:58 -0600] rev 10086
convert: make hg sink cleanup safer
Martin Geisler <mg@lazybytes.net> [Wed, 16 Dec 2009 22:58:57 +0100] rev 10085
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 11 Dec 2009 15:25:33 +0900] rev 10084
graphlog: fix output when both a limit and a path are provided
Limit was interpreted as absolute, from the topmost revision, without
counting the number of revisions matching a given file.
Which caused "glog -lN file" to show sometimes less than N csets if
the file was not modified in all of the N previous csets.
glog will now match the behavior of log.
Patrick Mezard <pmezard@gmail.com> [Wed, 16 Dec 2009 22:18:15 +0100] rev 10083
mercurial.iss: update locale location
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Dec 2009 12:10:21 +0100] rev 10082
test-share: Solaris sed can't handle never-ending lines
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Dec 2009 12:10:21 +0100] rev 10081
test-rollback: Ignore hook exit code
Failing hooks returned 255 on Solaris
Patrick Mezard <pmezard@gmail.com> [Wed, 16 Dec 2009 13:19:42 +0100] rev 10080
Merge with crew-stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Dec 2009 12:10:21 +0100] rev 10079
test-hook: Don't use extended regular expressions with grep
Using egrep fixes failure on Solaris
Brendan Cully <brendan@kublai.com> [Tue, 15 Dec 2009 12:33:04 -0800] rev 10078
hgweb: Make get_mtime use repository to find store path.
It was calculating it directly, which is redundant and caused
it to break with shared repositories.
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Sun, 13 Dec 2009 18:29:16 +0100] rev 10077
make ui.interactive() return false in case stdin lacks isatty
Matt Mackall <mpm@selenic.com> [Tue, 15 Dec 2009 10:45:24 -0600] rev 10076
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 15 Dec 2009 10:44:38 -0600] rev 10075
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 15 Dec 2009 10:44:10 -0600] rev 10074
Merge -stable heads
Martin Geisler <mg@lazybytes.net> [Mon, 14 Dec 2009 23:14:50 +0100] rev 10073
Makefile: update "make clean" target after f91e5630ce7e
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Dec 2009 22:15:46 +0100] rev 10072
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Dec 2009 22:09:49 +0100] rev 10071
convert/svn: better handling of hg recursive call failure
Alexander Solovyov <piranha@piranha.org.ua> [Mon, 14 Dec 2009 21:21:34 +0200] rev 10070
schemes: url parts are counted from 1
Matt Mackall <mpm@selenic.com> [Mon, 14 Dec 2009 15:02:02 -0600] rev 10069
Merge with -stable
Matt Mackall <mpm@selenic.com> [Mon, 14 Dec 2009 15:01:13 -0600] rev 10068
subrepo: add default path to new clones
Martin Geisler <mg@lazybytes.net> [Mon, 14 Dec 2009 00:26:28 +0100] rev 10067
win32mbcs: fix typos and reST syntax
Martin Geisler <mg@lazybytes.net> [Mon, 14 Dec 2009 00:02:04 +0100] rev 10066
help/templates: use hanging indent for field list
Now that the field list indentation is computed automatically, we no
longer need to align all fields the same. Using a simple hanging
indent makes it easy to edit the text in an editor like Emacs, which
will automatically recognized the hang and keep it.
The fields are still output with no blank lines between them.
Martin Geisler <mg@lazybytes.net> [Sun, 13 Dec 2009 23:49:53 +0100] rev 10065
minirst: improve layout of field lists
Before, we used the padding following the key to compute where to wrap
the text. Long keys would thus give a big indentation. It also
required careful alignment of the source text, making it cumbersome to
items to the list.
We now compute the maximum key length and use that for all items in
the list. We also put a cap on the indentation: keys longer than 10
characters are put on their own line. This is similar to how rst2html
handles large keys: it uses 14 as the cutoff point, but I felt that 10
was better for monospaced text in the console.
Martin Geisler <mg@lazybytes.net> [Sun, 13 Dec 2009 22:37:30 +0100] rev 10064
minirst: don't test regexps twice
We know the regexps match since splitparagraphs used them too.
Martin Geisler <mg@lazybytes.net> [Sun, 13 Dec 2009 19:24:24 +0100] rev 10063
minirst: run inlineliterals too in debug mode
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 18:54:54 +0100] rev 10062
test-share: handle sed/GNU-sed discrepancies
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 18:06:24 +0100] rev 10061
Make {file_copies} usable as a --template key
Before this, to display file copies in templates, you had to write something
like {file_copies%filecopy}. For some reason, the {file_copy} subtemplate was
used by default but not defined by default in changeset_templater, while styles
were already using it. Here we define {file_copy} in changeset_templater, and
change the templater to handle formatting strings like {file_copies%filecopy}
with already expanded keys (in this case {file_copies}), for backward
compatibility.
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 18:06:24 +0100] rev 10060
templatekw: change {file_copies} behaviour, add {file_copies_switch}
{file_copies} template now displays file copies with or without the --copies
switch being set. A new {file_copies_switch} template implements the former
behaviour.
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 18:06:24 +0100] rev 10059
test-command-template: test 'file_copies' keyword
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 18:06:24 +0100] rev 10058
cmdutil: extract file copies closure into templatekw
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 18:06:24 +0100] rev 10057
cmdutil: extract latest tags closures in templatekw
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 18:06:24 +0100] rev 10056
cmdutil: extract file changes closures into templatekw
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 18:06:23 +0100] rev 10055
cmdutil: extract repo dependent closures in templatekw
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 18:06:23 +0100] rev 10054
cmdutil: extract ctx dependent closures into templatekw
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 18:06:23 +0100] rev 10053
cmdutil: replace showlist() closure with a function
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Dec 2009 11:56:22 +0100] rev 10052
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Dec 2009 12:44:15 -0500] rev 10051
convert/svn: make sink recover gracefully from empty changeset
Otherwise when processing a changeset that in fact changes no files
(perhaps due to bug in import from CVS) can get something like:
unexpected svn output:
abort: unable to cope with svn output
Bug report and patch draft by Jesse Glick <jesse.glick@sun.com>
Shun-ichi GOTO <shunichi.goto@gmail.com> [Mon, 07 Dec 2009 19:18:03 +0900] rev 10050
win32mbcs: Add configuration to specify path encoding
Add win32mbcs.encoding configuration option to specify the encoding to
use instead of encoding.encoding.
This option is useful for the users who want to write UTF-8 log
message on non UTF-8 path encoding environment.
Martin Geisler <mg@lazybytes.net> [Sat, 12 Dec 2009 23:03:05 +0100] rev 10049
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 11 Dec 2009 15:09:52 +0900] rev 10048
mq: qpop: remove added files before re-adding removed files
We need to do this to avoid file/directories conflicts.
This causes patches removing a committed file and replacing it
with a directory to be "unpoppable".
Greg Ward <greg-hg@gerg.ca> [Thu, 10 Dec 2009 09:35:43 -0500] rev 10047
revlog: rewrite several method docstrings
- methods: findmissing(), nodesbetween(), descendants(), ancestors()
- the goal is precise, concise, accurate, grammatical, understandable,
consistently formatted docstrings
David Soria Parra <dsp@php.net> [Fri, 11 Dec 2009 11:04:31 +0100] rev 10046
color: Add support for bookmarks
David Soria Parra <dsp@php.net> [Fri, 11 Dec 2009 11:04:31 +0100] rev 10045
color: Do not pass --color, --no-color parameters to wrapped function
Passing the --color and --no-color parameter to the wrapped function
can cause a invalid argument exception if the wrapped function doesn't
accepts a **opts dict.
Martin Geisler <mg@lazybytes.net> [Sat, 12 Dec 2009 16:54:33 +0100] rev 10044
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 12 Dec 2009 15:26:57 +0100] rev 10043
test-hgrc: cleanup
- don't create a repository for no reason.
- empty $HGRCPATH for better isolation between tests
Martin Geisler <mg@lazybytes.net> [Sat, 12 Dec 2009 16:46:16 +0100] rev 10042
config: raise ConfigError on non-existing include files
Before, an %include directive for a non-existing file resulted in an
IOError and a traceback.
Matt Mackall <mpm@selenic.com> [Thu, 10 Dec 2009 17:01:21 -0600] rev 10041
Merge with i18n
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sat, 05 Dec 2009 05:29:37 +0200] rev 10040
i18n-el: translate Mercurial's copyright info message
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sat, 05 Dec 2009 05:21:33 +0200] rev 10039
i18n-el: translate the rest of hgext/bookmarks
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sat, 05 Dec 2009 04:43:13 +0200] rev 10038
i18n-el: translate the help of acl.py
Giorgos Keramidas <keramida@ceid.upatras.gr> [Thu, 03 Dec 2009 23:34:25 +0200] rev 10037
i18n-el: translate hgext/bugzilla.py
Giorgos Keramidas <keramida@ceid.upatras.gr> [Thu, 03 Dec 2009 22:32:13 +0200] rev 10036
i18n-el: remove obsolete translations
Giorgos Keramidas <keramida@ceid.upatras.gr> [Thu, 03 Dec 2009 22:31:14 +0200] rev 10035
i18n-el: translate verify
Giorgos Keramidas <keramida@ceid.upatras.gr> [Thu, 03 Dec 2009 22:06:38 +0200] rev 10034
i18n-el: add missing space to "remote: "'s translation
Giorgos Keramidas <keramida@ceid.upatras.gr> [Wed, 02 Dec 2009 18:49:10 +0200] rev 10033
i18n-el: resync i18n/el.po with changeset 2ba40cdaacb2
Giorgos Keramidas <keramida@ceid.upatras.gr> [Wed, 02 Dec 2009 18:49:10 +0200] rev 10032
i18n-el: remove some Danish strings
The original el.po file was copied from da.po and I missed a few
Danish strings in the version I submitted to crew.
Pascal Quantin <pascal.quantin@gmail.com> [Thu, 10 Dec 2009 23:57:14 +0100] rev 10031
mercurial.iss: add tcsh completion script
Martin Geisler <mg@lazybytes.net> [Thu, 10 Dec 2009 22:31:10 +0100] rev 10030
run-tests: backout d7c23f4a14c7
We no longer have any data files, so this is no longer needed. Augie
Fackler reported on IRC that this "hack" had never worked for him in
the first place.
Martin Geisler <mg@lazybytes.net> [Thu, 10 Dec 2009 22:28:09 +0100] rev 10029
mercurial.iss: backout 08bbed8ac9b8
Not a complete backout, the bash_completion script is still installed.
Martin Geisler <mg@lazybytes.net> [Thu, 10 Dec 2009 22:26:09 +0100] rev 10028
setup: backout 68964567e406
We decided that it is better to let the distributions install these
files themselves since they know where to put them.
Augie Fackler <durin42@gmail.com> [Wed, 09 Dec 2009 14:33:22 -0600] rev 10027
subrepo: document necessary methods for a subrepo class
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 10 Dec 2009 12:31:57 +0100] rev 10026
merge with the stable branch
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 10 Dec 2009 12:31:21 +0100] rev 10025
cmdutil: copy auth section in remoteui
This allows me to specify an auth section in a .hg/hgrc instead of just
a global or user-level hgrc.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 10 Dec 2009 00:14:22 +0100] rev 10024
log --follow: use a set instead of a list
benchmarked with hg log -qf on the linux kernel:
before:
Time: real 39.010 secs (user 38.840+0.000 sys 0.060+0.000)
after:
Time: real 8.560 secs (user 8.440+0.000 sys 0.080+0.000)
Sune Foldager <cryo@cyanite.org> [Tue, 08 Dec 2009 23:36:06 +0100] rev 10023
Merge with stable
Sune Foldager <cryo@cyanite.org> [Tue, 08 Dec 2009 23:23:59 +0100] rev 10022
patchbomb: fix bug introduced in 4ddfad7ebd98 and add test
Thanks to Augie Fackler for reporting this.
Brodie Rao <me+hg@dackz.net> [Sat, 05 Dec 2009 23:26:27 -0500] rev 10021
help: don't display bogus help messages for invalid aliases
Martin Geisler <mg@lazybytes.net> [Sat, 05 Dec 2009 23:16:09 +0100] rev 10020
run-tests: install data files correctly
In 68964567e406 we began installing some data files in PREFIX/share.
When preparing to run the tests, run-tests.py uses --home="" in order
to work around home being set in a ~/.pydistutils.cfg file. This
somehow overwrites the --prefix option.
The result was that the share/ directory was installed in the top of
the Mercurial source tree.
Sune Foldager <cryo@cyanite.org> [Sun, 06 Dec 2009 23:28:49 +0100] rev 10019
Merge with stable
Sune Foldager <cryo@cyanite.org> [Sun, 06 Dec 2009 23:22:17 +0100] rev 10018
patchbomb: handle repository#rev URLs correctly
Martin Geisler <mg@lazybytes.net> [Sat, 05 Dec 2009 00:15:17 +0100] rev 10017
contrib: helper extension to track memory usage
Matt Mackall <mpm@selenic.com> [Fri, 04 Dec 2009 13:59:33 -0600] rev 10016
export: fix tests
Alexander Solovyov <piranha@piranha.org.ua> [Sat, 28 Nov 2009 16:48:07 +0200] rev 10015
commands.export: accept -r option as revision specification
This brings consistency with other commands option and allows specification of
negative numbers (-r -2), which were recognized as options earlier.
Gilles Moris <gilles.moris@free.fr> [Mon, 30 Nov 2009 23:51:06 +0100] rev 10014
status: add the --change option to display files changed in a revision
This option is similar to the one already used for the diff command.
Unfortunately, the c and C short option are already used for status, so there
is no corresponding short option. However, there is no short option for --rev
either, so that's consistent.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 01 Dec 2009 09:53:02 +0900] rev 10013
run-tests: --inotify: use inotify.appendpid to append pids to $DAEMON_PIDS
Introduce a inotify.appendpid configuration possibility that appends pids
to inotify.pidfile when set to True.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 01 Dec 2009 11:28:31 +0900] rev 10012
cmdutil: service: add appendpid parameter to append pids to pid file
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 04 Dec 2009 17:43:01 +0100] rev 10011
changegroupsubset: readdelta() can be used if the previous rev is a parent
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 04 Dec 2009 17:42:59 +0100] rev 10010
changegroupsubset: simplify parents pruning
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 04 Dec 2009 15:36:13 +0100] rev 10009
shrink-revlog: improve performance: use changegroup instead of revisions
Before:
real 0m23.971s
Now:
real 0m4.229s
The only case where the output would be different is if the newer hg was using
a different diff algorithm than used originally.
Pascal Quantin <pascal.quantin@gmail.com> [Fri, 04 Dec 2009 07:52:30 +0100] rev 10008
Update win32 installer paths for bash and zsh scripts after move done in 68964567e406
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Dec 2009 12:48:23 +0100] rev 10007
rst2man: s/dont/don't/ in comment
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Dec 2009 12:48:17 +0100] rev 10006
rst2man: separate inline blocks from previous paragraphs
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 30 Nov 2009 21:54:34 +0100] rev 10005
setup: install some useful data files.
The selection is somewhat arbitrary. In the case of the Zsh completion
file, it will not conflict with the builtin Zsh completions: they
are in a file named `_mercurial', not `_hg'.
Alexander Solovyov <piranha@piranha.org.ua> [Mon, 30 Nov 2009 23:10:21 +0200] rev 10004
color: add support for churn --diffstat
Martin Geisler <mg@lazybytes.net> [Thu, 03 Dec 2009 22:54:33 +0100] rev 10003
Makefile: help/ was moved in f91e5630ce7e update paths to match
Pascal Quantin <pascal.quantin@gmail.com> [Thu, 03 Dec 2009 22:34:51 +0100] rev 10002
Update win32 installer with changes from f91e5630ce7e
Christian Ebert <blacktrash@gmx.net> [Thu, 03 Dec 2009 22:37:49 +0100] rev 10001
doc: correct path to help files in Makefile
Martin Geisler <mg@lazybytes.net> [Thu, 03 Dec 2009 20:50:00 +0100] rev 10000
setup: cleanup coding style
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 01 Dec 2009 16:06:10 +0100] rev 9999
setup: install translation files as package data
Remove the `install_package_data' subclass of `install_data' and use
the `package_data' functionality provided by distutils instead. As
package data must be located within the package directory, the data
files are now generated in the build directory.
To simplify the functionality of this change, the top-level `doc' and
`templates' directories have been moved into the `mercurial' package
directory.
Martin Geisler <mg@lazybytes.net> [Thu, 03 Dec 2009 20:41:43 +0100] rev 9998
setup: don't ship i18n directory
The directory was never actually used at runtime and other programs
don't ship it either.
Sune Foldager <cryo@cyanite.org> [Thu, 03 Dec 2009 11:07:14 +0100] rev 9997
Merge with stable
Sune Foldager <cryo@cyanite.org> [Thu, 03 Dec 2009 11:06:55 +0100] rev 9996
handle file URIs correctly, according to RFC 2396 (issue1153)
The new code aims to implement the RFC correctly for file URIs.
Previously they were handled incorrectly in several ways, which
could cause problem on Windows in particular.
Sune Foldager <cryo@cyanite.org> [Thu, 03 Dec 2009 11:06:44 +0100] rev 9995
transplant: fix small bug when a patch fails while using --filter
Henrik Stuart <hg@hstuart.dk> [Thu, 03 Dec 2009 06:35:39 +0100] rev 9994
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 03 Dec 2009 14:14:44 +0900] rev 9993
alias: do not crash when aliased command has no usage help text
Martin Geisler <mg@lazybytes.net> [Thu, 03 Dec 2009 01:06:15 +0100] rev 9992
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 03 Dec 2009 01:01:49 +0100] rev 9991
revlog: add fast path to ancestor
Greg Ward <greg-hg@gerg.ca> [Tue, 01 Dec 2009 16:19:53 -0500] rev 9990
share: add a test script.
Fabian Kreutz <project+hg@fabian-kreutz.de> [Wed, 02 Dec 2009 14:30:39 +0200] rev 9989
hgk: do not ignore ---/+++ lines in diff
Matt Mackall <mpm@selenic.com> [Tue, 01 Dec 2009 20:10:31 -0600] rev 9988
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Dec 2009 19:30:49 -0600] rev 9987
Added signature for changeset 439d7ea6fe3a
Matt Mackall <mpm@selenic.com> [Tue, 01 Dec 2009 19:30:49 -0600] rev 9986
Added tag 1.4.1 for changeset 439d7ea6fe3a
Matt Mackall <mpm@selenic.com> [Tue, 01 Dec 2009 19:30:30 -0600] rev 9985
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Dec 2009 19:28:15 -0600] rev 9984
share: fix interaction with clone
Matt Mackall <mpm@selenic.com> [Tue, 01 Dec 2009 14:37:57 -0600] rev 9983
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 01 Dec 2009 14:37:33 -0600] rev 9982
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Dec 2009 14:36:47 -0600] rev 9981
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Tue, 01 Dec 2009 00:48:25 +0100] rev 9980
Merge with stable
Martin Geisler <mg@lazybytes.net> [Tue, 01 Dec 2009 00:47:25 +0100] rev 9979
i18n: hand-transplant change in 36760956f6d3
Martin Geisler <mg@lazybytes.net> [Sun, 29 Nov 2009 20:32:41 +0100] rev 9978
i18n-da: synchronized with af5f99d8195e
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 30 Nov 2009 12:44:32 -0200] rev 9977
merge with i18n-stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 30 Nov 2009 12:36:24 -0200] rev 9976
i18n-pt_BR: added strings from crew 5b149c88d9e8
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 01 Dec 2009 01:43:46 +0100] rev 9975
backout experimental change from 777c1df76ef4
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 01 Dec 2009 01:08:16 +0100] rev 9974
context: parents() already filters nullid
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 01 Dec 2009 01:03:54 +0100] rev 9973
context: use key-sorting instead of tuples
Martin Geisler <mg@lazybytes.net> [Tue, 01 Dec 2009 00:43:54 +0100] rev 9972
Merge with stable
Martin Geisler <mg@lazybytes.net> [Tue, 01 Dec 2009 00:43:21 +0100] rev 9971
doc/Makefile: ensure C locale
The man pages can actually be translated by building them in a
different locale. However, the man pages contain internal links to
certain sections, and when the section titles are translated, the
links change too. So it is currently not recommended to build the man
pages in anything by the "C" locale.
Martin Geisler <mg@lazybytes.net> [Tue, 01 Dec 2009 00:15:45 +0100] rev 9970
commands: mark "ssh://" as inline literals in help texts
Patrick Mezard <pmezard@gmail.com> [Mon, 30 Nov 2009 23:39:58 +0100] rev 9969
test-rollback: fix reference to /bin/false (fails on OSX)
Martin Geisler <mg@lazybytes.net> [Mon, 30 Nov 2009 23:27:37 +0100] rev 9968
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 30 Nov 2009 23:12:51 +0100] rev 9967
schemes: fixed typos in module docstring
Alexander Solovyov <piranha@piranha.org.ua> [Tue, 24 Nov 2009 17:48:23 +0200] rev 9966
schemes extension
Martin Geisler <mg@lazybytes.net> [Mon, 30 Nov 2009 23:12:51 +0100] rev 9965
schemes: fixed typos in module docstring
Alexander Solovyov <piranha@piranha.org.ua> [Tue, 24 Nov 2009 17:48:23 +0200] rev 9964
schemes extension
Matt Mackall <mpm@selenic.com> [Mon, 30 Nov 2009 15:31:14 -0600] rev 9963
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Mon, 30 Nov 2009 22:23:04 +0100] rev 9962
convert: better error on invalid repository type
Patrick Mezard <pmezard@gmail.com> [Mon, 30 Nov 2009 22:23:09 +0100] rev 9961
cmdutil: fix missing default 'extra' template
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 28 Nov 2009 11:21:19 +0900] rev 9960
test blacklist: add inotify-failures target
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 28 Nov 2009 10:25:09 +0900] rev 9959
run-tests: add a "--blacklist target" option to skip predefined test lists
Rely on a ConfigParser file, tests/blacklist, to define blacklist targets.
This allows exposing specific test suites for testing incomplete/particular
features, e.g. "run-tests.py --blacklist inotify-failures --inotify *"
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 17 Nov 2009 18:50:39 +0900] rev 9958
run-tests: add --inotify option to test runner
Activate inotify extension when running tests.
Sune Foldager <cryo@cyanite.org> [Mon, 30 Nov 2009 19:52:03 +0100] rev 9957
merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 30 Nov 2009 19:37:38 +0100] rev 9956
extdiff: respect --option in command aliases (issue949)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 30 Nov 2009 16:53:05 +0100] rev 9955
merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 30 Nov 2009 14:58:52 +0100] rev 9954
fix bug in prepush logic involving merge changesets
When creating new branches and merging them into existing ones, you would
sometimes be able to push some changesets (the existing branches) without using
--force, even when that creates a new head on the remote.
A test which triggers the error has been added.
Martin Geisler <mg@lazybytes.net> [Sat, 28 Nov 2009 23:58:03 +0100] rev 9953
Merge with stable
timeless@mozdev.org [Sat, 28 Nov 2009 23:44:18 +0100] rev 9952
commands: add missing options in command line help
Martin Geisler <mg@lazybytes.net> [Sat, 28 Nov 2009 23:23:16 +0100] rev 9951
commands: mark strings for translation
timeless [Fri, 27 Nov 2009 18:26:25 +0000] rev 9950
keyword: clarify object of backwards compatibility
Greg Ward <greg-hg@gerg.ca> [Fri, 27 Nov 2009 11:50:52 -0500] rev 9949
commit: write last-message.txt with no content modifications.
This assumes the user will use either a sane editor (anything but
Notepad) or the same editor again: even Notepad should be able to read
what it previously wrote.
Marti Raudsepp <marti@juffo.org> [Thu, 26 Nov 2009 10:47:39 +0200] rev 9948
mail: add parseaddrlist() function for parsing many addresses at once
Adds a new function addrlistencode() to mercurial.mail, like addressencode(),
but accepts a list of addresses as input, and returns a list of formatted
addresses. This will be used by patchbomb.
The difference is that each element in the input list can contain multiple
addresses (comma separated or otherwise), and are split using Python's
email.Utils.getaddresses().
Marti Raudsepp <marti@juffo.org> [Thu, 26 Nov 2009 12:23:28 +0200] rev 9947
patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc
Instead of using custom code to split apart addresses, we now use
mail.parseaddrlist() which always does the Right Thing as it relies on Python's
email.Utils.getaddresses().
Previously, 'hg email --to=foo,bar' only respected foo and discarded bar. Also,
commas in names were not allowed in hgrc or the interactive prompt; specifying
'"Lastname, Firstname" <foo>' would confuse patchbomb.
The testcase uses '-m tmp.mbox' because -n (like in other tests) would disable
address mangling.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 27 Nov 2009 13:53:27 +0100] rev 9946
templates: add raw templates for tags/branches pages
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 23:10:59 +0100] rev 9945
extdiff: wrap long lines in docstring and comments
Gettext wraps lines in the messages when it writes them to the hg.pot
file and that makes long lines look odd in the resulting .po file.
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:59:35 +0100] rev 9944
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 26 Nov 2009 10:51:17 +0100] rev 9943
keyword: the CVS keyword is $RCSfile$, not $RCSFile$
http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords
Fix default keyword map accordingly.
Keep $RCSFile$ for Mercurial backwards compatibility.
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:50:16 +0100] rev 9942
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:06:45 +0100] rev 9941
extdiff: prevent exception on double-translation
The docstring is translated twice: once when used as a format string,
and once on display. The second translation fails when the first
translation introduces non-ASCII characters in the string.
The problem is that the gettext module calls unicode(message) on the
string, i.e., it decodes it to a Unicode string using the ASCII
encoding (the default encoding). By translating it into a Unicode
string here, the unicode() call becomes a noop.
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:54:47 -0600] rev 9940
Merge with stable again
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:54:18 -0600] rev 9939
Merge stable heads
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:52:39 -0600] rev 9938
Fix changelog test
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:44:19 -0600] rev 9937
Merge with stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 01 Jun 2009 20:32:53 +0200] rev 9936
list branches in changelog template
Greg Ward <greg-hg@gerg.ca> [Tue, 24 Nov 2009 21:08:40 -0500] rev 9935
commit: if relevant, tell user their commit message was saved.
(issue1635)
Specifically, if:
1) the user edited the message (it didn't come straight from -m) and
2) the commit was aborted by an exception
then the saved commit message in .hg/last-message.txt could come in handy, so
mention it with a ui.write().
This doesn't help users who manually rollback to amend a changeset:
the fact that the message was saved to .hg/last-message.txt is
invisible in that case.
Greg Ward <greg-hg@gerg.ca> [Tue, 24 Nov 2009 21:08:39 -0500] rev 9934
commit: save commit message so it's not destroyed by rollback.
(issue1635)
Rationale: if a pretxncommit hook rejects this commit, the transaction
is rolled back and the user's commit message is irrevocably lost.
So save a copy in .hg/last-message.txt, just in case. Also handy if
the user deliberately rolls back a commit in order to amend it.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 14 Aug 2009 08:19:49 -0400] rev 9933
inotify: create a common, OS-independent server entry point
* rename server.py to linuxserver.py
* create server.py: it will contain OS-independent logic for servers, and will
import the right server depending on the OS
* old server.server class is renamed to linuxserver.socketlistener
Alexander Solovyov <piranha@piranha.org.ua> [Wed, 25 Nov 2009 00:02:02 +0200] rev 9932
perf.perflog: add option to follow renames
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 24 Nov 2009 13:55:13 -0200] rev 9931
run-tests: LANGUAGE may make tests fail
Bryan O'Sullivan <bos@serpentine.com> [Tue, 24 Nov 2009 14:45:29 -0800] rev 9930
Merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 20:40:16 +0100] rev 9929
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 20:40:04 +0100] rev 9928
findrenames: improve coding-style
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 18:21:47 +0100] rev 9927
findrenames: speedup exact match
benchmarked on crew repo with:
rm -rf * ; hg up -C ; for i in `find . -name "*.py"` ; do mv $i $i.new;done
followed by:
hg addremove -s 100
before: Time: real 28.890 secs (user 26.920+0.000 sys 1.450+0.000)
after : Time: real 6.790 secs (user 5.310+0.000 sys 1.350+0.000)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 17:39:42 +0100] rev 9926
findrenames: refactor the score computation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 17:26:42 +0100] rev 9925
findrenames: first loop over the removed files, it's faster
Getting the file from the working dir is less expensive than getting it from
the repo history, hence the speedup.
benchmarked on crew repo with:
rm -rf * ; hg up -C ; for i in `find . -name "*.py"` ; do mv $i $i.new;done
followed by:
hg addremove -s 100
before: Time: real 68.760 secs (user 65.760+0.000 sys 2.490+0.000)
after : Time: real 28.890 secs (user 26.920+0.000 sys 1.450+0.000)
Alexander Solovyov <piranha@piranha.org.ua> [Tue, 24 Nov 2009 14:32:19 +0200] rev 9924
localrepo: support 'rev in repo' syntax
Brendan Cully <brendan@kublai.com> [Tue, 24 Nov 2009 11:20:25 -0800] rev 9923
zsh completion: add summary
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:25:11 -0600] rev 9922
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:23:53 -0600] rev 9921
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:15:12 -0600] rev 9920
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 23 Nov 2009 15:15:54 -0200] rev 9919
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 23 Nov 2009 15:15:01 -0200] rev 9918
i18n-pt_BR: synchronized with 5d748045c2ae
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:14:27 -0600] rev 9917
Merge with crew
Alexander Solovyov <piranha@piranha.org.ua> [Tue, 24 Nov 2009 16:07:36 +0200] rev 9916
commands.log: getrenamed() cleanup
Sune Foldager <cryo@cyanite.org> [Tue, 24 Nov 2009 09:49:23 +0100] rev 9915
ancestor: improve docstring
The term "least common ancestor" is highly ambiguous.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 23 Nov 2009 23:04:44 +0100] rev 9914
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 23 Nov 2009 22:45:36 +0100] rev 9913
run-tests: always set $COLUMNS, fix running tests under emacs shell
fix tests failure reported by Neal Becker.
Patrick Mezard <pmezard@gmail.com> [Mon, 23 Nov 2009 22:46:48 +0100] rev 9912
Merge with crew-stable
Pascal Quantin <pascal.quantin@gmail.com> [Mon, 23 Nov 2009 22:08:59 +0100] rev 9911
Add help files to win32 installer (issue 1919)
Sune Foldager <cryo@cyanite.org> [Mon, 23 Nov 2009 11:03:55 +0100] rev 9910
hgweb: add support for extension-provided permission hooks
This allows extensions to hook into permission checking, providing both
authentication and authorization as needed. The existing authorization
function has been changed to a hook, which is added by default.
Matt Mackall <mpm@selenic.com> [Sun, 22 Nov 2009 15:36:22 -0600] rev 9909
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Sun, 22 Nov 2009 21:34:12 +0100] rev 9908
i18n-da: synchronized with b5170b8b32a5
Jens Bäckman <jens.backman@gmail.com> [Sun, 22 Nov 2009 19:37:19 +0100] rev 9907
i18n-sv: translated seven commands
These commands has been translated:
addremove, archive, backout, config, unbundle, verify, version
Jens Bäckman <jens.backman@gmail.com> [Sun, 22 Nov 2009 19:12:39 +0100] rev 9906
i18n-sv: synchronized with b5170b8b32a5
Patrick Mezard <pmezard@gmail.com> [Sun, 22 Nov 2009 19:11:12 +0100] rev 9905
run-tests: work around a distutils bug triggered by 0a8a43b4ca75
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Nov 2009 11:27:29 +0100] rev 9904
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Nov 2009 11:25:01 +0100] rev 9903
Do not overwrite motd attribute of hgwebdir instances on refresh.
This allows using
application = hgwebdir(...)
application.motd = (string or object with __str__ method)
in WSGI (like it is possible in CGI).
Changed web.motd in the config file is still read with this, because
hgwebdir.templater.motd() does not store the config value.
Martin Geisler <mg@lazybytes.net> [Sun, 22 Nov 2009 11:19:07 +0100] rev 9902
Merge with stable
Henri Wiechers <hwiechers@gmail.com> [Fri, 20 Nov 2009 14:11:05 +0200] rev 9901
commands: minor refactoring
Renamed local variable i to entry in helpcmd.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 19 Nov 2009 11:06:01 +0900] rev 9900
inotify: improve error messages
* prefix messages by inotify-(client|server)
* make sure that all warning and abort messages use the same format.
* in the case where inotify.sock is an old broken symlink, say so and abort
instead of trying to overwrite the already existing link
Greg Ward <greg@gerg.ca> [Wed, 18 Nov 2009 22:23:11 -0500] rev 9899
run-tests: give each child its own tmp dir (issue1911)
Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel
mode = fail), and also fixes the long-standing quirk that parallel mode
created multiple /tmp/hgtests.XXXXXX directories. Now there is only one
/tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 20 Nov 2009 02:34:56 +0100] rev 9898
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 17 Nov 2009 15:36:09 +0900] rev 9897
inotify: add a inotify.pidfile configuration possibility
This will mainly help us in our tests to log pids of inotify servers
started implicitely, to make sure that unkilled inotify daemons do not clutter
the output of unrelated tests.
Also desactivate the workaround introduced in 951ec6c7d703
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 17 Nov 2009 15:00:00 +0900] rev 9896
cmdutil.service: do not _exit(0) in the parent process
The fact that a parent process spawns a daemon does not necessarily means that
it is the only think it has to do. This was forcing since 7c01599dd340 inotify
processes launched implicitely to exit prematurely:
when no inotify server was running, "hg st" for example would only launch a
inotify server, _exit(0) and thus would not return file statuses.
This changeset adds a test for implicitely launched inotify processes.
Change to output of test-inotify-1208 is correct: it reflects the normal
error message of "hg st" when not dying during "hg inserve" daemon creation.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:39:30 +0100] rev 9895
Merge with stable
Faheem Mitha <faheem@email.unc.edu> [Thu, 19 Nov 2009 17:33:41 -0500] rev 9894
commands: improve help for "hg clone -r"
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:29:02 +0100] rev 9893
commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:27:11 +0100] rev 9892
commands: use field lists instead of literal blocks in docstrings
The literal blocks were mis-used for alignment, but this of course
changes the font of the entire block to a fixed width font in the HTML
version. Using a proper list solves this.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 22:25:38 +0100] rev 9891
commands: do not indent list in clone help string
Greg Ward <greg@gerg.ca> [Wed, 18 Nov 2009 22:23:11 -0500] rev 9890
run-tests: give each child its own tmp dir (issue1911)
Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel
mode = fail), and also fixes the long-standing quirk that parallel mode
created multiple /tmp/hgtests.XXXXXX directories. Now there is only one
/tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 21:59:06 +0100] rev 9889
test-non-interactive-wsgi: make output deterministic
Henrik Stuart <hg@hstuart.dk> [Thu, 19 Nov 2009 15:54:57 +0100] rev 9888
hgweb: fix error in 38170eeed18c and introduce test for change
Sune Foldager <cryo@cyanite.org> [Thu, 19 Nov 2009 10:32:33 +0100] rev 9887
ui: add environ property to access os.environ or wsgirequest.environ
The property returns os.environ by default, and is propagated by ui.copy.
During hgweb processing, ui.environ is set to the proper WSGI-request
environment, as contained in wsgirequest.environ. For CGI, this is the
same as os.environ.
The property is meant to be read-only, as with os.environ (generally).
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:27:15 +0100] rev 9886
relink: wrap long lines in docstring
Patrick Mezard <pmezard@gmail.com> [Wed, 18 Nov 2009 21:58:49 +0100] rev 9885
test-convert-filemap: test improved filtering algorithm
Stefan Simek <simek@triaxis.sk> [Tue, 10 Nov 2009 13:04:03 +0100] rev 9884
convert: make filemap favor most specific filtering rule
A filemap like:
exclude "doc"
include "doc/foo.txt"
will now preserve doc/foo.txt and exclude everything else in doc/.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 17 Nov 2009 13:24:58 +0100] rev 9883
run-tests: set --home when building with distutils
If home was set in ~/.pydistutils.cfg, the tests could not run. This
overrides any home setting by supplying --home="" on the command line.
Zhigang Wang <w1z2g3@gmail.com> [Wed, 18 Nov 2009 20:14:17 +0100] rev 9882
gitweb: add a latest link to the gitweb style
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 18 Nov 2009 12:47:58 +0100] rev 9881
httprepo: suppress the `real URL is...' message in safe, common cases.
When the actual and requested URL only differ by trailing slashes,
there is no need to warn. As an example, this easily happens when
accessing repositories on Bitbucket over HTTP(S).
As far as I could tell, there were no existing tests for this
behaviour.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Nov 2009 17:09:00 +0100] rev 9880
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Nov 2009 16:47:20 +0100] rev 9879
Extend test-branchmap to test c51494c53841
(encoding fallback in branchmap to maintain compatibility with 1.3.x)
Sune Foldager <cryo@cyanite.org> [Wed, 18 Nov 2009 15:20:08 +0100] rev 9878
branchmap: fix defective fallback fix 0262bb59016f
The fix applied as 0262bb59016f doesn't work and is essentially a no-op.
This fix also adds a comment about the nature of the problem, and a test.
Martin Geisler <mg@lazybytes.net> [Wed, 18 Nov 2009 00:19:42 +0100] rev 9877
Merge with stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 11 Nov 2009 17:48:00 +0100] rev 9876
alias: improve help text for command aliases
Displays the line "alias for: hg ..." with the original command including options,
followed by the command's original help text.
Henri Wiechers <hwiechers@gmail.com> [Fri, 13 Nov 2009 16:38:27 +0200] rev 9875
dispatch: minor refactoring
Renamed local variable i to entry in _dispatch.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 17 Nov 2009 22:16:41 +0100] rev 9874
qseries: don't truncate the patch name (issue1912)
Instead of truncating the entire output line of `qseries', only the
summary is truncated.
Matt Mackall <mpm@selenic.com> [Tue, 17 Nov 2009 16:23:05 -0600] rev 9873
summary: note non-default branches with -q
Matt Mackall <mpm@selenic.com> [Tue, 17 Nov 2009 16:22:17 -0600] rev 9872
Add stable branch
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 14:50:30 -0600] rev 9871
Added signature for changeset 31ec469f9b55
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 14:50:24 -0600] rev 9870
Added tag 1.4 for changeset 31ec469f9b55
Martin Geisler <mg@lazybytes.net> [Mon, 16 Nov 2009 21:25:36 +0100] rev 9869
i18n-ja: fixed bad indentation
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 13:52:53 -0600] rev 9868
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 16 Nov 2009 11:31:08 -0800] rev 9867
Allow import --no-commit over an applied MQ patch.
Since it only changes the working directory, it does not matter whether a patch is
applied. This change makes it easier to use hg import --no-commit instead of patch.
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 12:51:00 -0600] rev 9866
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 16 Nov 2009 14:37:31 -0200] rev 9865
i18n-pt_BR: synchronized with crew 9c43089b372a
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 16 Nov 2009 09:58:45 +0200] rev 9864
i18n-de: messages for 9e7b2c49d25d and translation of patchbomb
Wagner Bruna <wbruna@yahoo.com> [Sun, 15 Nov 2009 21:57:02 -0200] rev 9863
i18n-pt_BR: messages for 9e7b2c49d25d and cleanup
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 13 Nov 2009 14:30:57 +0900] rev 9862
i18n-ja: synchronized with 004bf1d6e6af
Henrik Stuart <henrik.stuart@edlund.dk> [Mon, 16 Nov 2009 13:35:36 +0100] rev 9861
support encoding fallback in branchmap to maintain compatibility with 1.3.x
Patrick Mezard <pmezard@gmail.com> [Mon, 16 Nov 2009 14:09:31 +0100] rev 9860
convert/svn: fix warning when repo detection failed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 11:58:03 +0100] rev 9859
inotify: workaround test-inotify-dirty-dirstate failures
- disable inotify during clone
- record inotify daemon PID, in order to have them properly killed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 11:55:29 +0100] rev 9858
lock: the correct way to do a trylock() is to use a timeout of 0
Martin Geisler <mg@lazybytes.net> [Sat, 14 Nov 2009 14:21:53 +0100] rev 9857
diff: change --inverse to --reverse
This fixes an incompatibility with patch(1), which also uses --reverse
for reversed diffs. The --inverse flag was added in 3f522d2fa633. That
name was chosen over --reverse since it was thought that --reverse
would make --rev ambiguous.
It turns out that both flags can co-exist, with the cost that --rev
can no longer be shortened to --r and --re. Since one can always use
the short -r option, this is not a real problem.
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 17:41:21 +0100] rev 9856
setup: pass LD_LIBRARY_PATH to subprocess when determining version.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 11 Nov 2009 14:38:59 +0900] rev 9855
inotify: Do not access inotify when dirstate is dirty (issue1811)
Original patch was provided by Simon Heimberg
It delegates dirstate computation to dirstate.status when dirstate is dirty:
better be slow from time to time instead of using wrong data.
This solves issue1719. As the last component, issue1810, is still not solved,
test-inotify-dirty-dirstate will fail for now. It emphasizes a regression due
to 7c01599dd340:
changeset: 9515:7c01599dd340
user: Nicolas Dumazet <nicdumz.commits@gmail.com>
date: Sun Aug 16 11:11:37 2009 +0900
summary: inotify: use cmdutil.service instead of local daemonizing code
Ancestors of 7c01599dd30 are passing the test, when applied this patch.
Regression has to be investigated, but this patch is important since it affects
often mq operations.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 13 Nov 2009 08:31:10 +0900] rev 9854
inotify: mark directories visited during lookup (issue1844)
Emulate the match.dir calls that are made in dirstate.walk:
* first mark the visited directories on the server side
* then extend the transmitted response to include this directory list
* and lastly call match.dir on each directory
Henrik Stuart <hg@hstuart.dk> [Fri, 13 Nov 2009 06:36:26 +0100] rev 9853
Merge with crew-stable
Henrik Stuart <hg@hstuart.dk> [Fri, 13 Nov 2009 06:29:49 +0100] rev 9852
url: generalise HTTPS proxy handling to accomodate Python changes
Python 2.6.3 introduced HTTPS proxy tunnelling in a way that interferes with
the way HTTPS proxying is handled in Mercurial. This fix generalises it to work
on Python 2.4 to 2.6.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 12 Nov 2009 14:05:52 -0800] rev 9851
Make it possible to debug failed hook imports via use of --traceback
Prior to this change, if a Python hook module failed to load (e.g. due
to an import error or path problem), it was impossible to figure out
why the error occurred, because the ImportErrors that got raised were
caught but never displayed.
If run with --traceback or ui.traceback=True, hg now prints tracebacks
of both of the ImportError instances that get raised before it bails.
Matt Mackall <mpm@selenic.com> [Thu, 12 Nov 2009 14:34:07 -0600] rev 9850
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 12 Nov 2009 16:51:32 -0200] rev 9849
i18n-pt_BR: synchronized with crew d3dbdca92458
messages for a40ec11795c3 still included
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 22:55:44 +0100] rev 9848
i18n-da: translate parentrevspec and record
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 00:44:40 +0100] rev 9847
i18n-da: translations in color, graphlog, mq
Martin Geisler <mg@lazybytes.net> [Tue, 10 Nov 2009 20:51:11 +0100] rev 9846
i18n-da: synchronized with a40ec11795c3
Jens Bäckman <jens.backman@gmail.com> [Tue, 10 Nov 2009 20:07:32 +0100] rev 9845
i18n-sv: synchronized with a40ec11795c3
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 09 Nov 2009 19:46:08 -0200] rev 9844
i18n-pt_BR: synchronized with a40ec11795c3
Matt Mackall <mpm@selenic.com> [Thu, 12 Nov 2009 12:03:39 -0600] rev 9843
merge: fix changectx.ancestor(workingctx) (issue1327)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 12 Nov 2009 16:39:11 +0100] rev 9842
hgweb: don't choke when an inexistent style is requested (issue1901)
Brodie Rao <me+hg@dackz.net> [Thu, 12 Nov 2009 10:29:40 -0500] rev 9841
pager: provide a default attend list
The default list includes commands which normally print large amounts of
text. This should be more user-friendly than paging all commands by default,
which can be confusing when the pager swallows input prompts (with, e.g.,
record, merge, HTTP/SSH authentication, etc.)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Nov 2009 12:46:00 +0100] rev 9840
Add missing bash_completion for qfinish
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 12 Nov 2009 13:43:36 +0100] rev 9839
help: don't show extension list on extension help
Patrick Mezard <pmezard@gmail.com> [Thu, 12 Nov 2009 12:05:43 +0100] rev 9838
convert/svn: fix HTTP detection bug introduced by 1b2516a547d4
The probe expected response is a 404 with content, and while urllib returns the
response body in this case, urllib2 raises an HTTP error.
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 22:53:01 +0100] rev 9837
record: handle translated prompt correctly
The prompt function would return 'y' or 'n' untranslated. This should
therefore not be compared to _('y') and _('n'). However, it turns out
that prompt could just as well return a good old Boolean.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 11 Nov 2009 21:52:02 +0100] rev 9836
doc/style: add orange border color to notes
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 21:45:13 +0100] rev 9835
hgrc.5: mark some words as inline literals
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 21:29:35 +0100] rev 9834
hgignore.5: fix typo
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 21:16:20 +0100] rev 9833
doc/style: fix typo in comment (by timeless)
Yuya Nishihara <yuya@tcha.org> [Tue, 10 Nov 2009 21:48:10 +0900] rev 9832
doc/style: use default font color specified by user
* it's bad to specify only foreground color:
http://www.w3.org/QA/Tips/color
* some people prefer dark background
* `color: #111' is mostly the same as `color: black',
which is the default of almost all popular browsers.
so it's preferable to delete `color: #111', rather than adding
`background-color: white'.
Stuart W Marks <smarks@smarks.org> [Tue, 10 Nov 2009 22:27:31 -0800] rev 9831
help: improve wording of update help text
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 20:08:26 +0100] rev 9830
hgrc.5: oft-requested "hg update" hook example
Patrick Mezard <pmezard@gmail.com> [Wed, 11 Nov 2009 19:45:00 +0100] rev 9829
convert/svn: delegate to svn bindings if HTTP probe fails
convert extension tries to guess the remote repository type with HTTP probes.
Unfortunately, it does not handle authentication or HTTPS handshakes, so regular
svn repositories may be excluded. Instead, when a non-404 error is retrieved,
we keep trying with the svn bindings. The drawback is missing svn bindings will
make the conversion to fail even for non-svn targets. This can be avoided with
--source.
Patrick Mezard <pmezard@gmail.com> [Wed, 11 Nov 2009 18:32:56 +0100] rev 9828
test-rebase-newancestor: make executable
Patrick Mezard <pmezard@gmail.com> [Wed, 11 Nov 2009 18:31:42 +0100] rev 9827
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
Patrick Mezard <pmezard@gmail.com> [Wed, 11 Nov 2009 17:02:00 +0100] rev 9826
contrib/perf: profile diff of working directory changes
Bill Schroeder <bschroeder@allstontrading.com> [Wed, 04 Nov 2009 13:44:15 -0600] rev 9825
dispatch: better error message for --config option
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 00:05:12 +0100] rev 9824
mq: fix literal blocks in docstrings
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 23:45:24 +0100] rev 9823
convert/mtn: handle change in mtn 0.45 certs output
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 10 Nov 2009 22:42:13 +0100] rev 9822
merge with crew
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sat, 07 Nov 2009 12:28:31 +0100] rev 9821
bundle: add test for Issue1704
Original version by Greg Ward.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sat, 07 Nov 2009 12:28:30 +0100] rev 9820
bundle: don't send too many changesets (Issue1704)
The fast path in changegroupsubset can send too many csets. This happens
because it uses the parents of all bases as common nodes and then goes
forward from this again. If a base has a parent that has another child,
which is -not- a base, then this other child will nevertheless end up in
the changegroup.
The fix is to not use findmissing(), but use nodesbetween() instead, as
do the slow path and incoming/outgoing.
The change to test-notify.out is correct, because it actually hits this
bug, as can be seen by glog'ing the two repos:
@ 22c88
|\
| o 0a184
| |
o | 0647d
|/
o cb9a9
and
o 0647d
|
@ cb9a9
It used to pull 0647d again, which is unnecessary.
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 22:32:17 +0100] rev 9819
convert: reenable SVN support after license issue solved
Patrick Mezard <pmezard@gmail.com> [Sun, 08 Nov 2009 18:08:24 +0100] rev 9818
patchbomb: normalize date format in generated mboxes
mbox format should use time.asctime(). Unfortunately, this function writes
2-characters day of week on Windows while unix one writes a single character.
Normalize to Windows version since the other one can hardly be written with
strftime().
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 11:57:03 +0100] rev 9817
hghave: be more tolerant to rst2html output
On Windows, rst2html.bat calls rst2html.py, printing something like:
"rst2html.py (Docutils"
(notice the extra ".py")
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 21:55:59 +0100] rev 9816
test-convert-hg-svn: fix test output
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 20:15:49 +0100] rev 9815
rebase: make sure the newancestor is used during the whole update
(issue1561)
Before this change, newancestor was used only once as a replacement
for ancestor.ancestor, but merge.update calls ancestor.ancestor
several times, so it ends up with the "wrong" ancestor (the real
ancestor, but we want the parent of the rebased changeset for all but
the first rebased changeset).
Added a new test case for this: test-rebase-newancestor.
Also, in one scenario in test-rebase-collapse, there was a spurious
conflict caused by the same issue, so that test case was fixed by
removing the now unneeded conflict resolution and the output was
adapted accordingly.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 10:06:08 +0100] rev 9814
buildrpm: enhance changelog of the RPM file
Now the changelog is different depending if the parent is tagged:
- for tags, keep the previous content, i.e. changelog of the tags.
- for nightly build, changelog of the changesets since the latest tag
As RPM is expecting strictly descending dates, I have used a python
script to reorder the mercurial changelog.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:59:55 +0100] rev 9813
buildrpm: build full RPM package including sources
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:53:23 +0100] rev 9812
buildrpm: cleanup script
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:35:38 +0100] rev 9811
buildrpm: enable to start the script from anywhere
Previously the script worked only from the hg root.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:30:18 +0100] rev 9810
buildrpm: warn if there is outstanding uncommitted changes
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:26:29 +0100] rev 9809
buildrpm: build from working dir parent and use hg version for RPM versioning
Previous, RPMs was always built from tip, and the release number did not match
the 'hg version' put in place for 1.4.
This will enable also to this script to be able to build official tag and not
only nightly build.
Martin Geisler <mg@lazybytes.net> [Mon, 09 Nov 2009 23:47:24 +0100] rev 9808
doc: fix language in CSS comments (by timeless)
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 17:33:16 +0100] rev 9807
setup: fix f51d1822d6fd refactoring, propagate env to runcmd
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 09 Nov 2009 17:28:40 -0200] rev 9806
clone: simplify help text
Martin Geisler <mg@lazybytes.net> [Mon, 09 Nov 2009 20:43:06 +0100] rev 9805
Merge with main
Dongsheng Song <dongsheng.song@gmail.com> [Mon, 09 Nov 2009 20:39:58 +0100] rev 9804
i18n-zh: updated Chinese translation
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:41:54 +0100] rev 9803
i18n-da: synchronized with 6cb1808e5ae7
Mads Kiilerich <mads@kiilerich.com> [Sun, 08 Nov 2009 18:50:39 +0100] rev 9802
test-extension: Solaris grep don't know [[:digit:]]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 18:18:46 +0100] rev 9801
merge with hg-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 18:05:56 +0100] rev 9800
fix test-patchbomb on solaris
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 17:59:36 +0100] rev 9799
fix test-diffstat on solaris
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 17:27:01 +0100] rev 9798
doc: uppercase first letter in HTML man pages
Matt Mackall <mpm@selenic.com> [Sun, 08 Nov 2009 10:40:51 -0600] rev 9797
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Nov 2009 17:09:28 +0100] rev 9796
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Nov 2009 17:03:24 +0100] rev 9795
merge with stable
Yuya Nishihara <yuya@tcha.org> [Mon, 09 Nov 2009 00:00:47 +0900] rev 9794
doc: styles for man page, which suit with the mercurial website
designed loosely based on:
http://mercurial.selenic.com/css/styles.css
with some modifications by intention:
* visited links are colored differently
* no fixed size
* works without typeface.js
we keep most styles, which is from docutils, untouched.
tested with:
* MSIE 6.0 on Windows
* Firefox 3.5 on Linux
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 16:16:21 +0100] rev 9793
rst2man: more robust uppercasing of section titles
This handles section titles with child elements such as emphasis or
inline literals.
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 11:46:38 +0100] rev 9792
doc: use titlecase in man page section titles
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 11:41:34 +0100] rev 9791
rst2man: automatically write sections in uppercase
Man pages have uppercased section titles but other formats do not.
Letting rst2man handle the tranformation allows better reuse of text
between man pages and other formats.
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:11:34 +0100] rev 9790
relink: do not translate format string with no text
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:38:01 +0100] rev 9789
Use utf-8 encoding in test-branchmap's clone call
After 75520c24feda it is printed in local encoding, i.e. "C" if not set
otherwise.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:35:46 +0100] rev 9788
Branch name printed since a3d73b3e1f8a now in local encoding.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:27:25 +0100] rev 9787
Make test-branchmap executable and adjust output after a3d73b3e1f8a
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 22:13:09 +0100] rev 9786
ui: refer to "hg help config" when no username is set
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 22:12:50 +0100] rev 9785
help: add "hg help config" topic
This is a condensed version of the first two sections of hgrc.5.txt.
After a slight upgrade of minirst, we can move the whole of hgrc.5.txt
into the config help topic and just let the man page include it.
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 18:47:04 +0100] rev 9784
hgrc.5: do not mention "name: value" syntax
This was supported in versions prior to 1.3 where we used the standard
Python ConfigParser. The new config parser never supported it.
Matt Mackall <mpm@selenic.com> [Sun, 08 Nov 2009 10:29:52 -0600] rev 9783
submerge: properly deal with overwrites
also pull .hgsubstate check out of inner loop
Matt Mackall <mpm@selenic.com> [Sun, 08 Nov 2009 10:24:18 -0600] rev 9782
subrepo: add more debugging output, lose _ markers
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 16:31:43 -0600] rev 9781
subrepo: do a linear update when appropriate
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 16:30:42 -0600] rev 9780
subrepo: notice dirty subrepo states when merging
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 16:29:49 -0600] rev 9779
subrepo: add some debug output to submerge
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:13:15 -0600] rev 9778
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Wed, 04 Nov 2009 22:14:26 +0100] rev 9777
i18n-sv: add missing newlines to translations
Jens Bäckman <jens.backman@gmail.com> [Wed, 04 Nov 2009 21:59:41 +0100] rev 9776
i18n-sv: simple translation fixes
Fixed the fuzzy translations. Also took care of a few really simple strings,
and translated the 'summary' command.
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 02 Nov 2009 17:25:43 +0200] rev 9775
i18n-de: Update msgids, remove .txt linespecs + few small translations
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 28 Oct 2009 18:53:12 -0200] rev 9774
i18n-pt_BR: synchronized with d942e06d7b14
Martin Geisler <mg@lazybytes.net> [Wed, 28 Oct 2009 20:48:24 +0100] rev 9773
Merge with main
Martin Geisler <mg@lazybytes.net> [Mon, 26 Oct 2009 20:58:49 +0100] rev 9772
i18n-da: synchronized with e06c940d554d plus some new translations
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 26 Oct 2009 12:32:14 -0200] rev 9771
i18n-pt_BR: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:50:30 +0100] rev 9770
i18n-zh_TW: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:50:12 +0100] rev 9769
i18n-zh_CN: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:49:25 +0100] rev 9768
i18n-sv: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:47:48 +0100] rev 9767
i18n-ja: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:46:23 +0100] rev 9766
i18n-it: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:44:57 +0100] rev 9765
i18n-fr: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:44:22 +0100] rev 9764
i18n-el: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sat, 24 Oct 2009 00:47:49 +0200] rev 9763
Merge with main
Martin Geisler <mg@lazybytes.net> [Sat, 24 Oct 2009 00:44:57 +0200] rev 9762
i18n-da: synchronized
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 20 Oct 2009 15:26:22 -0200] rev 9761
i18n-pt_BR: translate 'changeset' like 'revision'
On Mercurial, 'changeset' and 'revision' may be used
interchangeably, but the first is more or less
untranslatable to a single word.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 18:24:56 +0200] rev 9760
i18n: merge de and pt_BR translations
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 18:11:21 +0200] rev 9759
i18n-de: fixed inline emphasis
The test-gendoc test said:
gendoc-de.txt:1385: (WARNING/2) Inline emphasis start-string without
end-string
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 18:23:33 +0200] rev 9758
i18n-pt_BR: fixed bullet list
The test-gendoc test said:
gendoc-pt_BR.txt:1475: (WARNING/2) Bullet list ends without a blank
line; unexpected unindent.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 20 Oct 2009 13:09:47 -0200] rev 9757
i18n-pt_BR: synchronized with fc493cb90bb1
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 20 Oct 2009 13:07:26 -0200] rev 9756
i18n-pt_BR: synchronized with 5287de171d74
Fabian Kreutz <fabian.kreutz@starnet.fi> [Tue, 20 Oct 2009 17:31:09 +0300] rev 9755
i18n-de: Removed all fuzzies and translated small alphaend-extensions
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 28 Sep 2009 20:32:54 -0300] rev 9754
i18n-pt_BR: synchronized with 02c43e8e0835
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:12:08 -0600] rev 9753
Fix up import test
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:09:16 -0600] rev 9752
subrepo: more robust split for .hgsubstate parsing
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:07:45 -0600] rev 9751
filectx: shortcut unrelated files in ancestor() (issue1327)
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:07:45 -0600] rev 9750
merge: first part of fix for issue1327
When there are no renames involved, we shortcut to the changeset
ancestor. This resolves most cases.
Note that Mercurial's rename philosophy elsewhere is that a file's
name is signficant and rename data is only consulted when a file of
the same name is absent.
Jesse Glick <jesse.glick@sun.com> [Thu, 05 Nov 2009 16:40:48 -0500] rev 9749
Related to Issue919: ui.progress, apparently unused before now, is busted.
Jesse Glick <jesse.glick@sun.com> [Sat, 17 Oct 2009 14:00:41 -0400] rev 9748
Sometimes pushing to an HTTP repo fails with a useless message.
abort: 'https://.../.../' does not appear to be an hg repository!
Ought to produce a better diagnostics on the client. With patched 1.3.1,
observed to produce an Apache HTML error message (from cgitb) including the
vital text:
File ".../hgwebdir.cgi", line 70, in ?
wsgicgi.launch(application)
File "mercurial/hgweb/wsgicgi.py", line 68, in launch
File "mercurial/hgweb/hgwebdir_mod.py", line 91, in __call__
File "mercurial/hgweb/hgwebdir_mod.py", line 148, in run_wsgi
File "mercurial/hgweb/hgweb_mod.py", line 100, in run_wsgi
File "mercurial/hgweb/protocol.py", line 156, in unbundle
File "mercurial/localrepo.py", line 2031, in addchangegroup
File "mercurial/revlog.py", line 1204, in addgroup
LookupError: 00manifest.i@......: unknown parent
Might also be helpful if server's hgweb_mod.run_wsgi caught unexpected errors
and returned a well-formed error response including the stack trace. The client
patch would still be useful in this case, because it would let you diagnose
issues with HTTP proxy servers and so on.
timeless@mozdev.org [Mon, 26 Oct 2009 02:06:23 +0200] rev 9747
hg help resolve grossly mischaracterizes the --all switch
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 15:51:32 +0100] rev 9746
hgrc.5: mark more inline literals
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 14:41:03 +0100] rev 9745
hgrc.5: do not turn random URLs into links
URLs and email addresses are automatically turned into links. We don't
want that when talking about example links and addresses.
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 14:30:58 +0100] rev 9744
hgrc.5: use enumerated list for email charsets
Christian Ebert <blacktrash@gmx.net> [Sat, 07 Nov 2009 13:54:47 +0100] rev 9743
hgrc.5: order of email charsets is not a top level literal block
- it belongs under email charsets, not email in general
- enumerate order
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 07 Nov 2009 13:25:25 +0100] rev 9742
sshrepo: move mkstemp() out of the try block, we don't use the exception
simpler fix for 3b6f18851d87
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:22:03 +0100] rev 9741
minirst: update module docstring
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:16:23 +0100] rev 9740
commands: use enumerated lists in help texts
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:14:56 +0100] rev 9739
minirst: support enumerated lists
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:04:46 +0100] rev 9738
minirst: prepare for general types of bullet lists
The old code worked for '-' bullets only, but we can easily support
variable width bullets.
Martin Geisler <mg@lazybytes.net> [Fri, 06 Nov 2009 00:30:35 +0100] rev 9737
minirst: combine list parsing in one function
Bullet, option, field, and definition lists were parsed very similar
code. They are now parsed by a single function (splitparagraphs).
Some logic from the old parsing functions has been moved down to
formatblock. This simplifies the parsing while putting the logic where
it's really needed.
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 21:53:22 +0100] rev 9736
test-minirst: don't test on invalid reST input
Input such as
Only the
left-most line
(this line!)
is significant
for the indentation
is not valid reStructuredText: the first line starts a block quote,
but then the second line is not allowed to be unindented.
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 21:30:50 +0100] rev 9735
minirst: remove unnecessary "elif:" statements
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 01:46:27 +0100] rev 9734
commands: call ui.username carefully in debuginstall
After c63c336ee2f7, 'hg debuginstall' would abort halfway through if
no username was set. We now catch and display the exception instead.
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 00:13:05 +0100] rev 9733
mq: do not call ui.username unless it is necessary
After changeset c63c336ee2f7, ui.username will abort by default if no
username is set. It is therefore wrong to call ui.username when a
username was provided on the command line.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 06 Nov 2009 22:54:51 +0100] rev 9732
util: sort paths in walkrepos() (fixes test failures in test-hgwebdir)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 06 Nov 2009 22:46:46 +0100] rev 9731
hgweb: treat rev as raw-rev if user agent is hg
Marti Raudsepp <marti@juffo.org> [Fri, 06 Nov 2009 13:48:17 +0200] rev 9730
patchbomb: fix 'echo -en' bashism in test-patchbomb
The echo command doesn't accept options in some shells.
printf is required by the SUSv2 (Single UNIX Specification v2).
Jesse Glick <jesse.glick@sun.com> [Thu, 05 Nov 2009 17:38:03 -0500] rev 9729
Issue919: add a standard extension to recreate hardlinks between repositories.
Having to run a standalone Python script from the contrib dir is a nuisance.
Also makes various improvements to locking, file discovery, etc.
Should also update: http://www.selenic.com/mercurial/wiki/index.cgi/RecreateHardlinksBetweenRepositories
Joel Rosdahl <joel@rosdahl.net> [Fri, 06 Nov 2009 08:28:45 +0100] rev 9728
tests: glog with style and file parameter (issue1896)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 06 Nov 2009 08:27:17 +0100] rev 9727
graphlog: don't pass filectxs to the templater (issue1896)
Augie Fackler <durin42@gmail.com> [Mon, 02 Nov 2009 11:03:22 -0500] rev 9726
keepalive: handle broken pipes gracefully during large POSTs
Yannick Gingras <ygingras@ygingras.net> [Thu, 05 Nov 2009 15:18:56 +0100] rev 9725
diff: add --inverse option
Most of the time, one can reverse a diff by swapping the revisions passed with
-r but it happens that if you use the global -R, and diff against the tip of
the current repo, you can't swap the revisions. One use-case for that is
reviewing changes from a bundle before unbundling. One could also pipe the
output of `hg diff` to a command line filter that reverses the diff, but that
would remove the benefit from color diffs. Therefore, having an option in
`hg diff` to reverse a diff is a good thing.
The option flag selection was tricky. GNU patch uses -R/--reverse but -R is
already used as a global option and --reverse would make --rev ambiguous.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 15:06:35 +0100] rev 9724
hgweb: keep original order from hgwebdir config files (issue1535)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 15:01:00 +0100] rev 9723
hgweb: use a tuple-list instead of dictionary for append-only store
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 15:19:54 +0100] rev 9722
templater: readable dates older than 24 months revert to ISO8601 (issue1006)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 14:44:29 +0100] rev 9721
templater: put 'ago' inside the age template filter
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 14:26:37 +0100] rev 9720
coal/paper: show link to latest file revision (issue1344)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 11:51:35 +0100] rev 9719
tests: fix hghave test for rst2html to not spew error output
Stuart W Marks <smarks@smarks.org> [Thu, 05 Nov 2009 10:59:33 +0100] rev 9718
help: describe new cross-branch behavior in update help text, plus cleanups
Stuart W Marks <smarks@smarks.org> [Thu, 05 Nov 2009 10:53:59 +0100] rev 9717
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
Stuart W Marks <smarks@smarks.org> [Thu, 05 Nov 2009 10:53:36 +0100] rev 9716
update: add comments and test cases for updating across branches
Add comment to merge.py:update() showing various cases of 'hg update': to a
descendant, crossing named branches, and crossing branches within a named
branch; with no option, -c or -C; with or without uncommitted changes; and
with or without a specific revision. Add tests for all of these cases.
Marti Raudsepp <marti@juffo.org> [Thu, 05 Nov 2009 10:49:28 +0100] rev 9715
patchbomb: fix handling of email addresses with Unicode domains (IDNA)
dom.encode('idna') requires dom to be a Unicode string.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 05 Nov 2009 11:05:13 +0100] rev 9714
clone: add option -u/--updaterev
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 11:07:01 +0100] rev 9713
hgweb/sshserver: extract capabilities for easier modification
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 10:44:36 +0100] rev 9712
kill trailing whitespace
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 01:11:28 +0100] rev 9711
color: wrap qrecord
The qrecord command is registered in uisetup phase, so we do our
wrapping in extsetup phase.
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 01:10:43 +0100] rev 9710
record: use uisetup instead of extsetup to register qrecord
New commands should be registered in uisetup so that other extensions
have a change of wrapping them in extsetup.
Sune Foldager <cryo@cyanite.org> [Wed, 04 Nov 2009 15:18:19 +0100] rev 9709
merge: supply base node to merge tools in the environment
Merge tools will be able to exploit this to correctly merge backouts.
This won't work fully, though, until issue 1327 is solved, since the
node information is not necessarily correct.
Martin Geisler <mg@lazybytes.net> [Wed, 04 Nov 2009 09:34:04 +0100] rev 9708
test-bisect: normalize shell error message
Different shells on vary in their error messages. Here we're satisfied
if the shell mentions './foobar' at all.
Greg Ward <greg-hg@gerg.ca> [Mon, 02 Nov 2009 17:06:11 -0500] rev 9707
run-tests: add "debug" mode: don't capture child output, just show it.
In debug mode, we:
- don't try to diff expected vs actual output
- disallow --interactive
- disable timeouts (warn if user tried to supply one)
- don't try to parse hghave output, since we don't have the output
- don't try to save output to .err file
Greg Ward <greg-hg@gerg.ca> [Mon, 02 Nov 2009 17:06:10 -0500] rev 9706
run-tests: make --tmpdir option more useful.
- instead of creating HGTMP inside tmpdir, now HGTMP is tmpdir
(thus, fail if tmpdir already exists)
- passing --tmpdir automatically turns on --keep-tmpdir
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:55:59 +0100] rev 9705
hg.1: kill spurious backslash
I believe the backslash prevented asciidoc from automatically turning
"(C)" into a real copyright symbol. This replacement is not done in
reST in the first place.
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:47:03 +0100] rev 9704
help: markup email addresses as inline literals
Otherwise we get useless links to user@example.org in the HTML version
of the man pages.
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:38:42 +0100] rev 9703
doc/Makefile: add help/*.txt as a dependency
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:32:42 +0100] rev 9702
doc: add some internal links to man pages
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:08:33 +0100] rev 9701
hgrc.5: combined short paragraphs into one
Short and precise sentences are good, but we can have more than one
such sentence per paragraph.
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:02:56 +0100] rev 9700
doc: use reST note directive
The 'NOTE: bla bla' syntax was for asciidoc and is still present in a
couple of docstrings. The docstrings will be converted to reST format
when minirst knows how to handle it.
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 20:53:34 +0100] rev 9699
hgrc.5: capitalize True and False consistently
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 20:50:57 +0100] rev 9698
commands: slightly better help for --traceback
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 20:50:30 +0100] rev 9697
hgrc.5: document ui.traceback setting
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Nov 2009 19:07:26 +0100] rev 9696
fix tests output changed by 8269fe2d48f6
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Nov 2009 17:54:19 +0100] rev 9695
byterange: backport fix from upstream
Sune Foldager <cryo@cyanite.org> [Mon, 02 Nov 2009 10:20:04 +0100] rev 9694
hgweb: send proper error messages to the client
Fixes a bug in protocol which caused an exception during exception handling in
some cases on Windows. Also makes sure the server error message is correctly
propagated to the client, instead of being thrown away.
Sune Foldager <cryo@cyanite.org> [Mon, 02 Nov 2009 10:19:14 +0100] rev 9693
transaction: always remove empty journal on abort
When transactions without entries were aborted, the journal (of size 0) was not
unlinked, which prevents subsequent operations until hg recover is run on the
repository.
We also make sure the journal is unlinked when committing, even if the provided
hook doesn't do so.
Sune Foldager <cryo@cyanite.org> [Mon, 02 Nov 2009 10:18:43 +0100] rev 9692
test-bisect: fix shell-dependent output
Sune Foldager <cryo@cyanite.org> [Mon, 02 Nov 2009 10:17:20 +0100] rev 9691
change 'journal already exists' to 'abandoned transaction found'
Journal already exists is a pretty internal piece of information, which
doesn't necessarily mean much to people who are not familiar with the code.
The new text is a more well-known concept.
Sune Foldager <cryo@cyanite.org> [Mon, 02 Nov 2009 10:15:04 +0100] rev 9690
verify: report existence of journal
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 01 Nov 2009 03:26:10 +0100] rev 9689
bisect: no need to save the state if it wasn't changed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 01 Nov 2009 02:57:11 +0100] rev 9688
record: get the right position (account for skipped files)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 01 Nov 2009 02:54:32 +0100] rev 9687
log --limit: break after a limited number of csets (broken by f3d60543924f)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:17:59 +0100] rev 9686
transaction: more specific exceptions, os.unlink can raise OSError
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:10:52 +0100] rev 9685
lock: catch specific exceptions
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:02:34 +0100] rev 9684
patch: use the public ctx API instead of the internals
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:02:13 +0100] rev 9683
patch: don't use mutable object as default argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:01:08 +0100] rev 9682
patch: initialize all attributes of the hunk class
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:00:05 +0100] rev 9681
patch: simplify logic
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 17:07:12 +0100] rev 9680
lock: use '==' instead of 'is' for integer equality ('is' may not work)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 17:04:46 +0100] rev 9679
pychecker: remove unused local variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 16:56:58 +0100] rev 9678
remove unused imports
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 16:49:27 +0100] rev 9677
changelog: do not use a mutable default value
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 16:42:51 +0100] rev 9676
bundlerepo: keep the bundlerevlog interface in sync with revlog
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 00:31:08 +0100] rev 9675
localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names
We don't need a "local-charset" aware branchmap() function, we can convert the
names when needed during the output.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 00:27:50 +0100] rev 9674
localrepo/branchcache: kill unused localrepo.branchcache
The UTF-8 version of the branchcache is the master, always up-to-date, we can
rename it to localrepo._branchcache.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 00:20:28 +0100] rev 9673
localrepo/branchcache: rebuild the "charset-aware" branchcache when needed
It's simpler and the two cache weren't always in sync otherwise:
localrepo.branchcache would not be updated after calling branchmap()
Alexander Solovyov <piranha@piranha.org.ua> [Fri, 30 Oct 2009 15:43:01 +0200] rev 9672
churn: fix --progress (broken by f3d60543924f)
Henrik Stuart <henrik.stuart@edlund.dk> [Mon, 26 Oct 2009 13:37:39 +0100] rev 9671
transfer branchmap branch names over the wire in utf-8
Alexander Solovyov <piranha@piranha.org.ua> [Fri, 30 Oct 2009 13:40:23 +0200] rev 9670
churn: fix changeset count (broken by 9b127e888640)
Alexander Solovyov <piranha@piranha.org.ua> [Thu, 29 Oct 2009 20:50:24 +0200] rev 9669
churn: ability to display added/removed lines separately
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 30 Oct 2009 09:54:39 +0100] rev 9668
cmdutil: fix bug in finddate() implementation
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 30 Oct 2009 09:53:39 +0100] rev 9667
merge changes from mpm
Steve Borho <steve@borho.org> [Wed, 28 Oct 2009 22:47:46 -0500] rev 9666
cmdutil: update finddate()
walkchangerevs() now returns contexts, does not take a cache func.
Matt Mackall <mpm@selenic.com> [Thu, 29 Oct 2009 19:03:16 -0500] rev 9665
walkchangerevs: drop ui arg
Matt Mackall <mpm@selenic.com> [Thu, 29 Oct 2009 19:03:13 -0500] rev 9664
walkchangerevs: reset cache between windows
Matt Mackall <mpm@selenic.com> [Thu, 29 Oct 2009 17:07:54 -0500] rev 9663
log: tidy up some filter tests
Matt Mackall <mpm@selenic.com> [Thu, 29 Oct 2009 17:07:51 -0500] rev 9662
walkchangerevs: move 'add' to callback
Now walkchangerevs is a simple iterator over contexts
Yuya Nishihara <yuya@tcha.org> [Wed, 28 Oct 2009 23:59:18 +0900] rev 9661
hgweb: added test case for extension loading phases (issue1824)
this checks the order of module loading phases of hgweb.
`4) reposetup' lines are duplicated because hgweb calls
hg.repository() twice, one by __init__, another by refresh.
Yuya Nishihara <yuya@tcha.org> [Wed, 28 Oct 2009 23:55:23 +0900] rev 9660
extensions: changed to call extsetup() from extensions.loadall()
previously uisetup() was invoked by extensions.loadall(), but
extsetup() was by _dispatch().
there's no need to split them because we have nothing to do
between uisetup() and extsetup().
this fixes issue1824 indirectly.
Adrian Buehlmann <adrian@cadifra.com> [Wed, 21 Oct 2009 13:40:55 +0200] rev 9659
hgrc.5.txt: mention hgrc categories with higher precedence first
Reordering the FILES section accordingly.
The previous ordering of categories might have been nice from the
viewpoint of a site admin doing an initial install, but presenting a
higher-precedence-first ordering is more relevant and natural for the
average end user, since he will most likely resort to editing rc files
in the order of their precedence, overriding whatever "sane" defaults
are coming from more general files.
Note that this patch does not change the texts, it just moves them.
So, whatever bugs, grammar errors, or typos may have been in the texts
before this patch: they are still there. On purpose. Because this patch
here does not want to reword texts while moving them.
Sune Foldager <cryo@cyanite.org> [Wed, 28 Oct 2009 21:35:57 +0100] rev 9658
hook: only redirect stdout if it and stderr are valid files
When using hgwebdir with WSGI via the IIS ISAPI-WSGI extension, both
stdout and stderr filenos are set to -2, which makes the os.dup call
in hook.py fail.
Matt Mackall <mpm@selenic.com> [Wed, 28 Oct 2009 13:17:03 -0500] rev 9657
verify: filter the candidate list for broken linkrevs
Matt Mackall <mpm@selenic.com> [Tue, 27 Oct 2009 17:14:19 -0500] rev 9656
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 27 Oct 2009 17:01:32 -0500] rev 9655
walkchangerevs: internalize ctx caching
Matt Mackall <mpm@selenic.com> [Sun, 25 Oct 2009 18:43:59 -0500] rev 9654
walkchangerevs: yield contexts
Matt Mackall <mpm@selenic.com> [Sun, 25 Oct 2009 18:43:58 -0500] rev 9653
walkchangerevs: kill window step of iterator
Matt Mackall <mpm@selenic.com> [Sun, 25 Oct 2009 18:43:56 -0500] rev 9652
walkchangerevs: pull out matchfn
* * *
imported patch mercurial/commands.py
Yuya Nishihara <yuya@tcha.org> [Tue, 27 Oct 2009 21:59:44 +0900] rev 9651
diffstat: made test case work with POSIX sh and printf
* arithmetic expression ((...)), without $, is bashism.
* printf '\xXX' seems non-standard. '\0' is okay.
http://www.opengroup.org/onlinepubs/009695399/utilities/printf.html
tested with bash 4.0 and dash 0.5.5.1
Sune Foldager <cryo@cyanite.org> [Tue, 27 Oct 2009 10:33:41 +0100] rev 9650
bundlerepo: fix small bug in exception raising
timeless@mozdev.org [Sun, 25 Oct 2009 14:45:38 +0200] rev 9649
minor documentation improvements
Alexander Solovyov <piranha@piranha.org.ua> [Sun, 25 Oct 2009 14:28:02 +0100] rev 9648
patchbomb: accept default if it is empty string
This fixes Cc: prompt.
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 14:24:39 +0100] rev 9647
patchbomb: fix double-spaces in prompts
timeless <timeless@gmail.com> [Sun, 25 Oct 2009 13:27:54 +0100] rev 9646
commands: adding --no-status to resolve to match status
timeless@mozdev.org [Wed, 21 Oct 2009 12:41:28 +0300] rev 9645
commands: use rev from remote repo when updating as part of a pull
timeless@mozdev.org [Wed, 21 Oct 2009 12:03:14 +0300] rev 9644
commands: highlighting that rev is based on the remote repository
Alexander Solovyov <piranha@piranha.org.ua> [Sun, 25 Oct 2009 12:05:07 +0200] rev 9643
bookmarks: use API to determine if repo is local
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:53:33 +0200] rev 9642
diffstat: with --git, mark binary files with Bin
Normally, diffs without any text insertions or deletions are reported
as having 0 lines changed by stock diffstat. Compatibility is
preserved with stock diffstat in this case, but when using --git,
binary files are marked with Bin as a means of clarification.
git diff --stat does something similar, though it also includes the
old and new file sizes.
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:52:36 +0200] rev 9641
color: colorize diff --stat
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:52:35 +0200] rev 9640
diff: add --stat for diffstat output
diff/qdiff --stat invokes patch.diffstat() on the diff output.
When in interactive mode, the output's maximum width is determined by the
terminal's width.
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:35:35 +0200] rev 9639
diffstat: print 0 instead of nothing for 0 adds or removes
This is in line with how the stock diffstat behaves when processing a
single diff with no line modifications (like a binary diff).
Gilles Moris <gilles.moris@free.fr> [Sat, 24 Oct 2009 12:29:39 +0200] rev 9638
update tcsh_completion for the new forget and summary commands
Adrian Buehlmann <adrian@cadifra.com> [Sat, 24 Oct 2009 19:01:40 +0200] rev 9637
cmdutil: minor refactoring of changeset_printer._show
- use ctx.branch() instead of directly accessing the extra field "branch"
- move definitions of locals ('extra' and 'branch') down to where they
are used
Martin Geisler <mg@lazybytes.net> [Sat, 24 Oct 2009 00:29:25 +0200] rev 9636
commands: search for translated version of "DEPRECATED"
The option description is already translated at this point, so we must
search for a translation of "DEPRECATED".
Gilles Moris <gilles.moris@free.fr> [Fri, 23 Oct 2009 23:10:05 +0200] rev 9635
mercurial.spec: update requirements for the build
Martin Geisler <mg@lazybytes.net> [Fri, 23 Oct 2009 22:55:28 +0200] rev 9634
convert: document parent order in splicemap help (issue1764)
Pascal Quantin <pascal.quantin@gmail.com> [Thu, 22 Oct 2009 23:41:01 +0200] rev 9633
Add style.css file to Inno Setup script
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 21 Sep 2009 19:21:32 +0200] rev 9632
util: use sys.argv[0] if $HG is unset and 'hg' is not in PATH
This is necessary when the executable name is not 'hg'. For example,
if your system-wide mercurial is name 'hgs', sys.argv[0] is more
accurate than 'hg'.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 21 Oct 2009 14:16:37 +0200] rev 9631
graphlog: hide internal state of ascii() from users
Adrian Buehlmann <adrian@cadifra.com> [Thu, 22 Oct 2009 00:46:54 +0200] rev 9630
doc/hgrc.5.txt: deprecate [defaults]
Quoting Matt:
"Defaults are a bad idea. They are deprecated. Don't use them. Don't
recommend them. Forget they existed. Use aliases."
in http://selenic.com/pipermail/mercurial-devel/2009-October/016095.html
Matt Mackall <mpm@selenic.com> [Wed, 21 Oct 2009 17:54:51 -0500] rev 9629
Merge with crew
Martin Geisler <mg@lazybytes.net> [Thu, 22 Oct 2009 00:30:24 +0200] rev 9628
rst2man: highlight inline literals in bold
The old code would switch to Courier, but that doesn't really help
much in a manpage.
Martin Geisler <mg@lazybytes.net> [Thu, 22 Oct 2009 00:27:08 +0200] rev 9627
rst2man: avoid italic for references
The links to other manpages used both italic and bold text nested
within each other. The \fP (select previous font) macro was used
incorrectly to "reset" the nested fonts resulting in:
<roman> text <italic> <bold> hg <italic> (1) <bold> more text
with no switch back to roman. This stops the bleeding and removes the
ugly italic (underline) from the manpage links.
Martin Geisler <mg@lazybytes.net> [Wed, 21 Oct 2009 23:40:01 +0200] rev 9626
doc: add a style sheet to the generated HTML pages
Matt Mackall <mpm@selenic.com> [Wed, 21 Oct 2009 17:42:22 -0500] rev 9625
summary: remove reference to -p
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:43:17 +0200] rev 9624
doc, help: stream-line use of inline-literals
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:16:27 +0200] rev 9623
minirst: convert ``foo`` into "foo" upon display
This lets us markup many more occurances of inline literals since they
no longer look strange in the terminal output.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:42:49 +0200] rev 9622
gendoc: fix synopsis
The synopsis is used as an inline literal when generating the manpage.
There should not be any whitespace on the inside of the quotation
marks in inline literals.
Commands with an empty synopsis (such as tags) produces ``tags `` as
synopsis, which triggers a warning.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:39:37 +0200] rev 9621
test-debugcomplete: update output to match a7ef354da662
Matt Mackall <mpm@selenic.com> [Tue, 20 Oct 2009 11:59:38 -0500] rev 9620
summary: add --remote
Matt Mackall <mpm@selenic.com> [Tue, 20 Oct 2009 11:58:09 -0500] rev 9619
summary: restore briefer commit status
Matt Mackall <mpm@selenic.com> [Tue, 20 Oct 2009 11:57:25 -0500] rev 9618
summary: add empty repository and no revision checked out hints
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 23:53:25 -0500] rev 9617
Merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 20 Oct 2009 00:30:36 +0200] rev 9616
merge with crew
Gilles Moris <gilles.moris@free.fr> [Sun, 18 Oct 2009 14:35:36 +0200] rev 9615
setup: refactor the version string to a subset of tag+tagdist-hash+date
Here is an array summarizing the mercurial version string:
[A] [B] [C] [D]
[1] clone tag clean => tag
[2] clone hash clean => latesttag+latesttagdistance-hash
[3] clone tag dirty => tag+date
[4] clone hash dirty => latesttag+latesttagdistance-hash+date
[5] archive tag clean => tag
[6] archive hash clean => latesttag+latesttagdistance-hash
Column [A]: Mercurial built from an hg *archive* or hg *clone* working directory
Column [B]: revision built has a *tag* or else default to the SHA1 *hash*
Column [C]: working tree *clean* or *dirty*
Column [D]: Mercurial version string
Over the previous version:
- row [5] did return just the node hash, now it returns the tag
- prepend the latest tag and the distance to it to rows [2][4][6]
- append also the date to row [3]; previously, it was just the tag
- the version string is with an empty string to avoid possible TypeError
exceptions during string manipulations
- factorize the function to run hg commands; remove the error message as it is
no more specific to the function.
This scheme enables to have first part of the version strings that can be
compared, whether it has been built from a tagged or untagged revision.
The second part of the version adds a hash for untagged revisions and today's
date if the working tree has local modifications.
As the version string does not contain spaces or special characters, it should
not break script parsing the 'hg version' command and should be usable for use
in file names.
The new code also ensure that the version string has exactly the same version
string, whether it has been built from an archive or from a clone.
Gilles Moris <gilles.moris@free.fr> [Tue, 11 Aug 2009 09:04:02 +0200] rev 9614
archive: add branch and tag informations to the .hg_archival.txt file
Up to this changeset, only the repo (first node) and current node hash were
included. This adds also the named branch and tags.
So the additional lines to .hg_archival.txt are
branch: the named branch
tag: the global tags of this revision, one per line in case of multiple tags
latesttag: if the revision is untagged, the latest tag (most recent in
ancestors), again one per line if this ancestor has multiple tags.
latestagdistance: the longest distance (changesets) to this latest ancestor.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 00:17:36 +0200] rev 9613
ui: only use "user@host" as username in noninteractive mode
We regularly see people on IRC ask how they can correct commits they
accidentally made without having configured a username. This change
will make Mercurial abort when a commit is made without a username.
If Mercurial is run without a TTY (from a cronjob or similar), a
username is constructed as usual. Schematically the changes are as
follows:
With ui.askusername=False:
old new
interactive user@host abort
noninteractive user@host user@host
With ui.askusername=True:
old new
interactive prompt prompt
noninteractive user@host user@host
Alexander Solovyov <piranha@piranha.org.ua> [Mon, 19 Oct 2009 23:27:20 +0300] rev 9612
fix patchbomb prompt when sending series of patches
Adrian Buehlmann <adrian@cadifra.com> [Fri, 16 Oct 2009 23:57:34 +0200] rev 9611
hg.clone: report branch name on update
Alexander Solovyov <piranha@piranha.org.ua> [Mon, 19 Oct 2009 22:19:28 +0300] rev 9610
make path expanding more consistent
This expands ~user and $FOO constructs in ui.ignore files, [defaults],
[paths], extension paths, and HGRCPATH files.
Henrik Stuart <hg@hstuart.dk> [Sat, 17 Oct 2009 15:40:34 +0200] rev 9609
tests: fix inadvertent use of existing test repository
David Soria Parra <dsp@php.net> [Mon, 19 Oct 2009 07:14:44 +0200] rev 9608
commands: clarify output for the commit summary
It is not clear what is meant with '2 modified, 3 unknown'. We clarify
this by writing '2 modified files, 3 unknown files' instead.
Martin Geisler <mg@lazybytes.net> [Mon, 19 Oct 2009 14:37:37 +0200] rev 9607
commands: do not split a translated string
Splitting the string after translation relies on the implicit
assumption that translators will always translate the English words
using single foreign words.
Also, when translating we want as much context as possible so I've
moved the string formatting into the translatable string.
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 00:36:52 -0500] rev 9606
Remove parents from default help in favor of summary
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 00:22:49 -0500] rev 9605
summary: quieter with -q
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 00:21:06 -0500] rev 9604
commands: fix missing empty synopses
Matt Mackall <mpm@selenic.com> [Sun, 18 Oct 2009 22:31:05 -0500] rev 9603
Introduce summary command
Mads Kiilerich <mads@kiilerich.com> [Fri, 16 Oct 2009 11:19:39 +0200] rev 9602
Merge with redone c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com> [Fri, 16 Oct 2009 11:18:38 +0200] rev 9601
Dummy-merge with c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com> [Fri, 16 Oct 2009 11:16:42 +0200] rev 9600
Redo c655432c2c24 (issue1860)
Martin Geisler <mg@lazybytes.net> [Fri, 16 Oct 2009 00:45:18 +0200] rev 9599
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 16 Oct 2009 00:06:23 +0200] rev 9598
Merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Tue, 13 Oct 2009 13:43:55 -0700] rev 9597
Merge with mpm
Lee Cantey <lcantey@gmail.com> [Tue, 13 Oct 2009 12:27:50 -0700] rev 9596
README: revert accidental commit
Lee Cantey <lcantey@gmail.com> [Tue, 13 Oct 2009 12:23:23 -0700] rev 9595
test-gendoc: adjust output to account for Swedish translation
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 11 Oct 2009 21:32:55 +0200] rev 9594
merge with mpm
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:24:09 +0200] rev 9593
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:23:42 +0200] rev 9592
merge with mpm
Patrick Mezard <pmezard@gmail.com> [Fri, 09 Oct 2009 00:29:39 +0200] rev 9591
Merge with crew-stable
Benoit Allard <benoit@aeteurope.nl> [Fri, 16 Oct 2009 00:09:18 +0200] rev 9590
mq: fix traceback for qpush inexistant-patch with no patch applied
timeless@mozdev.org [Wed, 14 Oct 2009 20:55:39 +0300] rev 9589
rebase: change rebase help to talk about changesets and branch names
Stephen Rasku <mercurial@srasku.net> [Wed, 14 Oct 2009 21:21:09 -0700] rev 9588
mq: changed help for qpop -f to reflect actual behaviour
Patrick Mezard <pmezard@gmail.com> [Thu, 15 Oct 2009 23:15:30 +0200] rev 9587
convert/svn: better error when hg cannot call itself (issue1838)
Patrick Mezard <pmezard@gmail.com> [Thu, 15 Oct 2009 23:15:30 +0200] rev 9586
patch: handle symlink updates/replacements (issue1785)
Patrick Mezard <pmezard@gmail.com> [Thu, 15 Oct 2009 23:15:30 +0200] rev 9585
patch: handle symlinks without symlinkhunk
Symlink creations and deletions were handled with a special symlinkhunk object,
working like a binary hunk. However, this model does not support symlink
updates or replacements, so we teach regular hunks how to handle symlinks.
Matt Mackall <mpm@selenic.com> [Mon, 12 Oct 2009 18:25:46 -0500] rev 9584
bisect: use util.system and fix good/bad when using -c
The existing scheme using util.find_exe and subprocess.call meant we
couldn't use simple shell commands in tests. Fix that.
Also, it mistakenly used status from the system() call rather than
good from the bisect call in reporting results.
Matt Mackall <mpm@selenic.com> [Mon, 12 Oct 2009 14:59:28 -0500] rev 9583
bisect: limit considered set to descendants of first good rev
Matt Mackall <mpm@selenic.com> [Mon, 12 Oct 2009 14:52:53 -0500] rev 9582
tests: add -k to test scripts matching keywords
argument is a space-separated list of keywords that are searched for
in the name and body of each test. This makes it easy to run only
tests related to tags, hgweb, revert, etc. (eg -k "tag hgweb revert").
Raoul Bhatia [IPAX] <r.bhatia@ipax.at> [Fri, 09 Oct 2009 16:27:05 +0200] rev 9581
use short identifiers in atom feed
Matt Mackall <mpm@selenic.com> [Sun, 11 Oct 2009 13:58:53 -0500] rev 9580
run-tests: add --noskips option
Brodie Rao <me+hg@dackz.net> [Fri, 09 Oct 2009 03:53:24 -0400] rev 9579
color: add test for record support
Sune Foldager <cryo@cyanite.org> [Thu, 08 Oct 2009 10:39:43 +0200] rev 9578
rebase: return early when source is descendant of destination
This only happens when using --base (or no source selection options), as
rebase already aborts in this situation when using --source.
Without this change you get an abort from the underlying merge, and the
repository is in a different state than you started with (the working
dir parent is changed).
Sune Foldager <cryo@cyanite.org> [Thu, 08 Oct 2009 10:07:41 +0200] rev 9577
rebase: improve error and debug messages
Matt Mackall <mpm@selenic.com> [Sun, 11 Oct 2009 13:54:19 -0500] rev 9576
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:19:58 +0200] rev 9575
merge with hg-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:00:43 +0200] rev 9574
encoding: fix issue with non-standard UTF-8 CTYPE on OS X
Patrick Mezard <pmezard@gmail.com> [Thu, 08 Oct 2009 23:42:33 +0200] rev 9573
patch: do not swallow header-like patch first line (issue1859)
Current solution is hackish but looks like a good trade-off short of rewriting
patch.extract() significantly.
Patrick Mezard <pmezard@gmail.com> [Thu, 08 Oct 2009 23:32:36 +0200] rev 9572
windows: fix unlink() not dropping empty tree (issue1861)
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 01:17:48 -0500] rev 9571
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 01:17:24 -0500] rev 9570
merge with i18n-stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 01:16:32 -0500] rev 9569
Merge with i18n
Fabian Kreutz <fabian.kreutz@starnet.fi> [Tue, 06 Oct 2009 11:18:58 +0300] rev 9568
i18n-de: Translate extdiff, gpg, graphlog and fix some fuzzies
Martin Geisler <mg@lazybytes.net> [Wed, 30 Sep 2009 21:14:24 +0200] rev 9567
Merge with hg-i18n-stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 28 Sep 2009 20:14:39 -0300] rev 9566
i18n-pt_BR: synchronized with a1ee850f49e3
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 00:54:15 +0200] rev 9565
Merge with hg-i18n-stable
Martin Geisler <mg@lazybytes.net> [Mon, 28 Sep 2009 00:45:47 +0200] rev 9564
Merge with hg-i18n-stable
Martin Geisler <mg@lazybytes.net> [Thu, 17 Sep 2009 00:43:25 +0200] rev 9563
i18n-da: synchronized with 812aaef40757
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 23:46:06 +0200] rev 9562
Merge with main
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 16:11:44 +0200] rev 9561
i18n-de: correct indentation of verbatim blocks
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 15:41:39 +0200] rev 9560
i18n-de: correct errors reported by msgfmt
Fabian Kreutz <fabian.kreutz@starnet.fi> [Wed, 16 Sep 2009 14:14:06 +0300] rev 9559
i18n-de: Translation of convert + more syntax fixes
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 14 Sep 2009 09:14:36 +0300] rev 9558
i18n-de: redid latest translations
Originally by Simon H., Tobias and myself.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 08 Sep 2009 19:46:20 -0300] rev 9557
merge with i18n-stable
Jens Bäckman <jens.backman@gmail.com> [Tue, 18 Aug 2009 08:49:41 +0200] rev 9556
i18n-sv: Start Swedish translation
This is the starting point for the Swedish translation efforts. It
currently contains only the help of the first 17 basic commands.
Martin Geisler <mg@lazybytes.net> [Thu, 13 Aug 2009 20:12:34 +0200] rev 9555
i18n: merge with pt_BR
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 11:45:47 -0300] rev 9554
i18n-pt_BR: synchronized with 4e7149ed98e8
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 11:42:21 -0300] rev 9553
merge with i18n-stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 00:59:46 -0500] rev 9552
Merge with -stable
Kevin Bullock <kbullock@ringworld.org> [Wed, 07 Oct 2009 14:01:20 -0500] rev 9551
color: allow multiple args to ui.write()
TK Soh <teekaysoh@gmail.com> [Thu, 08 Oct 2009 09:27:22 +0800] rev 9550
color: add support for record extension
Adrian Buehlmann <adrian@cadifra.com> [Wed, 07 Oct 2009 20:32:07 +0200] rev 9549
util: move rename into posix.py and windows.py
Adrian Buehlmann <adrian@cadifra.com> [Wed, 07 Oct 2009 20:16:43 +0200] rev 9548
util: state docstring of rename more precisely
Greg Ward <greg-hg@gerg.ca> [Mon, 05 Oct 2009 18:17:13 -0400] rev 9547
cmdutil: changeset_printer: use methods of filectx/changectx.
This allows extensions that modify changeset metadata (e.g.
description) by overriding methods of changectx to get consistent
behavior from all log-like commands, regardless of whether templates
or styles are used. Without this, overriding changectx methods works
if you use styles or templates, but not with default log format.
This meant adding filectx.extra() for consistency with changectx.
Patrick Mezard <pmezard@gmail.com> [Wed, 07 Oct 2009 22:50:20 +0200] rev 9546
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 06 Oct 2009 22:46:31 +0200] rev 9545
verify: detect file copy sources not in parents with --verbose
Steve Borho <steve@borho.org> [Tue, 06 Oct 2009 16:08:38 -0500] rev 9544
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 05 Oct 2009 22:57:15 +0200] rev 9543
convert/cvs: stop supporting external cvsps
Patrick Mezard <pmezard@gmail.com> [Mon, 05 Oct 2009 22:17:39 +0200] rev 9542
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 04 Oct 2009 23:16:54 +0200] rev 9541
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sun, 04 Oct 2009 12:18:43 +0200] rev 9540
help: un-indent help topics
The help topics are reused in the HTML documentation, and there it
looks odd that whole sections are indented. We now only indent it for
output on the terminal.
Martin Geisler <mg@lazybytes.net> [Sun, 04 Oct 2009 09:59:13 +0200] rev 9539
help: move help topics from mercurial/help.py to help/*.txt
The help topics are loaded on demand so we wont hit the disk unless we
really have to.
Martin Geisler <mg@lazybytes.net> [Sat, 03 Oct 2009 18:58:25 +0200] rev 9538
i18n: remove unnecessary os.path.normpath call
Martin Geisler <mg@lazybytes.net> [Sun, 04 Oct 2009 10:17:01 +0200] rev 9537
commands: simpler sort of help topic names
Mads Kiilerich <mads@kiilerich.com> [Sat, 03 Oct 2009 18:31:20 +0200] rev 9536
cmdutil: templating keywords latesttag and latesttagdistance
This can be used for referring to revisions in a reasonable
meaningful, stable and monotonically increasing way, suitable for
releases or builds directly from a repository.
The latest tag is found by searching through untagged ancestors and
finding the latest tagged ancestor based on tag date. The distance is
found from the length of the longest path to the tagged revision.
For example:
hg log -l1 --template '{latesttag}+{latesttagdistance}\n'
can return
1.3.1+197
This is mostly work by Gilles Moris <gilles.moris@free.fr>
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 03 Oct 2009 23:38:10 +0200] rev 9535
merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 03 Oct 2009 23:36:08 +0200] rev 9534
bdiff: gradually enable the popularity hack
Patch from Jason Orendorff
The lower the threshold, the stronger the popularity hack's
influence. So at 3999 lines, the hack is disabled; and at 4000 lines,
the hack is enabled at maximum strength (t=4).
No source file in mercurial/crew is over 4000 lines. But there are, oh,
a few such files in Mozilla. I can testify that this hack causes hg to
generate some correct but eyebrow-raising patches.
I think the hack should phase in gradually. The threshold should be high
for small files where we don't need it so much. Like this:
t = (bn < 31000) ? 1000000 / bn : bn / 1000;
That would leave the popularity hack disabled for small files, then
gradually phase it in:
bn < 1000 -- t > bn (popularity hack is completely disabled)
bn == 1000 -- t = 1000 (still effectively disabled)
bn == 2000 -- t = 500 (only hits unusual files)
bn == 10000 -- t = 100 (only hits especially common lines)
bn == 31000 -- t = 31 (hack is at maximum power)
bn == 32000 -- t = 32 (hack could backfire, ease off)
Matt Mackall <mpm@selenic.com> [Wed, 07 Oct 2009 23:45:30 -0500] rev 9533
Merge with -crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 07 Oct 2009 18:52:01 +0200] rev 9532
convert/hg: handle bogus copy records (issue1843)
Patrick Mezard <pmezard@gmail.com> [Wed, 07 Oct 2009 10:13:04 +0200] rev 9531
convert/hg: make parents() return changectx, not nodes
Matt Mackall <mpm@selenic.com> [Wed, 07 Oct 2009 23:25:41 -0500] rev 9530
Merge with -crew-stable
Adrian Buehlmann <adrian@cadifra.com> [Tue, 06 Oct 2009 10:45:23 +0200] rev 9529
util.rename: do not abort if os.unlink fails (issue1840)
Patrick Mezard <pmezard@gmail.com> [Mon, 05 Oct 2009 22:01:08 +0200] rev 9528
convert: make mapfile handle LF and CRLF shamap (issue1846)
Patrick Mezard <pmezard@gmail.com> [Sun, 04 Oct 2009 23:06:14 +0200] rev 9527
convert/darcs: handle directory renaming
Patrick Mezard <pmezard@gmail.com> [Sun, 04 Oct 2009 22:23:11 +0200] rev 9526
convert/darcs: fix file renaming (issue1853)
Bryan O'Sullivan <bos@serpentine.com> [Thu, 06 Aug 2009 21:35:25 -0700] rev 9525
Fix failing darcs test
Matt Mackall <mpm@selenic.com> [Sat, 03 Oct 2009 15:57:48 -0500] rev 9524
Fix for issue1848
Matt Mackall <mpm@selenic.com> [Sat, 03 Oct 2009 14:39:57 -0500] rev 9523
Merge with -stable
Matt Mackall <mpm@selenic.com> [Sat, 03 Oct 2009 14:39:46 -0500] rev 9522
notify: update test
Grauw <laurens.hg@grauw.nl> [Fri, 07 Aug 2009 01:15:16 +0200] rev 9521
Fix issue 1782 don't do url2pathname conversion for urls
And only replace os-dependent path separators when necessary
Kevin Bullock <kbullock@ringworld.org> [Tue, 29 Sep 2009 23:49:42 -0500] rev 9520
color: allow multiple args to ui.write()
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 01 Oct 2009 08:50:10 +0200] rev 9519
extdiff: fix defaulting to "diff" if no --program is given
Greg Ward <greg-hg@gerg.ca> [Thu, 01 Oct 2009 15:36:45 -0400] rev 9518
dirstate: add/improve method docstrings.
- add doc to __init__(), _map(), status()
- enhance for __getitem__()
- fix inaccurate doc for walk() (described wrong return type)
Mads Kiilerich <mads@kiilerich.com> [Sun, 20 Sep 2009 22:19:18 +0200] rev 9517
util.system: Use subprocess instead of os.system
subprocess allows the environment and working directory to be specified
directly, so the hacks for making temporary changes while forking is no longer
necessary.
This also fixes failures on solaris where the temporary changes can't be undone
because there is no unsetenv.
David Champion <dgc@uchicago.edu> [Wed, 23 Sep 2009 02:31:09 -0500] rev 9516
notify: permit suppression of merge changeset notification
In some environments merges occur regularly but with no conflicts, and
committers find merge notifications more of a bother than a help.
By setting merge=False in [notify], merge notifications are suppressed.
This works both for incoming and for changegroup hooks.
Greg Ward <greg-hg@gerg.ca> [Thu, 27 Aug 2009 10:21:32 -0400] rev 9515
Add script to rewrite revlog to workaround lack of parent deltas.
Defaults to rewriting the manifest in the current repository.
Based on a patch to rewrite-log by Benoit Boissinot that I found here:
http://article.gmane.org/gmane.comp.version-control.mercurial.general/11908
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 16 Aug 2009 11:11:37 +0900] rev 9514
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 16 Aug 2009 11:30:24 +0900] rev 9513
cmdutil: service: add an optional runargs argument to pass the command to run
This would be necessary for inotify launching its server: the initial command
is a standard 'hg st'/'hg ci'/... but the daemon to run is 'hg inserve'
Sune Foldager <cryo@cyanite.org> [Thu, 17 Sep 2009 21:12:32 +0200] rev 9512
extdiff: add 3-way diff for merge changesets
This adds 3-way diff for merge changesets (using -c) and for diffing
the working directory context against two parents. To enable it, use
the new magic value '$parent2' in the argument line. In order to work,
your differ must support that the second parent argument is left out;
this will happen in 2-way mode. Default arguments are as before, without
enabling 3-way mode, ensuring backwards compatibility.
This also fixes a problem when diffing a merge changeset with a single
file change. Extdiff would sometimes do the wrong thing in that situation.
Kevin Bullock <kbullock@ringworld.org> [Wed, 23 Sep 2009 21:29:47 -0500] rev 9511
bash_completion: add completions for shelve extension
Adrian Buehlmann <adrian@cadifra.com> [Thu, 01 Oct 2009 11:40:53 +0200] rev 9510
doc: clarify license footers
Mercurial is licensed under version 2 of the GPL
Adrian Buehlmann <adrian@cadifra.com> [Thu, 01 Oct 2009 17:17:52 +0200] rev 9509
dirstate: kill dirstate.granularity config option
The dirstate.granularity configuration parameter was never documented,
it only adds code complexity and it is unneeded.
Adding comments describing forced 'unset' entries.
Matt Mackall <mpm@selenic.com> [Wed, 30 Sep 2009 21:42:51 -0500] rev 9508
Merge with -stable
Matt Mackall <mpm@selenic.com> [Wed, 30 Sep 2009 18:47:33 -0500] rev 9507
subrepo: add auto-pull for merge
Greg Ward <greg-hg@gerg.ca> [Wed, 30 Sep 2009 16:08:11 -0400] rev 9506
streamclone: partially encode filename over the wire, not for local read (issue1847)
(Fixes issue1847, which was introduced by 810387f59696: stream clone
of a repo with directory named *.d failed: server raises exception
"IOError: [Errno 2] No such file or directory:
/tmp/test/.hg/store/data/foo.d.hg.hg/foo".)
Matt Mackall <mpm@selenic.com> [Wed, 30 Sep 2009 13:15:18 -0500] rev 9505
Merge with i18n-stable
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 00:42:14 +0200] rev 9504
i18n-da: random small strings, only 499 strings left
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 00:23:01 +0200] rev 9503
Merge with main
Greg Ward <greg-hg@gerg.ca> [Thu, 17 Sep 2009 18:12:53 -0400] rev 9502
commands: tweak help for 'heads'.
- prefer "changeset" over "revision" for internal consistency
- clarify explanation of branch heads
- add a line break
- tighten some wording
Martin Geisler <mg@lazybytes.net> [Mon, 28 Sep 2009 00:23:44 +0200] rev 9501
i18n-da: translate addremove, branch, and cat
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 23:56:27 +0200] rev 9500
i18n-da: synchronized with 744cb8e93936
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 08 Sep 2009 18:11:11 -0300] rev 9499
i18n-pt_BR: synchronized with f4f17d5695d2
Martin Geisler <mg@lazybytes.net> [Tue, 08 Sep 2009 22:58:28 +0200] rev 9498
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 13 Aug 2009 20:11:16 +0200] rev 9497
i18n: merge with pt_BR
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 10:26:17 -0300] rev 9496
i18n-pt_BR: synchronized with 73bec717b825
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 01:08:18 +0200] rev 9495
ui: guard against UnicodeDecodeErrors in ui.wrap
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 00:00:18 +0200] rev 9494
keyword: uppercase short option for kwfiles --all, like hg status -A
Deprecate kwfiles -a.
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Sep 2009 23:59:03 +0200] rev 9493
keyword: make kwfiles -u show untracked files only (like status)
Remove extra documentation of -u/--unknown, as this is covered in
the option help already.
Like commands.status the code now zips the status flags.
Add more kwfiles tests.
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Sep 2009 23:59:03 +0200] rev 9492
keyword: make kwfiles --all show unknown files too
More consistent and similar to hg status.
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Sep 2009 22:39:56 +0200] rev 9491
keyword: kwfiles --unknown instead of --untracked
Use the same option name as "hg status".
Retrieve option in _status().
Mark --untracked as deprecated.
Brendan Cully <brendan@kublai.com> [Wed, 30 Sep 2009 14:43:22 -0700] rev 9490
convert: unbreak non-svn engines
Alexander Solovyov <piranha@piranha.org.ua> [Sat, 26 Sep 2009 00:17:55 +0300] rev 9489
zeroconf: read actual description for repos in hgwebdir
Alexander Solovyov <piranha@piranha.org.ua> [Sat, 26 Sep 2009 00:17:02 +0300] rev 9488
zeroconf: code cleanup, fixing variable names to be meaningful
Bryan O'Sullivan <bos@serpentine.com> [Mon, 28 Sep 2009 13:21:41 -0700] rev 9487
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Mon, 24 Aug 2009 16:30:42 -0700] rev 9486
notify: make it possible to pass extra info into templates
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 10:12:02 +0200] rev 9485
test-gendoc: add tests for all languages
This ensures that we catch errors in the reST syntax early and for all
languages. The only change needed in gendoc.py was to correct the
computation of section underlines for Asian languages.
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 10:04:51 +0200] rev 9484
gendoc: do not wrap encoded string
- it breaks multi-byte characters
- it is not needed since Docutils will take care of wrapping the
strings as necessary
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 09:39:57 +0200] rev 9483
test-encoding: make test output easier to follow
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 09:38:53 +0200] rev 9482
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 09:34:40 +0200] rev 9481
test-extension: update test output to match a4f6e4427b65
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 01:44:46 +0200] rev 9480
util: do not corrupt multi-byte characters in wrap
Sune Foldager <cryo@cyanite.org> [Wed, 23 Sep 2009 18:56:09 +0200] rev 9479
push: fix subtle bug in prepush logic
A test case demonstrating the bug has been added.
Contributed by Henrik Stuart and Sune Foldager.
Brodie Rao <me+hg@dackz.net> [Wed, 23 Sep 2009 15:58:07 +0200] rev 9478
color: mark --no-color as deprecated (--color=never has the same effect)
This should've been marked deprecated when --color was first introduced, but
it was something I overlooked.
Adrian Buehlmann <adrian@cadifra.com> [Wed, 23 Sep 2009 15:57:25 +0200] rev 9477
mention overlay bundle file in global --repository option
see http://mercurial.selenic.com/wiki/LookingIntoBundles
Drop mentioning symbolic path names for the sake of brevity. This is
a common feature of path options anyway.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 23 Sep 2009 15:54:43 +0200] rev 9476
merge with crew-stable
Sune Foldager <cryo@cyanite.org> [Wed, 23 Sep 2009 15:51:36 +0200] rev 9475
localrepo: fix bugs in branchheads and add docstring
- The call to reverse() reversed the list in place in the global branchmap.
- The nodesbetween function doesn't preserve ordering.
Peter Ingebretson <pingebre@yahoo.com> [Wed, 23 Sep 2009 15:36:51 +0200] rev 9474
convert: fix marshalling in P4 convert extension to use a binary stream
The Perforce convert extension uses the p4 -G command line option and
marshal.load to obtain information about the history of a Perforce depot.
The method marshal.load must be provided with a binary stream (mode='rb') in
order to function reliably. Certain changelist descriptions or other elements
in a depot history could trigger a premature EOFError, causing the conversion
process to fail.
This may resolve the issue discussed in the following thread:
http://www.selenic.com/pipermail/mercurial/2009-July/026813.html
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 23 Sep 2009 15:19:26 +0200] rev 9473
merge with mpm
Patrick Mezard <pmezard@gmail.com> [Tue, 22 Sep 2009 13:30:32 +0200] rev 9472
convert/cvs: update debugcvsps documentation
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 13:55:18 +0200] rev 9471
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 13:52:54 +0200] rev 9470
dispatch: catch ConfigError while constructing ui
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 12 Sep 2009 11:17:07 +0200] rev 9469
config: abort on indented non-continuation lines (issue1829)
Previously, as soon as a continuation would be met, "cont" would stay
forever set to True, but "item" was set back to "None".
This caused the continuation code bits to run every time, until the next
"self.get(section, item) + '\n'" which would crash.
Stuart W Marks <smarks@smarks.org> [Thu, 17 Sep 2009 22:39:38 -0700] rev 9468
hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 01:15:38 +0200] rev 9467
do not attempt to translate ui.debug output
Martin Geisler <mg@lazybytes.net> [Fri, 18 Sep 2009 17:37:51 +0200] rev 9466
Merge with crew-stable (again)
I had pulled 661bc51f09b7 into my local clone and accidentially
rebased it after pulling a new changeset from crew.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Fri, 18 Sep 2009 21:25:47 +0900] rev 9465
win32mbcs: util.normpath should be wrapped.
It is because util.normpath() finally calls windows.pconvert()
which is not wrapped (by changeset:25c41ddb3978).
Martin Geisler <mg@lazybytes.net> [Fri, 18 Sep 2009 17:23:02 +0200] rev 9464
Merge with crew-stable
Shun-ichi GOTO <shunichi.goto@gmail.com> [Fri, 18 Sep 2009 21:25:47 +0900] rev 9463
win32mbcs: util.normpath should be wrapped.
It is because util.normpath() finally calls windows.pconvert()
which is not wrapped (by changeset:25c41ddb3978).
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Sep 2009 23:15:37 +0200] rev 9462
test-keyword: run kwdemo before setting up [keyword] files
kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.
timeless@mozdev.org [Sun, 13 Sep 2009 03:04:40 +0300] rev 9461
record: remove superfluous space
Steve Losh <steve@stevelosh.com> [Thu, 17 Sep 2009 22:30:45 -0400] rev 9460
contrib/bash_completion: add tab completion for some bookmark commands
Steve Losh <steve@stevelosh.com> [Thu, 17 Sep 2009 22:28:47 -0400] rev 9459
bookmarks: support --quiet
Steve Borho <steve@borho.org> [Thu, 17 Sep 2009 17:39:43 -0500] rev 9458
demandimport: blacklist gtk
Demandimport breaks gtk. You get a meaningless error about
'failed loading gobject\_gobject.pyd'. Mercurial does not use gtk,
but this trips up many extension writers.
Matt Mackall <mpm@selenic.com> [Wed, 23 Sep 2009 00:23:50 -0500] rev 9457
convert: disable SVN support due to library license incompatibility
Martin Geisler <mg@lazybytes.net> [Thu, 17 Sep 2009 21:52:08 +0200] rev 9456
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Thu, 17 Sep 2009 21:51:55 +0200] rev 9455
Merge with main
Martin Geisler <mg@lazybytes.net> [Mon, 14 Sep 2009 23:48:25 +0200] rev 9454
hg: avoid combining translated strings
Combining translated string fragments into bigger strings is bad
practice because it removes context from the fragments. The translator
sees the fragments in isolation and might not jump back to the source
to see how a string like "%d files %s" is actually used.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 15 Sep 2009 18:26:05 +0200] rev 9453
merge with mpm (temporarily undo qprev/qnext/qtop removal)
Steve Borho <steve@borho.org> [Tue, 15 Sep 2009 11:18:12 -0500] rev 9452
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Thu, 17 Sep 2009 21:50:12 +0200] rev 9451
commands: expand -c and -C in update error message
Stuart W Marks <smarks@smarks.org> [Thu, 17 Sep 2009 21:34:05 +0200] rev 9450
commands: forbid 'hg update --check --clean'
Matt Mackall <mpm@selenic.com> [Wed, 16 Sep 2009 16:01:37 -0500] rev 9449
Merge with stable
Steve Borho <steve@borho.org> [Mon, 14 Sep 2009 19:53:43 -0500] rev 9448
windows: provide filename in IOError exceptions
This brings the Windows posixfile errors in line with the errors
on other platforms.
Matt Mackall <mpm@selenic.com> [Mon, 14 Sep 2009 17:32:55 -0500] rev 9447
Merge with crew
Martin Geisler <mg@lazybytes.net> [Sun, 13 Sep 2009 18:00:37 +0200] rev 9446
test-gendoc: test documentation generation
Martin Geisler <mg@lazybytes.net> [Sun, 13 Sep 2009 17:08:31 +0200] rev 9445
doc/Makefile: make rst2html and rst2man halt on warnings
Martin Geisler <mg@lazybytes.net> [Sun, 13 Sep 2009 17:05:38 +0200] rev 9444
doc/Makefile: do not create files in case of errors
When stdout is redirected to the target file directly, the file is
created as an empty file even when an error occurs. Since the file is
there, 'make' wont try to re-create it in subsequent runs.
This fix is similar to the one in a6747ba27d22, but it also takes care
of rst2html and gendoc.py.
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Sep 2009 17:53:09 +0200] rev 9443
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Sep 2009 17:23:47 +0200] rev 9442
zeroconf: fix hgweb published URLs (issue1819)
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 09 Sep 2009 18:38:39 +0900] rev 9441
win32mbcs: wrap util.pconvert, not windows.pconvert (issue1828)
Matt Mackall <mpm@selenic.com> [Mon, 14 Sep 2009 17:29:47 -0500] rev 9440
Merge qprev/qnext backout
Matt Mackall <mpm@selenic.com> [Mon, 14 Sep 2009 16:39:24 -0500] rev 9439
Backed out premature qprev/qnext removal
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 11 Sep 2009 16:58:19 +0200] rev 9438
Add new flag [-1] to synopsis of qapplied/qunapplied
Greg Ward <greg-hg@gerg.ca> [Tue, 08 Sep 2009 17:58:59 -0400] rev 9437
Improve some docstrings relating to changegroups and prepush().
Andrey Somov <py4fun@gmail.com> [Wed, 09 Sep 2009 11:12:36 +0200] rev 9436
improve code readability
Martin Geisler <mg@lazybytes.net> [Thu, 10 Sep 2009 10:31:12 +0200] rev 9435
Merge with crew-stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 08 Sep 2009 01:26:15 +0200] rev 9434
test-convert-git: Use ~ instead of ^
Solaris sh interprets ^ as pipe symbol and the test thus failed in strange
ways. git can however use of HEAD~ instead of HEAD^.
Mads Kiilerich <mads@kiilerich.com> [Thu, 10 Sep 2009 01:56:25 +0200] rev 9433
transplant: Add trailing LF in tmp file for filtering
Transplant filtering used a tmp file ending with the (stripped) commit
message and thus no final LF. Text files not ending with LF is usually
not used on Unix and is thus wrong ;-)
The missing LF had bad consequences because Solaris sed chokes on
unterminated input lines, so
echo -n foo|sed 's,o,0,g'
doesn't output anything, and the filter used in tests/test-transplant
thus stripped the last (and only) line in the message away on solaris.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Sep 2009 15:32:16 +0200] rev 9432
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Sep 2009 15:29:14 +0200] rev 9431
convert: fix history topology when using hg.tagsbranch
When using hg.tagsbranch, all conversions fail at
transcribing the source repo topology with conversion
scenarios interleaving:
- initial repo conversion,
- then upstream tag
- then later incremental conversion
The problem is caused by the usage of the last source
revid as source revid for the tagnode in the revision
map.
On a later incremental conversion, when resolving some
child commit of the true last source revid, convert
will parent the nodes to the tag node. If using
tagsbranch you get a bad topology where all incremental
commit nodes end up in the tag branch.
Analysis and test by Edouard Gomez <ed.gomez@free.fr>
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Sep 2009 19:39:46 +0200] rev 9430
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Sep 2009 18:56:51 +0200] rev 9429
merge: exclude common ancestor from --preview (issue1818)
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 27 Aug 2009 11:55:21 +0200] rev 9428
inotify: _inotify.c: bugfix: remove_watch has to return PyNone on success
We are not currently using that API function in inotify, hence the reason
for the "silent" bug. But returning NULL here causes the interpreter to crash.
Let's keep code clean for reusers :)
The whole "bail" logic was unneeded here.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 27 Aug 2009 14:15:04 +0200] rev 9427
parsers.c: parse_manifest: fixing refcount of flags
When flags was DECREF'ed, scope was referencing to the outer variable,
outside of the block.
It was in fact always NULL: the real Python object was never decref'ed.
Martin Geisler <mg@lazybytes.net> [Fri, 04 Sep 2009 23:45:13 +0200] rev 9426
test-highlight: remove redundant test
Changeset 799373ff2554 is testing how a EUC-JP encoded Japanese file
is treated in different encodings, so the ISO-8859-1 encoded German
file is no longer needed.
Martin Geisler <mg@lazybytes.net> [Fri, 04 Sep 2009 23:34:51 +0200] rev 9425
Merge with crew-stable
Yuya Nishihara <yuya@tcha.org> [Sat, 29 Aug 2009 15:24:15 +0900] rev 9424
highlight: fixes garbled text in non-UTF-8 environment
This patch treats all files inside repository as encoded by
locale's encoding when pygmentize.
We can assume that most files are written in locale's encoding,
but current implementation treats them as UTF-8.
So there's no way to specify the encoding of files.
Current implementation, db7557359636 (issue1341):
1. Convert original `text`, which is treated as UTF-8, to locale's encoding.
`encoding.tolocal()` is the method to convert from internal UTF-8 to local.
If original `text` is not UTF-8, e.g. Japanese EUC-JP, some characters
become garbled here.
2. pygmentize, with no UnicodeDecodeError.
This patch:
1. Convert original `text`, which is treated as locale's encoding, to unicode.
Pygments prefers unicode object than raw str. [1]_
If original `text` is not encoded by locale's encoding, some characters
become garbled here.
2. pygmentize, also with no UnicodeDecodeError :)
3. Convert unicode back to raw str, which is encoded by locale's.
.. [1] http://pygments.org/docs/unicode/
Matt Mackall <mpm@selenic.com> [Mon, 31 Aug 2009 10:58:33 -0500] rev 9423
Make distinct lookup error for localrepo.lookup
This allows clone/share to correctly distinguish lookup errors from
corruption errors and catch only the former.
Martin Geisler <mg@lazybytes.net> [Fri, 04 Sep 2009 22:26:57 +0200] rev 9422
doc: add TOC to hg.1.html and hgrc.5.html
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Sep 2009 11:51:28 +0200] rev 9421
log: prevent negative date range from displaying entire log (issue1805)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 04 Sep 2009 10:47:55 +0200] rev 9420
manifest/revlog: do not let the revlog cache mutable objects
If a buffer of an mutable object is passed to revlog.addrevision(), the revlog
will happily store it in its cache. Later when the revlog reuses the cached
entry, if the manifest modified the object in-between, all kind of bugs
appears.
We fix it by:
- passing immutable objects to addrevision() if they are already available
- only storing the text in the cache if it's of str type
Then we can remove the conversion of the cache entry to str() during
retrieval. That was probably just there hiding the bug for the common cases
but not really fixing it.
Martin Geisler <mg@lazybytes.net> [Thu, 03 Sep 2009 21:40:45 +0200] rev 9419
doc/README: simplify instructions
Martin Geisler <mg@lazybytes.net> [Thu, 03 Sep 2009 21:36:44 +0200] rev 9418
doc: use our own rst2man.py script (issue1746)
The rst2man tool has not yet been part of an official Docutils
release, and it is not present in most distributions. This poses a
problem for people who want to install Mercurial from source, or who
want to create a Mercurial package for such a distribution -- how to
specify the build-dependencies?
By including the rst2man.py script with Mercurial people only need a
normal Docutils installation in order to install Mercurial.
Martin Geisler <mg@lazybytes.net> [Thu, 03 Sep 2009 21:07:06 +0200] rev 9417
util, minirst: do not crash with COLUMNS=0
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 03 Sep 2009 02:42:56 +0200] rev 9416
manifestdict: remove unnecessary dictionary copy
No need to copy the dict, dict.__init__() will do that for us.
It was responsible for a non-negligeable waste of time during a qpush of an
-mm queue on the kernel repo.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 02 Sep 2009 21:05:43 +0200] rev 9415
manifest.add(): cleanup worklist construction and iteration
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 02 Sep 2009 21:05:01 +0200] rev 9414
manifest: simplify cache handling, use a unique cache
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 02 Sep 2009 20:18:35 +0200] rev 9413
manifest.add(): simplify with iterators and generator expressions
Martin Geisler <mg@lazybytes.net> [Sat, 29 Aug 2009 00:30:03 +0200] rev 9412
color: do all setup in uisetup
Now that extensions are loaded in phases, we are guaranteed to always
find mq in uisetup with extensions.find and we know that the mq
commands are not yet copied into commands.table.
Simon Heimberg <simohe@besonet.ch> [Sun, 16 Aug 2009 00:41:24 +0200] rev 9411
extensions: pass ui arguement to extsetup if accepted
Martin Geisler <mg@lazybytes.net> [Sat, 29 Aug 2009 00:29:16 +0200] rev 9410
extensions: load and configure extensions in well-defined phases
Extensions are now loaded with a call-graph like this:
dispatch._dispatch
extensions.loadall
extensions.load
# add foo module to extensions._extensions
extensions.load
# add bar module to extensions._extensions
foo.uisetup(ui)
bar.uisetup(ui)
foo.extsetup()
bar.extsetup()
commands.table.update(foo.cmdtable)
commands.table.update(bar.cmdtable)
hg.repository
foo.reposetup(ui, repo)
bar.reposetup(ui, repo)
The uisetup calls could easily be moved out to dispatch._dispatch, but
have been kept in extensions.loadall since at least TortoiseHg calls
extensions.loadall and expects it to call uisetup.
The extensions.load function called uisetup. It now has an unused ui
argument which has been kept for backwards compatibility.
Martin Geisler <mg@lazybytes.net> [Fri, 28 Aug 2009 22:14:04 +0200] rev 9409
highlight: move code from module top-level into extsetup
Martin Geisler <mg@lazybytes.net> [Fri, 28 Aug 2009 20:53:03 +0200] rev 9408
run-tests: standardize on --foo instead of -f/--foo
We write -f/--foo in Mercurial help texts (docstrings), but I think it
looks strange in error messages.
Martin Geisler <mg@lazybytes.net> [Fri, 28 Aug 2009 20:50:54 +0200] rev 9407
run-tests: use parser.error for cmdline option errors
Martin Geisler <mg@lazybytes.net> [Fri, 28 Aug 2009 20:28:06 +0200] rev 9406
doc/README: rst2man is now in Docutils proper
Mads Kiilerich <mads@kiilerich.com> [Thu, 20 Aug 2009 23:35:46 +0200] rev 9405
doc/Makefile: detect the right name for rst2man and rst2html
docutils uses the .py extension on the commands, and so do their installer.
Distribution packages might strip the .py, but the official name should work too.
Martin Geisler <mg@lazybytes.net> [Thu, 27 Aug 2009 00:01:03 +0200] rev 9404
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Thu, 27 Aug 2009 00:00:15 +0200] rev 9403
test-keyword: update output to match 5d49fdef6fd0
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 26 Aug 2009 14:58:09 +0200] rev 9402
hgweb: show diff header line in raw diffs
Mads Kiilerich <mads@kiilerich.com> [Thu, 20 Aug 2009 23:35:47 +0200] rev 9401
doc/Makefile: Don't show Makefile comments in output
The comments makes sense when editing Makefile, but not when watching its
output where it looks too much like error messages.
Mads Kiilerich <mads@kiilerich.com> [Thu, 20 Aug 2009 23:35:37 +0200] rev 9400
doc/Makefile: detect rst2man errors
Make couldn't detect rst2man errors when it wasn't the last command, so empty
man page files would be installed.
Mads Kiilerich <mads@kiilerich.com> [Wed, 19 Aug 2009 00:45:24 +0200] rev 9399
test-hooks: Don't hide the value of HG_PENDING
Hiding the value of HG_PENDING made it less obvious what was going on in case
of test failure
Brodie Rao <me+hg@dackz.net> [Tue, 18 Aug 2009 14:47:41 -0400] rev 9398
ui: fix NameError in ui.progress due to unit/units typo
Simon Heimberg <simohe@besonet.ch> [Wed, 29 Jul 2009 14:21:18 +0200] rev 9397
util: quicker fspath, do not lower names when the length is different
Simon Heimberg <simohe@besonet.ch> [Fri, 07 Aug 2009 15:40:51 +0200] rev 9396
test-casefolding: fix wrong case on hfs on linux
on linux hfs keeps the old case of the file stored
force it by renameing to another name and back
Simon Heimberg <simohe@besonet.ch> [Fri, 07 Aug 2009 15:34:54 +0200] rev 9395
hghave: check for case insensitive filesystem in current dir
check was done on TEMP
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 15 Aug 2009 21:19:57 +0900] rev 9394
run-tests: expand --tmpdir and create it if needed
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 23 Aug 2009 14:32:58 +0200] rev 9393
patch: remove the unused, broken reverse() function
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 24 Aug 2009 14:40:21 +0200] rev 9392
patch: readgitpatch: remove unused variable 'src'
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 24 Aug 2009 21:00:34 +0200] rev 9391
use 'x in dict' instead of 'dict.has_key(x)'
"in" is faster, and has_key will be removed in py3k
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 26 Aug 2009 13:07:27 +0200] rev 9390
churn: use genexps now that we dropped 2.3 compatibility
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 26 Aug 2009 13:05:51 +0200] rev 9389
merge with crew-stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 24 Aug 2009 12:47:44 +0200] rev 9388
churn: issue833 was reintroduced in 9bc46d069a76, correct it and add a test
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 22 Aug 2009 19:40:15 +0200] rev 9387
templatefilters: indent: do not compute text.endswith('\n') in each iteration
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 22 Aug 2009 15:47:03 +0200] rev 9386
util: canonpath: simplify logic
if root == os.sep, then endswithsep(root) is True as well: one test is enough
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Aug 2009 13:03:10 +0200] rev 9385
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Aug 2009 11:32:44 +0200] rev 9384
test-parse-date: test 12-hours time formats (issue1804)
Carey Evans <carey@carey.geek.nz> [Fri, 21 Aug 2009 21:52:57 +1200] rev 9383
util: Fix date format for 12-hour time.
Mads Kiilerich <mads@kiilerich.com> [Sat, 22 Aug 2009 15:36:52 +0200] rev 9382
test-command-template: Don't diff files with same content
Solaris diff will report "No differences encountered" on stdout
Martin Geisler <mg@lazybytes.net> [Sat, 22 Aug 2009 10:52:53 +0200] rev 9381
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sat, 22 Aug 2009 10:50:29 +0200] rev 9380
hgrc.5: document %unset directive
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Aug 2009 10:25:50 +0200] rev 9379
merge with crew-stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 21 Aug 2009 14:17:23 +0200] rev 9378
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)
This change narrows the race guard that was introduced by af3f26b6bba4
("dirstate: ignore stat data for files that were updated too recently")
to not discard the _map entry's stat data if the mtime is in the future.
Without this change, status locks files having odd mtimes in the future
into the 'unset' state, causing needless file compares later (admittedly
harmless), but also inflicting highly irritating sticky effects on
tools/plugins that directly read .hg/dirstate (e.g. TortoiseHg).
Martin Geisler <mg@lazybytes.net> [Sat, 22 Aug 2009 01:37:28 +0200] rev 9377
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sat, 22 Aug 2009 01:34:56 +0200] rev 9376
hgrc.5: document %include directive
Martin Geisler <mg@lazybytes.net> [Fri, 21 Aug 2009 16:58:30 +0200] rev 9375
mq: don't mention qtop in module doc string
(qtop was removed in b8dc3eba4f9d)
Patrick Mezard <pmezard@gmail.com> [Fri, 21 Aug 2009 14:29:54 +0200] rev 9374
color: no need for itertools, zip() is good enough
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 21 Aug 2009 09:33:27 +0200] rev 9373
log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 20 Aug 2009 10:41:56 +0200] rev 9372
templater: remove support for ## template variables
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 20 Aug 2009 08:49:01 +0200] rev 9371
graphlog: simplify ascii drawing to process one cset at a time
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 20 Aug 2009 08:36:20 +0200] rev 9370
graphlog: shorter variable names, fewer underscores, single state container
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 20 Aug 2009 08:35:35 +0200] rev 9369
graphlog: move common code into function again, change function types
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 20 Aug 2009 08:35:03 +0200] rev 9368
graphlog: extract some setup code out of common functions
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 20 Aug 2009 08:34:22 +0200] rev 9367
cmdutil: use context objects for walkchangerevs()
Greg Ward <greg-hg@gerg.ca> [Tue, 18 Aug 2009 22:07:43 -0400] rev 9366
tags: don't crash if unable to write tag cache
This happens with hgweb in real life, if the httpd user is unable to
write in the repository directory. Another case is doing 'hg incoming'
on a repository in the filesystem owned by someone else.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 19 Aug 2009 12:51:07 +0200] rev 9365
mq: get rid of qnext, qprev and qtop
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 19 Aug 2009 12:50:46 +0200] rev 9364
mq: add options to qapplied/qunapplied to act like qprev/qnext
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 19 Aug 2009 12:47:04 +0200] rev 9363
hgweb: add web.descend configuration variable
Martin Geisler <mg@lazybytes.net> [Tue, 18 Aug 2009 13:59:30 +0200] rev 9362
help: align columns "hg help templates" output
Martin Geisler <mg@lazybytes.net> [Tue, 18 Aug 2009 13:55:34 +0200] rev 9361
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Tue, 18 Aug 2009 13:40:19 +0200] rev 9360
help: show results of all date filters
Martin Geisler <mg@lazybytes.net> [Tue, 18 Aug 2009 13:00:13 +0200] rev 9359
help: document isodatesec and rfc3339 filters (issue1799)
Steve Borho <steve@borho.org> [Mon, 17 Aug 2009 20:20:34 -0500] rev 9358
Merge with crew-stable
Steve Borho <steve@borho.org> [Sun, 16 Aug 2009 20:53:49 -0500] rev 9357
iss: make mfc*.dll and msvc*.dll optional
mfc71.dll was only needed for Python2.4
msvc*.dll is similarly optional
Do not bail installer build if not found
Steve Borho <steve@borho.org> [Sun, 16 Aug 2009 21:23:48 -0500] rev 9356
iss: take version from iscc command line or __version__.py
Requires InnoSetup Preprocessor to be installed.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 16 Aug 2009 11:09:21 +0900] rev 9355
inotify: remove unused import
Martin Geisler <mg@lazybytes.net> [Fri, 14 Aug 2009 22:20:47 +0200] rev 9354
Merge with crew-stable
Sebastien Binet <binet@cern.ch> [Fri, 14 Aug 2009 11:18:23 +0200] rev 9353
osutil: fix compilation with -ansi
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 29 Jun 2009 01:33:26 +0900] rev 9352
inotify: repo is not referenced from server, remove the weakref
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 29 Jun 2009 01:27:34 +0900] rev 9351
inotify: client: no repo use
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 29 Jun 2009 01:09:33 +0900] rev 9350
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 29 Jun 2009 01:05:06 +0900] rev 9349
inotify: server: use wprefix everywhere, introduce prefixlen
self.wprefix = self.repo.root + '/' = self.repo.wjoin('') + '/'
Since we'll eventually get rid of self.repo, keep only the first form.
use self.prefixlen to compute only once the root prefix size.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 28 Jun 2009 19:46:36 +0900] rev 9348
inotify: server._updatestatus: simplify control flow
Henrik Stuart <hg@hstuart.dk> [Tue, 11 Aug 2009 22:45:38 +0200] rev 9347
url: add support for custom handlers in extensions
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 15 Jul 2009 11:26:47 +0900] rev 9346
patchbomb: add --flag to put flags in subject prefixes
--flag foo uses:
[PATCH foo]
or
[PATCH M of N foo]
depending on the number of patches.
Multiple flags are supported: --flag foo --flag bar gives [PATCH foo bar]
Matt Mackall <mpm@selenic.com> [Wed, 12 Aug 2009 12:07:11 -0500] rev 9345
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 12 Aug 2009 12:06:12 -0500] rev 9344
Merge with i18n-stable
Matt Mackall <mpm@selenic.com> [Wed, 12 Aug 2009 12:05:35 -0500] rev 9343
Merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Tue, 11 Aug 2009 18:27:34 -0300] rev 9342
merge with i18n-stable
Wagner Bruna <wbruna@yahoo.com> [Wed, 05 Aug 2009 10:56:20 -0300] rev 9341
i18n-pt_BR: miscellaneous fixes
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 28 Jul 2009 15:50:14 -0300] rev 9340
i18n-pt_BR: synchronized with 2de7d96593db
Andrey <py4fun@gmail.com> [Wed, 12 Aug 2009 11:50:27 +0200] rev 9339
config: improve code readability
Yann E. MORIN <yann.morin.1998@anciens.enib.fr> [Wed, 12 Aug 2009 10:57:18 +0200] rev 9338
mq: re-phrase the qrefresh help about the user and date options
Yann E. MORIN <yann.morin.1998@anciens.enib.fr> [Wed, 12 Aug 2009 10:57:27 +0200] rev 9337
mq: add the date with qrefresh, even if missing (issue1768)
When setting the date with qrefresh (-d|-D), and the patch does have
neither a 'Date:' nor a '# Date' header, add the date field as such:
- if the patch has a 'From:' header, add a 'Date:' header
- otherwise, upgrade to Mercurial extended patch format and add '# Date'
Yann E. MORIN <yann.morin.1998@anciens.enib.fr> [Wed, 12 Aug 2009 10:48:18 +0200] rev 9336
mq: upgrade the patch to HG format when adding the author name with qrefresh
When setting the author field with qrefresh (-u|-U), and the patch does have
neither a 'From:' nor a '# User' header, add the author name as such:
- if the patch has a 'Date:' header, add a 'From:' header
- otherwise, upgrade to Mercurial extended patch format and add # From
Yann E. MORIN <yann.morin.1998@anciens.enib.fr> [Wed, 12 Aug 2009 10:46:16 +0200] rev 9335
mq: add function to check if a header exists in a patch
Yann E. MORIN <yann.morin.1998@anciens.enib.fr> [Wed, 12 Aug 2009 10:46:03 +0200] rev 9334
mq: fix coding style in qrefresh
Martin Geisler <mg@lazybytes.net> [Mon, 10 Aug 2009 23:27:08 +0200] rev 9333
Merge with crew-stable.
Steve Borho <steve@borho.org> [Wed, 05 Aug 2009 21:45:54 -0500] rev 9332
hook: fix full path imports on Windows (issue1779)
Bottom portion fixes full path imports on source installs on Windows.
The top portion further fixes full path imports on binary installs.
Initial patch by Roman V. Kiseliov
Martin Geisler <mg@lazybytes.net> [Mon, 10 Aug 2009 23:02:58 +0200] rev 9331
patch: marked string for translation
Brodie Rao <me+hg@dackz.net> [Mon, 10 Aug 2009 22:59:29 +0200] rev 9330
diffstat: scale adds/removes proportionally to graph width
The previous method of scaling had a tendency to include graph lines that
went past the output width when the file with the most changes had a very
large number of changes.
Simon Heimberg <simohe@besonet.ch> [Fri, 07 Aug 2009 21:15:01 +0200] rev 9329
test-clone-failure: reenable perm to allow deletion
Brendan Cully <brendan@kublai.com> [Fri, 07 Aug 2009 19:27:54 -0700] rev 9328
patch: create file even if source is not /dev/null
as long as the first hunk is -0,0 and the source and destination have the
same name. Matt found a patch like this, and /usr/bin/patch accepts it.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 06 Aug 2009 21:35:58 -0700] rev 9327
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Thu, 06 Aug 2009 21:35:25 -0700] rev 9326
Fix failing darcs test
Bryan O'Sullivan <bos@serpentine.com> [Thu, 06 Aug 2009 18:48:00 -0700] rev 9325
Merge with mpm
Brendan Cully <brendan@kublai.com> [Wed, 05 Aug 2009 22:52:35 -0700] rev 9324
Merge backout of 26fa0e31011d
Brendan Cully <brendan@kublai.com> [Wed, 05 Aug 2009 22:51:30 -0700] rev 9323
Backed out changeset 26fa0e31011d.
On OS X, it broke test-issue322, test-issue660, test-permissions,
test-symlink-addremove, and test-walk.
Steve Borho <steve@borho.org> [Mon, 03 Aug 2009 23:27:25 -0500] rev 9322
mercurial.ini: provide more useful info
* Add warning about not editing the site-wide file on Vista
* More detail about where to create user Mercurial.ini
* Provide examples for ssh tools
* List extensions, all disabled
* add [patch] section, for fixing patch behavior when using win32text
* example [extdiff] section, all disabled
* example [diff] section, all disabled
Brendan Cully <brendan@kublai.com> [Wed, 05 Aug 2009 17:17:06 -0700] rev 9321
churn: correct output when run in subdirectories
Martin Geisler <mg@lazybytes.net> [Thu, 06 Aug 2009 00:34:28 +0200] rev 9320
i18n: move unrelated line out of try-except block
Martin Geisler <mg@lazybytes.net> [Thu, 06 Aug 2009 00:26:34 +0200] rev 9319
i18n: updated outdated comment
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Aug 2009 16:32:57 +0200] rev 9318
merge backout of 5724cd7b3688
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Aug 2009 16:32:38 +0200] rev 9317
Backed out changeset 5724cd7b3688 (depends on other changes, no tests)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Aug 2009 17:21:29 +0200] rev 9316
merge with crew-stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 05 Aug 2009 17:19:37 +0200] rev 9315
dispatch: also pass level argument to __import__ for ignored modules
I wanted to check if mercurial.demandimport could speed up the loading of
PyObjC, and ran into this: the level argument for __import__, available in
Python 2.5 and later, is silently dropped when doing an 'import *'. I have no
idea what these arguments mean, but this minor change made it work.
(Oh, and because of that 'from ... import *', PyObjC still took about 2s...)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Aug 2009 14:58:30 +0200] rev 9314
lsprof: make profile not die when imported modules changes (issue1774)
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:19:08 +0200] rev 9313
notify: do not mime encode multipart templates
Mulitpart templates should take care of this themselves.
See http://www.selenic.com/pipermail/mercurial/2009-July/027017.html
Also catch potential parsing errors gracefully.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 05 Aug 2009 17:08:28 +0200] rev 9312
kill trailing whitespace
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 05 Aug 2009 15:00:44 +0200] rev 9311
color: simplify & improve colorization of qseries
Use 'repo.mq.series' to obtain patch names, instead of deriving them
from the qseries output. This is both simpler and more robust, and
fixes colorization of patches without a message with -s/--summary.
Cédric Duval <cedricduval@free.fr> [Wed, 05 Aug 2009 14:44:36 +0200] rev 9310
gendoc: documentation section describing available extensions
Greg Ward <greg-hg@gerg.ca> [Wed, 05 Aug 2009 14:42:57 +0200] rev 9309
localrepo: document the locking scheme a little better
- localrepo: document lock(), wlock() methods
- lock: add class docstring
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:20:47 +0200] rev 9308
keyword: use util.datestr for utcdate filter, expose through variable
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:20:47 +0200] rev 9307
keyword: reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:20:47 +0200] rev 9306
keyword: remove "help keyword" from test
Testing help output does not make sense as we have no way to
check for errors in content which would be the only reasonable
test here.
Christian Ebert <blacktrash@gmx.net> [Wed, 29 Jul 2009 09:28:45 +0200] rev 9305
keyword: update copyright
timeless@mozdev.org [Mon, 03 Aug 2009 10:39:14 +0200] rev 9304
hgwebdir: add links to the main repository page in notfound.tmpl
Martin Geisler <mg@lazybytes.net> [Mon, 03 Aug 2009 10:28:09 +0200] rev 9303
Merge with crew-stable
Stuart W Marks <smarks@smarks.org> [Sun, 02 Aug 2009 19:21:47 -0700] rev 9302
help: improve "hg help revisions"
Add info about branch names, and other clarifications.
Martin Geisler <mg@lazybytes.net> [Mon, 03 Aug 2009 00:19:01 +0200] rev 9301
rebase: link to RebaseExtension
This new page has the usual user-oriented information about the
extension.
Martin Geisler <mg@lazybytes.net> [Mon, 03 Aug 2009 00:12:10 +0200] rev 9300
patchbomb: use a list instead of indented paragraphs
Martin Geisler <mg@lazybytes.net> [Mon, 03 Aug 2009 00:02:00 +0200] rev 9299
help: un-indent list in "hg help diffs"
Martin Geisler <mg@lazybytes.net> [Mon, 03 Aug 2009 00:01:59 +0200] rev 9298
help: add "templates" as an alias for "templating" help topic
Martin Geisler <mg@lazybytes.net> [Sun, 02 Aug 2009 17:42:36 +0200] rev 9297
gendoc: make anchors for help topic names
Martin Geisler <mg@lazybytes.net> [Fri, 31 Jul 2009 11:40:03 +0200] rev 9296
gendoc: rename underlined/bold to section/subsection
Martin Geisler <mg@lazybytes.net> [Mon, 03 Aug 2009 00:01:50 +0200] rev 9295
help: use field lists for lists of extensions
Martin Geisler <mg@lazybytes.net> [Sun, 02 Aug 2009 23:38:08 +0200] rev 9294
help: format templating help topic with a field list
Martin Geisler <mg@lazybytes.net> [Sun, 02 Aug 2009 23:38:07 +0200] rev 9293
minirst: parse field lists
Martin Geisler <mg@lazybytes.net> [Sun, 02 Aug 2009 21:29:15 +0200] rev 9292
minirst: simplify bullet list indentation computation
Martin Geisler <mg@lazybytes.net> [Sun, 02 Aug 2009 17:17:17 +0200] rev 9291
minirst: indent literal blocks with two spaces
The vast majority* of them are formatted like this in the source, so
this basically reverts the output to how it looked before we got the
minirst parser.
*: the help on templating use four spaces for some examples and will
now shown with an indentation of just two spaces.
Martin Geisler <mg@lazybytes.net> [Sun, 02 Aug 2009 16:34:25 +0200] rev 9290
help: mark literal blocks
Christian Ebert <blacktrash@gmx.net> [Fri, 31 Jul 2009 23:49:47 +0200] rev 9289
patchbomb: reST syntax for literal blocks in help text
Martin Geisler <mg@lazybytes.net> [Sat, 01 Aug 2009 00:36:22 +0200] rev 9288
Merge with crew-stable
David Soria Parra <dsp@php.net> [Tue, 28 Jul 2009 15:36:28 +0200] rev 9287
mq: Parse commit message after we find start of changeset patch
patch.extract extracts just the message below HG changeset patch. So to not
parse comments above the patch, we reset the message if we find a changeset
patch as we know the commit message comes after the changeset patch data.
This is similar to the behavior of patch.extract.
The drawback of this approach, after a qref -e the comment above HG changeset
patch is gone. Without this patch the message would become part of the commit
message in the HG changset patch part.
Cédric Duval <cedricduval@free.fr> [Fri, 31 Jul 2009 01:40:45 +0200] rev 9286
doc: fix quotes mismatches affecting rst
Martin Geisler <mg@lazybytes.net> [Wed, 29 Jul 2009 22:23:14 +0200] rev 9285
Merge with crew-stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Jul 2009 22:14:46 +0200] rev 9284
test-repair-strip: Don't rely on cat error message
David Champion <dgc@uchicago.edu> [Sun, 05 Jul 2009 13:59:25 -0500] rev 9283
test-gpg: suppress secure memory warning
Some platforms (Solaris for one) does not support secure memory and
would give a warning.
Brendan Cully <brendan@kublai.com> [Mon, 27 Jul 2009 19:23:04 -0700] rev 9282
Merge with main
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Jul 2009 10:45:35 +0100] rev 9281
keyword: refactor kwdemo and make output translatable
Better reflect the actual behaviour of the extension:
- Make map arguments and -f/--rcfile not mutually exclusive but
extend the current configuration
- Map arguments and -f/--rcfile both override the defaults even
when -d/--default is specified
- -d/--default only overrides the current configuration
Inform the user about extending/overriding behaviour, but only at
the beginning; the following messages become terser, making the
output translatable without too much code clutter.
Rephrase help (use "short/long" option notation etc.).
David Soria Parra <dsp@php.net> [Mon, 27 Jul 2009 02:12:17 +0200] rev 9280
commands: Check if helptext contains a newline before we split
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 02:33:38 +0200] rev 9279
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 02:14:30 +0200] rev 9278
Makefile: remove non-default wrapping of hg.pot strings
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 02:12:53 +0200] rev 9277
help: wrap help strings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 02:03:35 +0200] rev 9276
zeroconf: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 02:03:00 +0200] rev 9275
win32mbcs: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 02:02:10 +0200] rev 9274
transplant: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 02:01:19 +0200] rev 9273
share: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 02:00:58 +0200] rev 9272
record: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:59:59 +0200] rev 9271
rebase: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:59:28 +0200] rev 9270
purge: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:58:13 +0200] rev 9269
patchbomb: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:56:25 +0200] rev 9268
parentrevspec: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:56:02 +0200] rev 9267
pager: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:55:18 +0200] rev 9266
notify: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:53:49 +0200] rev 9265
mq: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:53:06 +0200] rev 9264
keyword: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:49:30 +0200] rev 9263
interhg: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:48:02 +0200] rev 9262
highlight: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:47:25 +0200] rev 9261
hgk: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:46:55 +0200] rev 9260
hgcia: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:46:28 +0200] rev 9259
graphlog: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:46:02 +0200] rev 9258
fetch: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:45:36 +0200] rev 9257
extdiff: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:44:41 +0200] rev 9256
convert: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:42:15 +0200] rev 9255
color: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:41:31 +0200] rev 9254
churn: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:40:37 +0200] rev 9253
children: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:39:47 +0200] rev 9252
bugzilla: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:38:22 +0200] rev 9251
bookmarks: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:37:17 +0200] rev 9250
acl: wrap docstrings at 70 characters
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:33:00 +0200] rev 9249
commands: wrap docstrings at 70 characters
It is no longer necessary to wrap the docstrings at 70 characters in
the source -- with the reST parser, they are re-formatted to fit the
terminal when shown.
However, wrapping the docstrings at 78 characters makes life harder
for translators because it marks a lot of strings as fuzzy for no good
reason. When un-marking them, the translators would have to examine
each string again and determine if it is merely re-wrapped or if the
content was also changed.
The long lines also introduce very ugly linebreaks in the .po files if
they are processed using the standard Gettext tools without using
something like '--width 85' all the time.
Matt Mackall <mpm@selenic.com> [Mon, 27 Jul 2009 18:38:20 -0500] rev 9248
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 27 Jul 2009 18:38:03 -0500] rev 9247
Merge with stable
David Soria Parra <dsp@php.net> [Mon, 27 Jul 2009 02:27:24 +0200] rev 9246
email: Catch exceptions during send.
Catch SMTPlib exceptions to avoid mercurial showing a backtrace during
an e.g. authentication error.
Matt Mackall <mpm@selenic.com> [Sat, 25 Jul 2009 19:04:08 -0500] rev 9245
update: make a naked except more specific (issue1766)
Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Jul 2009 02:20:27 +0200] rev 9244
tests/hghave: bzr114 checks for bzr >= 1.14
Everything but the implementation indicated that bzr114 also should be true for
"or higher".
Bill Barry <after.fallout@gmail.com> [Fri, 24 Jul 2009 15:53:40 -0600] rev 9243
fix issue 1763: strip chars from end of line when parsing gitpatch lines
Bryan O'Sullivan <bos@serpentine.com> [Sat, 25 Jul 2009 10:08:20 -0700] rev 9242
issue1251: bail if darcs version is too old
Martin Geisler <mg@lazybytes.net> [Fri, 24 Jul 2009 15:28:29 +0200] rev 9241
Merge with crew-stable
Cédric Duval <cedricduval@free.fr> [Fri, 24 Jul 2009 12:20:40 +0200] rev 9240
gendoc: don't translate topic strings twice (issue1760)
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 26 Jul 2009 18:02:06 +0200] rev 9239
dirstate: fold paths using the just added util.realpath() function.
Using the one true canonical path of a directory entry allows
equivalent paths to be treated gracefully. Equivalent means, in this
case, differing directory entries resulting in the same, unique file
system link to a file.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 26 Jul 2009 17:25:08 +0200] rev 9238
util: add realpath() for getting the 'true' path.
The function is implemented for Mac OS X using the F_GETPATH fcntl,
and a basic implementation for Windows is provided as well. On other
POSIX systems, vanilla os.path.realpath() is used.
David Soria Parra <dsp@php.net> [Fri, 24 Jul 2009 00:40:00 +0200] rev 9237
bookmarks: optimize update routine in case track.current is set
David Soria Parra <dsp@php.net> [Fri, 24 Jul 2009 00:37:42 +0200] rev 9236
bookmarks: Teach addchangset to respect track.current
addchangeset didn't respect track.current, resulting in hg pull to forward all
bookmarks although track.current is set to True. Reported by Christos Trochalakis.
David Soria Parra <dsp@php.net> [Fri, 24 Jul 2009 00:04:24 +0200] rev 9235
bookmarks: Wrap commictx instead of commit (issue 1515)
Matt Mackall <mpm@selenic.com> [Thu, 23 Jul 2009 15:26:29 -0500] rev 9234
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 23 Jul 2009 15:25:47 -0500] rev 9233
Merge with i18n
David Soria Parra <dsp@php.net> [Tue, 21 Jul 2009 15:47:13 +0200] rev 9232
i18n-de: fix indention
Martin Geisler <mg@lazybytes.net> [Tue, 21 Jul 2009 00:17:10 +0200] rev 9231
i18n-da: switch back to "rettelse" for "patch"
Martin Geisler <mg@lazybytes.net> [Mon, 20 Jul 2009 23:55:55 +0200] rev 9230
i18n-da: updates in gpg, highlight, inotify, and mq
Martin Geisler <mg@lazybytes.net> [Mon, 20 Jul 2009 23:24:12 +0200] rev 9229
i18n-da: synchronized with 78e54b9f3a62
Cédric Duval <cedricduval@free.fr> [Sat, 18 Jul 2009 22:49:49 +0200] rev 9228
i18n-fr: synchronized with 78e54b9f3a62
Cédric Duval <cedricduval@free.fr> [Sat, 18 Jul 2009 22:45:59 +0200] rev 9227
i18n-fr: translations for dispatch.py
Cédric Duval <cedricduval@free.fr> [Sat, 18 Jul 2009 22:45:31 +0200] rev 9226
i18n-fr: translation of various core messages
Cédric Duval <cedricduval@free.fr> [Sat, 18 Jul 2009 22:44:50 +0200] rev 9225
i18n-fr: translation for the archive command
Cédric Duval <cedricduval@free.fr> [Sat, 18 Jul 2009 22:43:34 +0200] rev 9224
i18n-fr: translation of bisect
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 16 Jul 2009 12:13:23 -0300] rev 9223
i18n-pt_BR: synchronized with 78e54b9f3a62
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 16:55:17 +0200] rev 9222
merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 06 Jul 2009 10:39:46 -0300] rev 9221
i18n-pt_BR: synchronized with 196d40e7c885 (1.3)
Greg Ward <greg-hg@gerg.ca> [Tue, 21 Jul 2009 20:31:45 -0400] rev 9220
transaction: document close(), abort() methods
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 23 Jul 2009 20:44:26 +0200] rev 9219
merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:26:42 +0200] rev 9218
zeroconf: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:26:26 +0200] rev 9217
win32text: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:25:54 +0200] rev 9216
win32mbcs: fix formatting of lists with proper reST markup
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:25:34 +0200] rev 9215
purge: fix formatting of lists with proper reST markup
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:24:52 +0200] rev 9214
patchbomb: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:24:34 +0200] rev 9213
parentrevspec: change list to a literal block
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:24:03 +0200] rev 9212
pager: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:23:53 +0200] rev 9211
interhg: use reST syntax for literal block
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:23:39 +0200] rev 9210
highlight: use reST syntax for literal block
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:23:24 +0200] rev 9209
hgk: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:23:08 +0200] rev 9208
hgcia: use reST syntax for literal block
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:22:50 +0200] rev 9207
extdiff: use reST syntax for literal block
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:22:35 +0200] rev 9206
color: use reST syntax for literal block
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:22:05 +0200] rev 9205
churn: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:21:46 +0200] rev 9204
bugzilla: wrap example template line
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:20:18 +0200] rev 9203
bugzilla: reformat list of configuration options
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:02:06 +0200] rev 9202
bookmarks: use reST syntax for literal block
Martin Geisler <mg@lazybytes.net> [Thu, 23 Jul 2009 00:01:24 +0200] rev 9201
acl: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net> [Wed, 22 Jul 2009 23:26:27 +0200] rev 9200
transplant: better reST formatting
Bryan O'Sullivan <bos@serpentine.com> [Wed, 22 Jul 2009 15:28:30 -0700] rev 9199
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Wed, 22 Jul 2009 23:12:54 +0200] rev 9198
coding style: use a space after comma
I left a cases like 'lambda x,y:' alone -- the lack of a space does
not bother me as much when the variables are single letters.
Martin Geisler <mg@lazybytes.net> [Wed, 22 Jul 2009 23:08:32 +0200] rev 9197
commands: remove ineffective parenthesis
Martin Geisler <mg@lazybytes.net> [Wed, 22 Jul 2009 22:56:45 +0200] rev 9196
merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Jul 2009 08:28:30 +0100] rev 9195
keyword: reformat kwfiles help for minirst parser
Martin Geisler <mg@lazybytes.net> [Tue, 21 Jul 2009 12:19:53 +0200] rev 9194
hgignore.5: mark file names and cmdline options as literal text
Martin Geisler <mg@lazybytes.net> [Tue, 21 Jul 2009 12:09:32 +0200] rev 9193
merge with crew-stable
Matt Mackall <mpm@selenic.com> [Thu, 23 Jul 2009 12:58:15 -0500] rev 9192
Added signature for changeset 3ef6c14a1e8e
Matt Mackall <mpm@selenic.com> [Thu, 23 Jul 2009 12:58:10 -0500] rev 9191
Added tag 1.3.1 for changeset 3ef6c14a1e8e
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Jul 2009 19:12:34 +0100] rev 9190
keyword: argument to "kwdemo --rcfile" must be string (bugfix)
Matt Mackall <mpm@selenic.com> [Wed, 22 Jul 2009 18:27:23 -0500] rev 9189
heads: more clarity for --closed
Matt Mackall <mpm@selenic.com> [Wed, 22 Jul 2009 18:08:02 -0500] rev 9188
Merge with crew-stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Jul 2009 17:59:11 -0500] rev 9187
update: allow -c to jump branches if clean
Matt Mackall <mpm@selenic.com> [Wed, 22 Jul 2009 17:53:23 -0500] rev 9186
subrepo: use '/' for joining non-local paths
Matt Mackall <mpm@selenic.com> [Wed, 22 Jul 2009 00:28:37 -0500] rev 9185
fetch: drop force arg for commit (issue1752)
This appears to be unneeded and forces fetch commits to examine clean files.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 22 Jul 2009 15:26:27 -0700] rev 9184
Fix issue1679: path reconstruction in hgwebdir was mangling things badly
Martin Geisler <mg@lazybytes.net> [Wed, 22 Jul 2009 22:50:34 +0200] rev 9183
do not translate commit messages
It is not very helpful to have 'Added tag %s for changeset %s' and
similar messages translated into different languages when people work
together using different locales.
We now use English strings without support for translations. If
needed, the user can still supply a custom string for most commands.
Martin Geisler <mg@lazybytes.net> [Tue, 21 Jul 2009 12:06:32 +0200] rev 9182
hgignore.5: expanded description
- explain that .hgignore must be created manually
- hint that it is typically put under revision control
Matt Mackall <mpm@selenic.com> [Mon, 20 Jul 2009 19:18:38 -0500] rev 9181
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Jul 2009 21:15:40 +0200] rev 9180
merge with -stable
Patrick Mezard <pmezard@gmail.com> [Sun, 19 Jul 2009 18:44:20 +0200] rev 9179
Update win32 build instructions for rst2html
Patrick Mezard <pmezard@gmail.com> [Sun, 19 Jul 2009 18:28:43 +0200] rev 9178
Merge with crew-stable
Matt Mackall <mpm@selenic.com> [Mon, 20 Jul 2009 19:15:44 -0500] rev 9177
Merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Jul 2009 18:59:19 +0200] rev 9176
graphlog: fix incoming with local repo (issue1731)
Patrick Mezard <pmezard@gmail.com> [Sun, 19 Jul 2009 18:23:37 +0200] rev 9175
Mention GnuWin32 gettext in win32 build instructions
James Abbatiello <abbeyj at gmail.com> [Tue, 14 Jul 2009 22:38:12 -0400] rev 9174
Fix test-demandimport and test-trusted under Windows
The Windows-only wrapper around stdout is causing both of these tests to fail.
test-demandimport fails because it tries to print repr(sys.stdout). Use
stderr instead since that is not wrapped.
test-trusted fails because the wrapper doesn't handle softspace and an
unexpected extra space gets printed.
Matt Mackall <mpm@selenic.com> [Fri, 17 Jul 2009 11:52:53 -0500] rev 9173
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sat, 18 Jul 2009 22:28:28 +0200] rev 9172
doc: update README with links to Docutils
Martin Geisler <mg@lazybytes.net> [Fri, 17 Jul 2009 20:52:21 +0200] rev 9171
hg: better wrapping of string literal
Matt Mackall <mpm@selenic.com> [Sat, 18 Jul 2009 12:41:49 -0500] rev 9170
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Fri, 17 Jul 2009 16:01:19 +0200] rev 9169
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 17 Jul 2009 13:31:12 +0200] rev 9168
convert/svn: fix backtrace in tags discovery (issue1742)
Brendan Cully <brendan@kublai.com> [Thu, 16 Jul 2009 21:05:24 -0700] rev 9167
Merge with hg
Matt Mackall <mpm@selenic.com> [Sat, 18 Jul 2009 12:34:38 -0500] rev 9166
changelog: move delayopener outside of class to eliminate reference cycle
Matt Mackall <mpm@selenic.com> [Sat, 18 Jul 2009 11:26:35 -0500] rev 9165
changelog: swap opener to switch delay modes
Matt Mackall <mpm@selenic.com> [Sat, 18 Jul 2009 11:25:55 -0500] rev 9164
changelog: factor out _delayname
Matt Mackall <mpm@selenic.com> [Sat, 18 Jul 2009 11:25:54 -0500] rev 9163
changelog: _delaycount -> _divert
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:26 +0200] rev 9162
doc: link man pages to one another
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:26 +0200] rev 9161
doc: fixup font markup in man pages
This exposed a bug in rst2man where it neglects to escape a literal
backslash. A patch has been applied upstream, but not yet packaged in,
say, Debian unstable. A forward-compatible work-around has therefore
been put in place.
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:26 +0200] rev 9160
help: fix bad indentation in template filters list
The indentation showed up in the hg.1.html file.
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:26 +0200] rev 9159
doc: add newline after literal blocks in man pages
The rst2man writer leaves no space between a literal block and the
following paragraph. This patch corrects this.
It has also been applied upstream. This does not conflict with this
change since any number of newlines can be added without effecting the
rendered man page.
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:26 +0200] rev 9158
doc: use reStructuredText for man and HTML pages
The Makefile now requires the rst2html and rst2man programs. Both can
be found in Debian testing or downloaded from the Docutils homepage:
http://docutils.sf.net/
http://docutils.sf.net/sandbox/manpage-writer/
The new HTML and man pages no longer contain huge amounts of
un-wrapping literal blocks, thanks to how snippets of reStructuredText
can easily be included inside other reStructuredText documents.
The HTML pages now have anchors for all sections, including the help
topics in hgrc.1 which were missing from the old HTML pages.
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:26 +0200] rev 9157
commands: use minirst parser when displaying help
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:25 +0200] rev 9156
minimal reStructuredText parser
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:25 +0200] rev 9155
util: wrap at termwidth-2 by default
Matt Mackall <mpm@selenic.com> [Thu, 16 Jul 2009 15:40:13 -0500] rev 9154
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 16 Jul 2009 14:49:52 -0500] rev 9153
Add ui.progress API
Greg Ward <greg-hg@gerg.ca> [Thu, 16 Jul 2009 10:41:19 -0400] rev 9152
tags: support 'instant' tag retrieval (issue548)
- modify _readtagcache() and _writetagcache() to read/write tag->node
mapping for global tags
- if (and only if) tip unchanged, use that cached mapping to avoid
reading any revisions of .hgtags
- change so tag names are UTF-8 in memory in tags.py, and converted to
local encoding as late as possible (in localrepository._findtags())
Greg Ward <greg-hg@gerg.ca> [Thu, 16 Jul 2009 10:39:42 -0400] rev 9151
tags: implement persistent tag caching (issue548).
- rename findglobaltags() to findglobaltags1() (so the "no cache"
implementation is still there if we need it)
- add findglobaltags2() and make findglobaltags() an alias for it
(disabling tag caching is a one-line patch)
- factor out tagcache class with methods readcache() and writecache();
the expensive part of tag finding (iterate over heads and find
.hgtags filenode) is now in tagcache.readcache()
Greg Ward <greg-hg@gerg.ca> [Thu, 16 Jul 2009 10:39:41 -0400] rev 9150
localrepo: add destroyed() method for strip/rollback to use (issue548).
Greg Ward <greg-hg@gerg.ca> [Thu, 16 Jul 2009 10:39:41 -0400] rev 9149
Factor tags module out of localrepo (issue548).
Currently only handles reading tags, and will soon grow support for
tag caching. Could eventually deal with updating tags too.
Greg Ward <greg-hg@gerg.ca> [Thu, 16 Jul 2009 10:39:41 -0400] rev 9148
localrepo: factor updatetags() out of readtags() (issue548).
Greg Ward <greg-hg@gerg.ca> [Thu, 16 Jul 2009 10:39:41 -0400] rev 9147
localrepo: improve readability of _findtags(), readtags() (issue548).
- rename many local variables
- add some comments
- refactor call to line.split() (catch ValueError rather
than checking length of return value: one less local variable)
Greg Ward <greg-hg@gerg.ca> [Thu, 16 Jul 2009 10:39:41 -0400] rev 9146
localrepo: rename in-memory tag cache instance attributes (issue548).
- self.tagscache to self._tags
- self._tagstypecache to self._tagtypes
- this is for consistency, readability, privacy, and to subtly hint
that "caching" is something else
Greg Ward <greg-hg@gerg.ca> [Thu, 16 Jul 2009 10:39:41 -0400] rev 9145
localrepo: factor _findtags() out of tags() (issue548).
This makes in-memory caching the sole responsibility of localrepo,
eliminating some localrepo code that was duplicated in mq and
bookmarks.
Greg Ward <greg-hg@gerg.ca> [Thu, 16 Jul 2009 10:39:41 -0400] rev 9144
test-tags: enhance the test to probe tag caching better (issue548).
- give detailed dumps of .hgtags and localtags content
- repeat some query operations to expose cache bugs
- ensure that rollback/strip undo tagging operations
Greg Ward <greg-hg@gerg.ca> [Thu, 16 Jul 2009 10:39:41 -0400] rev 9143
test-tags: clarify test output; simplify test script a bit (issue548).
- use simpler way ('hg id') to get current changeset id
- add 'echo' statements to guide the eye when reading output
- add some more output to clarify the state of .hgtags
- drop '-d' option from every commit/tag, since run-tests.py
does this (although with a different timestamp, so changeset
ids differ)
Martin Geisler <mg@lazybytes.net> [Wed, 15 Jul 2009 17:44:47 +0200] rev 9142
merge with crew-stable
Brendan Cully <brendan@kublai.com> [Tue, 14 Jul 2009 18:00:37 -0700] rev 9141
Merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Tue, 14 Jul 2009 17:21:10 -0700] rev 9140
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Tue, 14 Jul 2009 16:51:52 -0700] rev 9139
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Wed, 15 Jul 2009 00:24:20 +0200] rev 9138
merge with mpm
Martin Geisler <mg@lazybytes.net> [Wed, 15 Jul 2009 00:19:15 +0200] rev 9137
merge with crew-stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 13 Jul 2009 09:50:26 +0900] rev 9136
for calls expecting bool args, pass bool instead of int
str.splitlines and email.message.as_string both expect a bool argument
defaulting at False: replace f(1) by f(True) and f(0) by f()
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Jul 2009 20:24:16 +0200] rev 9135
merge with -stable
Martin Geisler <mg@lazybytes.net> [Tue, 14 Jul 2009 20:10:23 +0200] rev 9134
merge with crew-stable
Simon Heimberg <simohe@besonet.ch> [Tue, 14 Jul 2009 14:05:07 +0200] rev 9133
store: eliminate reference cycle in fncachestore
no reference to self in fncacheopener
Inspired by Adrian Buehlmann
Shun-ichi GOTO <shunichi.goto@gmail.com> [Fri, 10 Jul 2009 19:34:08 +0900] rev 9132
win32mbcs: add special wrapper for osutil.listdir().
osutil.listdir() may misinterpret 0x5c of MBCS 2nd. byte as path
separator. New wrapper prevents this by adding it beforehand.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Fri, 10 Jul 2009 15:52:01 +0900] rev 9131
win32mbcs: wrapper supports keyword arguments and dict result.
The keyword arguments are also decoded before calling original.
And dict of return value is also encoded back.
Cédric Duval <cedricduval@free.fr> [Fri, 10 Jul 2009 19:45:31 +0200] rev 9130
gendoc: fall back to pure modules if C extensions are not available (issue1711)
James Abbatiello <abbeyj at gmail.com> [Tue, 14 Jul 2009 22:42:05 -0400] rev 9129
Don't copy hidden files/directories during `setup.py install`
This is useful if a copy of Mercurial is stored in a Subversion repository
so that the .svn directories don't get copied.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 10 Jul 2009 13:40:25 +0200] rev 9128
commands: hide deprecated commands.
A command is considered deprecated if the word "DEPRECATED" is found
in the doc string. Such commands are hidden from non-verbose help.
Henri Wiechers <hwiechers@gmail.com> [Sun, 12 Jul 2009 07:56:43 +0200] rev 9127
hgignore.5.txt: improved description of matching
Improved the description of the matching behavior used with .hgignore.
Made some minor language improvements.
Brendan Cully <brendan@kublai.com> [Tue, 14 Jul 2009 17:59:36 -0700] rev 9126
Merge with bos
Brendan Cully <brendan@kublai.com> [Tue, 14 Jul 2009 17:58:36 -0700] rev 9125
Fix issue1738 for strip too.
I see no reason to open every touched file at once.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 14 Jul 2009 17:18:45 -0700] rev 9124
setup.py: don't pollute the current directory with temporary files
Brendan Cully <brendan@kublai.com> [Tue, 14 Jul 2009 16:50:37 -0700] rev 9123
Make patch.diff filelog cache LRU of 20 files. Fixes issue1738.
20 files is as fast as 200 for hg diff -r 28015:30103 of mozilla-central.
Ideally we'd use util.lrucachefunc, but the interface doesn't quite work.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 14 Jul 2009 17:12:12 -0300] rev 9122
url: fix use of non-int port in https connections via proxy
Complements eef406165507 (issue1725).
Greg Ward <greg-hg@gerg.ca> [Sun, 12 Jul 2009 22:33:00 -0400] rev 9121
test-fetch: fix non-portable sed regex.
(s/...\+/.../ appears to be a GNU-ism: this test broke on OS X and
NetBSD. Changing \+ to * fixes it, although that is a slightly less
strict regex.)
Henrik Stuart <hg@hstuart.dk> [Mon, 13 Jul 2009 20:19:17 +0200] rev 9120
branch heads: optimise computation of branch head cache (issue1734)
The previous branch heads cache implementation iterated all ancestors
for each new revision in the repository, causing a massive slowdown on
cloning larger repositories.
Matt Mackall <mpm@selenic.com> [Tue, 14 Jul 2009 12:18:22 -0500] rev 9119
Merge with stable
Steve Borho <steve@borho.org> [Sun, 12 Jul 2009 00:46:43 -0500] rev 9118
cmdutil: fall back to filename if glob expand has errors
On Windows, Mercurial tries to glob expand provided filenames as a
convenience to the user. Unfortunately, there are valid filenames
which are not valid glob patterns. In those cases, we should fallback
to the original provided filename.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 13 Jul 2009 21:55:17 +0900] rev 9117
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 13 Jul 2009 16:49:05 +0200] rev 9116
inotify: fix issue1375, add a test.
The biggest problem was the data structure, which did not allow changing
a file into a directory or vice versa. This problem is fixed by b55d44719b47.
The walk() method also had an issue in this case:
- we know 'path' as a directory. inotify server sleeps.
- 'path' is deleted
- 'path' is recreated as a file
- the server catches up here, and see the deletion. it instantiates a scan(),
which in its turn calls for walk(repo, path).
- walk() then assumes that 'path' is a directory and calls os.listdir on it,
which raises an OSError(errno.ENOTDIR)
Catch the error, and yield the file instead of the directory contents.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 26 May 2009 23:00:35 +0900] rev 9115
inotify: server: new data structure to keep track of changes.
== Rationale for the new structure ==
Current structure was a dictionary tree. One directory was tracked
as a dictionary:
- keys: file/subdir name
- values:
- for a file, the status (a/r/m/...)
- for a subdir, the directory representing the subdir
It allowed efficient lookups, no matter of the type of the terminal leaf:
for part in path.split('/'): tree = tree[part]
However, there is no way to represent a directory and a file with the same name
because keys are conflicting in the dictionary. Concrete example:
Initial state:
root dir
|- foo (file)
|- bar (file)
# data state is: {'foo': 'n', 'bar': 'n'}
Remove foo:
root dir
|- bar (file)
# Data becomes {'foo': 'r'} until next commit.
Add foo, as a directory, and foo/barbar file:
root dir
|- bar (file)
|-> foo (dir)
|- barbar (file)
# New state should be represented as:
{'foo': {'barbar': 'a'}, 'bar': 'n'}
however, the key "foo" is already used and represents the old file.
The dirstate:
D foo
A foo/barbar
cannot be represented, hence the need for a new structure.
== The new structure ==
'directory' class. Represents one directory level.
* Notable attributes:
Two dictionaries:
- 'files' Maps filename -> status for the current dir.
- 'dirs' Maps subdir's name -> directory object representing the subdir
* methods
- walk(), formerly server.walk
- lookup(), old server.lookup
- dir(), old server.dir
This new class allows embedding all the tree walks/lookups in its own class,
instead of having everything mixed together in server.
Incidently, since files and directories are not stored in the same
dictionaries, we are solving the previous key conflict problem.
The small drawback is that lookup operation is a bit more complex:
for a path a/b/c/d/e we have to check twice the leaf, if e is a directory or a
file.
Martin Geisler <mg@lazybytes.net> [Sun, 12 Jul 2009 21:41:12 +0200] rev 9114
merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sun, 12 Jul 2009 21:37:24 +0200] rev 9113
gitweb, monoblue: fix double-spacing in file view (issue1733)
The error was introduced in 338412820a57.
Simon Heimberg <simohe@besonet.ch> [Fri, 10 Jul 2009 17:54:04 +0200] rev 9112
util: use propertycache in opener instead of __getattr__
Martin Geisler <mg@lazybytes.net> [Fri, 10 Jul 2009 23:24:35 +0200] rev 9111
mq: use ui.status when pushing and popping patches
Mads Kiilerich <mads@kiilerich.com> [Thu, 09 Jul 2009 23:59:03 +0200] rev 9110
mq: qpop now tells which patches are popped
When navigating through a patch series by qpushing and qpopping it was easy to
get lost because qpop was silent. I found myself often running qnext after qpop
to see which patch I just dropped - especially if I was about to qrm it. This
patch makes qpop more symmetric to qpush by showing which patches are
applied/"unapplied".
I think it is a good change even though it changes output by adding a new line
of output.
Martin Geisler <mg@lazybytes.net> [Fri, 10 Jul 2009 12:49:29 +0200] rev 9109
merge with crew-stable
Henrik Stuart <hg@hstuart.dk> [Wed, 08 Jul 2009 18:35:13 +0200] rev 9108
url: fix use of non-int port in https connections (issue1725)
Versions of Python before 2.6 cannot automatically convert a given
port number to an integer, so we add a conversion to coerce the given
input to an int.
Martin Geisler <mg@lazybytes.net> [Fri, 10 Jul 2009 01:23:07 +0200] rev 9107
doc/Makefile: let hg1.gendoc.txt depend on gendoc.py
Martin Geisler <mg@lazybytes.net> [Thu, 09 Jul 2009 22:52:39 +0200] rev 9106
keyword: use all caps for 'note:' in help string
The diff, export, log, and status commands write it as 'NOTE:'.
Martin Geisler <mg@lazybytes.net> [Thu, 09 Jul 2009 22:43:24 +0200] rev 9105
notify: fix indentation in module docstring
Martin Geisler <mg@lazybytes.net> [Thu, 09 Jul 2009 22:42:43 +0200] rev 9104
notify: cleanup module docstring
Martin Geisler <mg@lazybytes.net> [Thu, 09 Jul 2009 20:15:15 +0200] rev 9103
convert: fix inconsistent indentation in help text
The sort modes flags and convert.cvsps options were indented while the
convert.hg, convert.svn, and convert.p4 options were not. I've now
un-indented all of them.
Matt Mackall <mpm@selenic.com> [Thu, 09 Jul 2009 19:49:02 -0500] rev 9102
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 06 Jul 2009 14:52:44 -0500] rev 9101
filectx: add a hex method
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 09 Jul 2009 22:06:30 +0900] rev 9100
win32mbcs: also wrap windows.pconvert()
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 09 Jul 2009 21:39:19 +0900] rev 9099
Use os.path.split() for MBCS with win32mbcs extension.
Brodie Rao <me+hg@dackz.net> [Wed, 08 Jul 2009 09:48:48 -0400] rev 9098
win32mbcs: look up modules using sys.modules (issue1729)
globals()[module] doesn't work for modules inside of packages, such as
os.path.
Matt Mackall <mpm@selenic.com> [Thu, 09 Jul 2009 17:10:07 -0500] rev 9097
fix memory usage of revlog caches by limiting cache size [issue1639]
Christian Ebert <blacktrash@gmx.net> [Thu, 09 Jul 2009 11:59:12 +0200] rev 9096
keyword: eliminate potential reference cycles from kwrepo
- delete kwrepo.commitctx after using the tweaked version
- prefer self.hook over repo.hook to avoid nesting
Also pass arguments to commit as arbitrary list.
Thanks to Simon Heimberg and Matt Mackall for guidance.
Greg Ward <greg-hg@gerg.ca> [Wed, 08 Jul 2009 22:08:45 -0400] rev 9095
convert/cvs: improve error message on unexpected server output.
Henrik Stuart <henrik.stuart@edlund.dk> [Tue, 07 Jul 2009 19:24:52 +0200] rev 9094
transaction: fix uncaught ENOENT (issue1724)
The opener raises an IOError on errors where transaction expects an
OSError.
Henrik Stuart <hg@hstuart.dk> [Thu, 09 Jul 2009 20:49:02 +0200] rev 9093
branch heads: fix regression introduced in e67e5b60e55f (issue1726)
For merge nodes it is not adequate to only check a single possible
branch head for whether it is an ancestor of the latest head, but it
needs to be done for each possible branch head.
Abderrahim Kitouni <a.kitouni@gmail.com> [Sat, 04 Jul 2009 14:18:15 +0100] rev 9092
subrepo: use hg.repository instead of creating localrepo directly
this way, extensions' reposetup will be called, which allows for git
subrepos to be handled by hg-git (and I believe the same goes for
svn and hgsubversion)
Brendan Cully <brendan@kublai.com> [Thu, 09 Jul 2009 15:14:42 -0700] rev 9091
ignore: separate pattern extraction from match compilation
hgignore files have slightly different syntax from match objects,
e.g. syntax: foo headers, regexp: forms, and re being relre. Put
conversion from hgignore syntax into match syntax into a standalone
function so that it is easier to validate hgignore hunks externally.
Martin Geisler <mg@lazybytes.net> [Thu, 09 Jul 2009 11:59:56 +0200] rev 9090
merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Thu, 09 Jul 2009 11:59:18 +0200] rev 9089
util: remove unused bufsize argument
Removed it correctly this time: the subprocess default is 0, not -1
and so we must pass -1 explicitly. Added a comment to that effect.
Greg Ward <greg-hg@gerg.ca> [Wed, 08 Jul 2009 22:08:45 -0400] rev 9088
convert/cvs: improve error message on unexpected server output.
Martin Geisler <mg@lazybytes.net> [Wed, 08 Jul 2009 23:17:10 +0200] rev 9087
typos: "it's" -> "its"
Martin Geisler <mg@lazybytes.net> [Wed, 08 Jul 2009 23:12:40 +0200] rev 9086
convert: fixed typo in docstring
Bryan O'Sullivan <bos@serpentine.com> [Wed, 08 Jul 2009 17:03:50 -0700] rev 9085
Merge OS X performance regression fix
Bryan O'Sullivan <bos@serpentine.com> [Wed, 08 Jul 2009 17:03:16 -0700] rev 9084
Merge backed out change
Bryan O'Sullivan <bos@serpentine.com> [Wed, 08 Jul 2009 17:01:18 -0700] rev 9083
Backed out changeset fce065538bcf: it caused a 5x performance regression on OS X
Martin Geisler <mg@lazybytes.net> [Wed, 08 Jul 2009 17:14:24 +0200] rev 9082
help: wrapped help strings at 78 characters
Christian Ebert <blacktrash@gmx.net> [Tue, 07 Jul 2009 23:30:53 +0200] rev 9081
keyword: collect kwmaps using a generator expression
Allowed for Python 2.4.
Martin Geisler <mg@lazybytes.net> [Wed, 08 Jul 2009 00:30:21 +0200] rev 9080
commands: avoid bad linebreak in addremove docstring
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9079
Makefile: wrap hg.pot strings at 82 chars
By default, xgettext will wrap strings at 79 characters. This width
includes the two double-quotes and the '\n' added. Our strings are now
wrapped at 78 characters and a line can therefore be up to 82
characters wide in the .po file.
Setting the width to 82 characters ensures that xgettext does no silly
wrapping on our already-wrapped strings while still wrapping long
one-liners at 82 characters.
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9078
zeroconf: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9077
win32mbcs: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9076
transplant: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9075
share: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9074
record: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9073
rebase: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9072
purge: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9071
patchbomb: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9070
parentrevspec: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9069
pager: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9068
notify: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9067
mq: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9066
keyword: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9065
interhg: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9064
highlight: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9063
hgk: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9062
hgcia: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9061
graphlog: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9060
fetch: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9059
extdiff: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9058
convert: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9057
color: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9056
churn: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9055
children: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9054
bugzilla: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9053
bookmarks: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 9052
acl: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:30 +0200] rev 9051
commands: wrapped docstrings at 78 characters
We have always had a left margin of 4 characters -- probably just
because that's how docstrings for top-level functions turn out by
default, but it also looks nice in the built-in help.
The docstrings were wrapped at 70 characters, which is the default for
Emacs. However, this gives a right margin of 10 characters in a
standard 80 character terminal.
I've now wrapped the relevant docstrings at 78 characters, effectively
killing the right margin. The asymmetric margins looked a bit odd and
some of the text looked cramped with a right margin, so Dirkjan and I
felt that it was best to remove it entirely. The two character gap was
kept to have some space between the border of the terminal -- it will
also make diffs involving the docstrings fit in a 80 character line.
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:30:48 +0200] rev 9050
extdiff: fix indentation and use gettext
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 17:26:20 +0200] rev 9049
filemerge, subrepo: correct indention
Simon Heimberg <simohe@besonet.ch> [Sun, 21 Jun 2009 01:13:19 +0200] rev 9048
ui: extract choice from prompt
avoid translating single characters (as l for _local or sym_link)
Cédric Duval <cedricduval@free.fr> [Sun, 05 Jul 2009 17:09:01 +0200] rev 9047
patchbomb: use local time for the Date: header
Cédric Duval <cedricduval@free.fr> [Sun, 05 Jul 2009 16:42:10 +0200] rev 9046
patchbomb: fix From_ in the message's envelope
Localized date in the From_ prevents MUAs like mutt from parsing mbox files
generated by patchbomb. Using a 24 characters date in asctime format instead.
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 14:20:58 +0200] rev 9045
merge with crew-stable
David Champion <dgc@uchicago.edu> [Tue, 07 Jul 2009 01:25:44 +0200] rev 9044
Bourne shells do not maintain $PWD; update tests accordingly
Brodie Rao <me+hg@dackz.net> [Sun, 05 Jul 2009 18:52:55 -0400] rev 9043
tests: remove more instances of export FOO=bar bashism
Brodie Rao <me+hg@dackz.net> [Sun, 05 Jul 2009 18:52:55 -0400] rev 9042
tests: remove more instances of export FOO=bar bashism
David Champion <dgc@uchicago.edu> [Sun, 05 Jul 2009 13:59:25 -0500] rev 9041
test-gpg: suppress secure memory warning
Some platforms (Solaris for one) does not support secure memory and
would give a warning.
David Champion <dgc@uchicago.edu> [Sun, 05 Jul 2009 13:58:37 -0500] rev 9040
test: fix for compatibilty with true Bourne /bin/sh
'export foo=bar' is an extension, replaced with 'foo=bar; export foo'
Martin Geisler <mg@lazybytes.net> [Sun, 05 Jul 2009 12:50:14 +0200] rev 9039
p4: simplify sort key
Martin Geisler <mg@lazybytes.net> [Sun, 05 Jul 2009 12:43:40 +0200] rev 9038
localrepo: removed unnecessary revkey sort helper
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 11:06:41 +0200] rev 9037
compat: remove unnecessary diamond-shaped multiple inheritance
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 11:06:09 +0200] rev 9036
split local and stdlib module imports (eases migration issues)
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 11:05:31 +0200] rev 9035
compat: don't reference an exception var inside a lambda
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 11:04:55 +0200] rev 9034
compat: use email in favor of mimetools
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 11:04:31 +0200] rev 9033
verify: fix scope issues with del statement
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 11:02:00 +0200] rev 9032
compat: use 'key' argument instead of 'cmp' when sorting a list
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 11:01:30 +0200] rev 9031
compat: use open() instead of file() everywhere
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 11:01:01 +0200] rev 9030
compat: can't compare two values of unequal datatypes
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 11:00:44 +0200] rev 9029
compat: use // for integer division
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 10:59:54 +0200] rev 9028
tests: add -3 switch to run-tests.py
Christian Ebert <blacktrash@gmx.net> [Sat, 04 Jul 2009 15:26:14 +0200] rev 9027
keyword: remove unused import
Martin Geisler <mg@lazybytes.net> [Sat, 04 Jul 2009 13:31:36 +0200] rev 9026
merge with crew-stable
David Wolever <wolever@cs.toronto.edu> [Sat, 04 Jul 2009 12:40:34 +0200] rev 9025
help: add #revision syntax to the example valid URLs.
Greg Ward <greg@gerg.ca> [Fri, 03 Jul 2009 10:43:46 -0400] rev 9024
context: improve arg-checking assert.
David Wolever <wolever@cs.toronto.edu> [Sat, 04 Jul 2009 12:40:34 +0200] rev 9023
help: add #revision syntax to the example valid URLs.
Martin Geisler <mg@lazybytes.net> [Sat, 04 Jul 2009 12:25:10 +0200] rev 9022
merge wtih crew-stable
Cédric Duval <cedricduval@free.fr> [Sat, 04 Jul 2009 12:12:36 +0200] rev 9021
gendoc: fix localization of help topic
When a topic provides a callable method for its text, most likely
this text will be generated from different parts, so it does not
make sense to apply gettext on the whole result, rather the method
should provide translation by itself.
This is the case with the extensions topic, which triggers a double
gettext call, making the ASCII codec fail when it encounters 8 bit
characters, and prevents the documentation from being built.
Cédric Duval <cedricduval@free.fr> [Sat, 04 Jul 2009 12:06:33 +0200] rev 9020
extensions: remove dead code
enabled used to be a boolean, and somehow that bit of code inadvertently
slipped through during a refactoring. Effectively dead code, as the
condition can never be triggered.
Martin Geisler <mg@lazybytes.net> [Thu, 02 Jul 2009 20:03:58 +0200] rev 9019
merge with crew-stable
Henrik Stuart <hg@hstuart.dk> [Thu, 02 Jul 2009 19:53:20 +0200] rev 9018
acl: read correct index into url for username (issue298)
The index was inadvertedly off-by-one causing the username to be the
remote host rather than the remote user when hosted in a http(s)
session.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 27 Jun 2009 13:09:11 +0200] rev 9017
color: don't highlight the summary part of the qseries command
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 27 Jun 2009 15:28:44 +0200] rev 9016
mq: align columns in verbose qseries output.
Brodie Rao <me+hg@dackz.net> [Wed, 01 Jul 2009 10:19:40 -0400] rev 9015
extensions: remove unused imports
Henri Wiechers <hwiechers@gmail.com> [Fri, 26 Jun 2009 14:42:05 +0200] rev 9014
test python hook configured with python:[file]:[hook] syntax
Adds a test for python hooks configured with python:[file]:[hook] syntax
in .hgrc. Increases the test coverage for mercurial/hook from 92% (79/85)
to 96% (82/85).
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 23:46:28 +0200] rev 9013
keyword: break overlong line
Cédric Duval <cedricduval@free.fr> [Wed, 01 Jul 2009 23:15:26 +0200] rev 9012
bisect: fix format specifiers for integers
Matt Mackall <mpm@selenic.com> [Wed, 01 Jul 2009 16:47:46 -0500] rev 9011
Added signature for changeset 196d40e7c885
Matt Mackall <mpm@selenic.com> [Wed, 01 Jul 2009 16:47:42 -0500] rev 9010
Added tag 1.3 for changeset 196d40e7c885
Matt Mackall <mpm@selenic.com> [Wed, 01 Jul 2009 13:57:01 -0500] rev 9009
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 01 Jul 2009 08:51:22 -0300] rev 9008
i18n-pt_BR: synchronized with 59bb11a97fe5
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 01 Jul 2009 18:08:37 +0900] rev 9007
i18n-jp: translation update for 09c6735e3880
Cédric Duval <cedricduval@free.fr> [Wed, 01 Jul 2009 08:45:12 +0200] rev 9006
i18n-fr: translation of part of the mq extension
Cédric Duval <cedricduval@free.fr> [Wed, 01 Jul 2009 07:29:39 +0200] rev 9005
i18n-fr: translation of the zeroconf extension
Cédric Duval <cedricduval@free.fr> [Wed, 01 Jul 2009 07:21:10 +0200] rev 9004
i18n-fr: translation of the purge extension
Cédric Duval <cedricduval@free.fr> [Wed, 01 Jul 2009 07:15:28 +0200] rev 9003
i18n-fr: translation of the parentrevspec extension
Cédric Duval <cedricduval@free.fr> [Wed, 01 Jul 2009 07:09:44 +0200] rev 9002
i18n-fr: synchronized with 7d39c76be4ee
Martin Geisler <mg@lazybytes.net> [Tue, 30 Jun 2009 23:30:52 +0200] rev 9001
i18n-da: synchronized with 09c6735e3880
Martin Geisler <mg@lazybytes.net> [Tue, 30 Jun 2009 23:17:57 +0200] rev 9000
Merge with mpm
Martin Geisler <mg@lazybytes.net> [Tue, 30 Jun 2009 23:16:38 +0200] rev 8999
i18n-da: use "lap" instead of "rettelse"
Martin Geisler <mg@lazybytes.net> [Tue, 30 Jun 2009 20:25:21 +0200] rev 8998
i18n-da: translated many one-liners
Matt Mackall <mpm@selenic.com> [Wed, 01 Jul 2009 13:55:24 -0500] rev 8997
subrepo: audit subrepo paths
Christian Ebert <blacktrash@gmx.net> [Tue, 30 Jun 2009 11:30:03 +0200] rev 8996
keyword: make repo.commit use a custom commitctx wrapper
This avoids forcing the dirstate of overwritten files to normal
during a commit.
Thanks to Dan Villiom Podlaski Christiansen for the idea of a
"double wrapper", so other extensions can still wrap
repo.commitctx safely.
Matt Mackall <mpm@selenic.com> [Wed, 01 Jul 2009 01:16:19 -0500] rev 8995
commit: lose some pointless 'nothing changed' messages
Move message from localrepo to commands. This drops confusing messages
in subrepo, import, and rebase.
Matt Mackall <mpm@selenic.com> [Wed, 01 Jul 2009 01:05:24 -0500] rev 8994
commit: report modified subrepos in commit editor
Matt Mackall <mpm@selenic.com> [Wed, 01 Jul 2009 00:41:14 -0500] rev 8993
verify: demote warning about nullid in copy to note
Matt Mackall <mpm@selenic.com> [Wed, 01 Jul 2009 00:35:59 -0500] rev 8992
help: add more pointers to commit --close-branch
Matt Mackall <mpm@selenic.com> [Wed, 01 Jul 2009 00:31:59 -0500] rev 8991
branches: add --closed flag for consistency with heads
Matt Mackall <mpm@selenic.com> [Tue, 30 Jun 2009 23:25:53 -0500] rev 8990
addremove: build lists of already added and removed files too (issue1696)
Matt Mackall <mpm@selenic.com> [Tue, 30 Jun 2009 16:11:42 -0500] rev 8989
addremove: pass unknown and deleted to findrenames directly again
Matt Mackall <mpm@selenic.com> [Tue, 30 Jun 2009 15:56:08 -0500] rev 8988
addremove: normalize some variable names
Matt Mackall <mpm@selenic.com> [Mon, 29 Jun 2009 15:34:17 -0500] rev 8987
findrenames: drop unused argument defaults
Brendan Cully <brendan@kublai.com> [Tue, 30 Jun 2009 19:23:50 -0700] rev 8986
zsh completion: update bisect for builtin syntax
Brendan Cully <brendan@kublai.com> [Tue, 30 Jun 2009 18:47:16 -0700] rev 8985
zsh completion: add hg branch
Brendan Cully <brendan@kublai.com> [Tue, 30 Jun 2009 18:45:09 -0700] rev 8984
zsh completion: add hg branches
Brendan Cully <brendan@kublai.com> [Tue, 30 Jun 2009 18:41:43 -0700] rev 8983
zsh completion: basic merge support
Brodie Rao <me+hg@dackz.net> [Tue, 30 Jun 2009 17:58:17 -0400] rev 8982
zsh completion: disable defaults and verbose output when completing
If ui.verbose is set to True in hgrc, commands used to provide completions
would yield bad results. For example, qpush completion would include the
patch numbers and statuses as returned by qunapplied -v, instead of just
the patch names.
Defaults are also disabled when completing to prevent similar issues when
an option is set that changes a command's output.
Martin Geisler <mg@lazybytes.net> [Tue, 30 Jun 2009 23:40:03 +0200] rev 8981
Merge with mpm
Brendan Cully <brendan@kublai.com> [Tue, 30 Jun 2009 14:31:16 -0700] rev 8980
zsh completion: include guarded patches in qdelete
Matt Mackall <mpm@selenic.com> [Tue, 30 Jun 2009 12:32:30 -0500] rev 8979
Merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Fri, 26 Jun 2009 09:44:35 -0300] rev 8978
i18n-pt_BR: synchronized with eac360045ba4
Cédric Duval <cedricduval@free.fr> [Sun, 28 Jun 2009 23:44:24 +0200] rev 8977
i18n-fr: translation of the extensions help topic
Cédric Duval <cedricduval@free.fr> [Sun, 28 Jun 2009 22:58:58 +0200] rev 8976
i18n-fr: translation of help screen strings
Cédric Duval <cedricduval@free.fr> [Sun, 28 Jun 2009 21:31:49 +0200] rev 8975
i18n-fr: translation of the patchbomb extension
Cédric Duval <cedricduval@free.fr> [Sun, 28 Jun 2009 20:35:38 +0200] rev 8974
i18n-fr: add a glossary and recommendations
Cédric Duval <cedricduval@free.fr> [Tue, 26 May 2009 23:46:15 +0200] rev 8973
i18n: add French translation file
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 28 Jun 2009 22:24:33 +0900] rev 8972
i18n-jp: translation update for 288ba6d6c5c7
this revision consists of contribution by:
Muraoka Yusuke<yusuke.muraoka@gmail.com>
Tadashi Jokagi <elf@elf.no-ip.org>
UENISHI Kota <kuenishi@gmail.com>
Yuki KODAMA <endflow.net@gmail.com>
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Martin Geisler <mg@lazybytes.net> [Sat, 27 Jun 2009 13:42:40 +0200] rev 8971
i18n-da: translated 50%
This change translates many of the strings from the convert, inotify,
fetch, gpg, and transplant extensions.
Martin Geisler <mg@lazybytes.net> [Sat, 27 Jun 2009 12:31:41 +0200] rev 8970
convert: do not ask for translation of "%s %s"
Martin Geisler <mg@lazybytes.net> [Sat, 27 Jun 2009 12:21:26 +0200] rev 8969
i18n-da: translated cmdline help strings
Martin Geisler <mg@lazybytes.net> [Wed, 24 Jun 2009 20:57:39 +0200] rev 8968
i18n-da: translated log and some mq commands
Martin Geisler <mg@lazybytes.net> [Wed, 24 Jun 2009 18:31:46 +0200] rev 8967
i18n-da: change "arkiv" to "depot"
Martin Geisler <mg@lazybytes.net> [Wed, 24 Jun 2009 17:45:43 +0200] rev 8966
i18n-da: sync with 288ba6d6c5c7
Dongsheng Song <songdongsheng@live.cn> [Wed, 24 Jun 2009 10:21:59 +0800] rev 8965
i18n-zh: sync with 288ba6d6c5c7(2009-06-24 04:43:09+08:00)
Cédric Duval <cedricduval@free.fr> [Mon, 29 Jun 2009 19:28:54 +0200] rev 8964
extensions: catch OSError when hgext is not accessible (issue1708)
Temporary workaround for issue1708: on win32 with py2exe, hgext is distributed
inside a zipped file (which anyway does not contain the py files from which we
ought to extract the documentation strings), which raises a WindowsError
(subclasses OSError).
This means that on such platforms the list of disabled extensions won't be
available. Real fix postponed for after Mercurial 1.3.
Brodie Rao <me+hg@dackz.net> [Wed, 06 May 2009 16:27:50 -0400] rev 8963
color: wrap qdiff/qseries after all extensions are loaded
Brodie Rao <me+hg@dackz.net> [Sun, 28 Jun 2009 16:03:10 -0400] rev 8962
atom: use urlescape in filelog's file link
Brendan Cully <brendan@kublai.com> [Mon, 29 Jun 2009 09:32:06 -0700] rev 8961
Relicense zsh completion script under zsh license.
Steve agreed some time ago.
Brendan Cully <brendan@kublai.com> [Mon, 29 Jun 2009 09:00:37 -0700] rev 8960
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 29 Jun 2009 09:00:26 -0700] rev 8959
Update test output for e67e5b60e55f
Stefano Mioli <jstevie@gmail.com> [Sun, 28 Jun 2009 13:56:34 +0200] rev 8958
commands: improve bundle compression methods description
Christian Ebert <blacktrash@gmx.net> [Sun, 28 Jun 2009 16:23:23 +0200] rev 8957
keyword: improve help for kwfiles
- just use "files" instead of "filenames" (analogous to "hg status -h")
- reference the extension help wrt pattern configuration
Kudos to timeless for helpful suggestions.
Christian Ebert <blacktrash@gmx.net> [Sun, 28 Jun 2009 16:11:27 +0200] rev 8956
keyword: lowercase status flags of untracked files in kwfile output
Document the flags and their meanings in the command help
(thanks to timeless for bringing this to my attention).
Brendan Cully <brendan@kublai.com> [Mon, 29 Jun 2009 08:48:05 -0700] rev 8955
help: branch heads have no descendants, not no children
Brendan Cully <brendan@kublai.com> [Mon, 29 Jun 2009 00:54:23 -0700] rev 8954
Branch heads should not include "heads" that are ancestors of other heads.
For example, given 1 (branch a) -> 2 (branch b) -> 3 (branch a)
I expect "hg heads a" to show only 3.
Discovered by running hg heads HEAD on the mutt repo, where older clients
committed default on top of HEAD.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 28 Jun 2009 19:31:16 +0900] rev 8953
inotify: server: remove wpath method
Only called once. And can be simplified to an easy oneliner.
Simon Heimberg <simohe@besonet.ch> [Sun, 21 Jun 2009 18:11:19 +0200] rev 8952
inotify: return version to client even when not matching
Old clients are expecting a version string even in case of mismatch, otherwise
they get stuck.
Henrik Stuart <hg@hstuart.dk> [Thu, 25 Jun 2009 22:43:58 +0200] rev 8951
windows: fix use of undefined exception (issue1707)
This fixes the implied reliance on pywin32 and the win32 module. This
also fixes a regression in ae275ad46bd0 that made Mercurial unusable
without pywin32.
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 13:05:25 +0200] rev 8950
keyword: improve help for kwfiles
Martin Geisler <mg@lazybytes.net> [Sat, 27 Jun 2009 13:08:07 +0200] rev 8949
highlight: remove author name from docstring
I don't feel this should be part of the documentation. The name of the
original author can of course still be found with 'hg log'.
Martin Geisler <mg@lazybytes.net> [Sat, 27 Jun 2009 12:13:40 +0200] rev 8948
mq: standardize qfinish cmdline help string
Martin Geisler <mg@lazybytes.net> [Sat, 27 Jun 2009 12:05:01 +0200] rev 8947
inotify: OPT -> OPTION in cmdline help string
Martin Geisler <mg@lazybytes.net> [Sat, 27 Jun 2009 12:03:48 +0200] rev 8946
hgk: standardize cmdline help strings
Greg Ward <greg-hg@gerg.ca> [Thu, 25 Jun 2009 09:23:33 -0400] rev 8945
color: don't blow up if configured with unknown color (just warn).
Isaac Jurado <diptongo@gmail.com> [Wed, 24 Jun 2009 19:20:59 +0200] rev 8944
bookmarks: Change references to "repo" by references to "self" (issue1611)
Using "repo" instead of "self" inside bookmark_repo methods was causing a
circular reference and, thus, a memory leak. It has been detected because the
method bundlerepository.__del__ is never called, therefore leaving dangling
uncompressed bundles inside .hg subdirectory.
Greg Ward <greg-hg@gerg.ca> [Tue, 23 Jun 2009 22:20:54 -0400] rev 8943
run-tests: use os.path.realpath() to find hg's setup.py.
Needed for running out-of-tree test suites without --with-hg/--local.
Mads Kiilerich <mads@kiilerich.com> [Wed, 24 Jun 2009 03:05:01 +0200] rev 8942
Make RPM spec in contrib more aligned with the one from Fedora
This is mostly syntactical changes which make the real differences more obvious
when looking at a diff.
contrib/mergetools.rc is now also installed and enabled by default.
Matt Mackall <mpm@selenic.com> [Tue, 23 Jun 2009 17:51:51 -0500] rev 8941
addremove: drop some silly variable assignments
Mads Kiilerich <mads@kiilerich.com> [Sun, 21 Jun 2009 03:13:38 +0200] rev 8940
ui.prompt: Show prompt and selection in non-interactive mode
ui.prompt was completely silent in non-interactive mode, unless in verbose
mode. It is fine that it chooses the default automatically, but it is confusing
that the message and prompt shown interactively can't be found in scripted
tests.
The prompt and selection is now .write'ed instead of .note'ed.
Christian Ebert <blacktrash@gmx.net> [Thu, 25 Jun 2009 09:53:47 +0200] rev 8939
keyword: make kwdemo more translation friendly
Martin Geisler <mg@lazybytes.net> [Wed, 24 Jun 2009 19:15:58 +0200] rev 8938
commands: wrap short descriptions in 'hg help'
The code for wrapping a single line of text with a hanging indent was
duplicated in commands and help -- it's now moved to a new function
called wrap in util.
The function defaults to a line width is 78 chars, and this un-wraps
some command line flag descriptions, hence the test output changes.
Martin Geisler <mg@lazybytes.net> [Wed, 24 Jun 2009 18:40:13 +0200] rev 8937
commands: add "--" to command line flag in branches docstring
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 15:32:37 +0200] rev 8936
change wiki/bts URLs to point to new hostname
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 13:42:34 +0200] rev 8935
extensions: change descriptions for hook-providing extensions
Thanks to timeless and Dave Townsend for advice!
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 13:42:02 +0200] rev 8934
extensions: change descriptions for extensions providing a few commands
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 13:10:05 +0200] rev 8933
help: rewrap extension description line length at 78 instead of 70
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 12:25:56 +0200] rev 8932
extensions: fix up description lines some more
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 12:04:19 +0200] rev 8931
commands: add note about import retrieving patches from URLs
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 12:03:53 +0200] rev 8930
windows: import WinIOError from win32 module (issue1707)
Quick fix pending further refactoring of windows error handling.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 12:03:13 +0200] rev 8929
mq: compact & rewrap documentation for qdelete command
Martin Geisler <mg@lazybytes.net> [Tue, 23 Jun 2009 23:05:51 +0200] rev 8928
test-globalopts: broken by output change in 62e3b9466700
Matt Mackall <mpm@selenic.com> [Tue, 23 Jun 2009 15:43:09 -0500] rev 8927
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 22 Jun 2009 15:58:22 -0300] rev 8926
i18n-pt_BR: synchronized with 3ad0b5ddae58
Martin Geisler <mg@lazybytes.net> [Mon, 22 Jun 2009 22:22:48 +0200] rev 8925
merged with crew
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 22 Jun 2009 15:58:21 -0300] rev 8924
i18n-pt_BR: minor rewording and formatting fixes
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 22 Jun 2009 15:58:12 -0300] rev 8923
i18n-pt_BR: synchronized with d9f4c182aeca
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 19 Jun 2009 12:38:04 -0300] rev 8922
i18n-pt_BR: synchronized with 708938509732
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 19 Jun 2009 12:34:12 -0300] rev 8921
i18n-pt_BR: synchronized with fccdf5ca5065
Martin Geisler <mg@lazybytes.net> [Sun, 21 Jun 2009 20:09:03 +0200] rev 8920
merged Greek translation
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 25 Jan 2009 17:35:38 +0200] rev 8919
Add the start of a new translation of Mercurial to Greek (UTF-8)
Martin Geisler <mg@lazybytes.net> [Sun, 21 Jun 2009 19:27:09 +0200] rev 8918
i18n-da: sync with hg.pot
- translated fuzzy strings
- removed old unused strings
Martin Geisler <mg@lazybytes.net> [Sun, 21 Jun 2009 19:12:03 +0200] rev 8917
commands: removed redundant line from push docstring
Martin Geisler <mg@lazybytes.net> [Sun, 21 Jun 2009 19:06:57 +0200] rev 8916
merged with crew
Martin Geisler <mg@lazybytes.net> [Sat, 20 Jun 2009 18:58:34 +0200] rev 8915
i18n-da: merged translation with TortoiseHg
Martin Geisler <mg@lazybytes.net> [Sun, 21 Jun 2009 12:39:38 +0200] rev 8914
i18n-da: translate fuzzy strings
Martin Geisler <mg@lazybytes.net> [Sun, 21 Jun 2009 01:12:16 +0200] rev 8913
i18n-da: sync with hg.pot