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.