Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Dec 2008 12:19:12 -0800] rev 7543
Merge crew and stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 21 Dec 2008 09:40:55 +0100] rev 7542
merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 20 Dec 2008 16:27:51 -0600] rev 7541
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 20 Dec 2008 13:09:05 +0100] rev 7540
merge with stable
Gilles Moris <gilles.moris@free.fr> [Fri, 19 Dec 2008 22:32:08 +0100] rev 7539
color: fix colorization of the 'old mode' git diff metadata
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 20 Dec 2008 00:43:03 +0100] rev 7538
merge with -stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 19 Dec 2008 18:49:02 +0100] rev 7537
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 19 Dec 2008 08:42:41 +0100] rev 7536
merge with crew-stable (again)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 19 Dec 2008 08:20:19 +0100] rev 7535
merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Dec 2008 09:58:41 +0100] rev 7534
keyword: simplify repo.local and bundle check (as in 2f4a399a8787)
Brendan Cully <brendan@kublai.com> [Mon, 15 Dec 2008 12:03:28 -0800] rev 7533
Merge with crew-stable
Matt Mackall <mpm@selenic.com> [Sat, 20 Dec 2008 16:12:01 -0600] rev 7532
Added signature for changeset 3773e510d433
Matt Mackall <mpm@selenic.com> [Sat, 20 Dec 2008 16:12:00 -0600] rev 7531
Added tag 1.1.1 for changeset 3773e510d433
Matt Mackall <mpm@selenic.com> [Fri, 19 Dec 2008 20:58:33 -0600] rev 7530
resolve: clarify and simplify help
Matt Mackall <mpm@selenic.com> [Fri, 19 Dec 2008 16:48:32 -0600] rev 7529
tests: fix no-diffs option
Matt Mackall <mpm@selenic.com> [Fri, 19 Dec 2008 16:48:31 -0600] rev 7528
archive: fix bogus error message with no working directory
Matt Mackall <mpm@selenic.com> [Fri, 19 Dec 2008 16:47:36 -0600] rev 7527
resolve: require -a switch to resolve all files
Like revert -a, this should make this command slightly safer
Benoit Allard <benoit@aeteurope.nl> [Fri, 19 Dec 2008 21:38:01 +0100] rev 7526
fix typo
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 19 Dec 2008 18:24:49 +0100] rev 7525
hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 19 Dec 2008 08:41:46 +0100] rev 7524
tests: fix test-mq-qclone-http (broken by e60aaae83323)
Benoit Allard <benoit@aeteurope.nl> [Thu, 18 Dec 2008 22:32:48 +0100] rev 7523
hgweb: recurse down collections only if ** in [paths]
collections: direct child repos only
paths *: direct child repos only (like collections)
paths **: recursive discovery
When ** is used, the mq repository (if any) is also shown.
Brendan Cully <brendan@kublai.com> [Mon, 15 Dec 2008 12:02:18 -0800] rev 7522
inotify: do not attempt to monkeypatch bundlerepos
Brendan Cully <brendan@kublai.com> [Sun, 14 Dec 2008 23:05:18 -0800] rev 7521
Merge with crew-stable
Bartosz SKOWRON <getxsick@gmail.com> [Fri, 05 Dec 2008 14:51:50 +0100] rev 7520
patch: simplify linereader
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Dec 2008 18:13:41 +0100] rev 7519
Merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Dec 2008 13:28:20 +0100] rev 7518
merge with -stable
Brendan Cully <brendan@kublai.com> [Sun, 14 Dec 2008 23:04:29 -0800] rev 7517
patch: handle git patches that remove symlinks (issue1438)
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Dec 2008 17:35:19 +0100] rev 7516
context: enforce memctx.files() unicity
localrepo.commitctx() expects changed files lists to contain unique items and
does not sort itself. Passing duplicates makes them evaluated more than once
and changes the committed changelog id.
Adrian Buehlmann <adrian@cadifra.com> [Sat, 13 Dec 2008 18:32:29 +0100] rev 7515
store: encode trailing period and space on directory names (issue1417)
Windows won't create directories with names ending in period or space, so
we encode the last period/space character in directory names of non-hashed
paths in the store using reversible ~xx encoding (' ' -> '~20', '.' -> '~2e').
With this change it is possible to remove a directory ending in period or space
that was inadvertantly checked in on a linux system while still being able
to clone such a repository with its full history to Windows (see also issue793).
Adrian Buehlmann <adrian@cadifra.com> [Sat, 13 Dec 2008 17:39:56 +0100] rev 7514
store: don't create dirs ending in period or space for hashed paths (issue1417)
Windows won't create directories with names ending in period or space, so
we replace the last period/space character in truncated directory names of
hashed paths with some other character (underbar).