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