upstream/mercurial-mirror Files · tests/test-add.out

inotify: server: new data structure to keep track of changes....

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.

Steve Losh - - Load All Authors

File last commit:

r8902:b9a8b616 default


                r9115:b55d4471

default

Download file

             test-add.out
        
                    40 lines
            
             | 604 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-add.out

History | Source | Raw |Copy content |Copy permalink

Benoit Boissinot make hg add of a removed file unremove the file...	r5207	adding a
		? a
		adding a
		A a
Steve Losh Add a forget command for easily untracking files....	r8902	adding a
		A a
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	A a
		? b
		A a
		A b
		% should fail
		b already tracked!
		A a
		A b
		% should fail
		a already tracked!
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall merge: allow smarter tool configuration...	r6004	merging a
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	warning: conflicts during merge.
		merging a failed!
		0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Augie Fackler merge: better error messages to lead users to hg update --clean to abandon merges....	r7821	use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	M a
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	% should fail
		a already tracked!
		M a
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	% issue683
Steve Losh Add a forget command for easily untracking files....	r8902	? a.orig
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	R a
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	M a
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig
Matt Mackall add: use match.bad callback more effectively	r8679	c: No such file or directory
		d: No such file or directory
Patrick Mezard commands: add exits(1) if a specified file cannot be added (issue 891)	r5688	M a
		A c
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages