upstream/mercurial-mirror Files · tests/test-remove.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.

Benoit Boissinot - - Load All Authors

File last commit:

r8533:6062c636 default


                r9115:b55d4471

default

Download file

             test-remove.out
        
                    113 lines
            
             | 2.9 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-remove.out

History | Source | Raw |Copy content |Copy permalink

Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	% file not managed
Benoit Boissinot remove: warn if unversionned files are specified (issue1454)	r8533	not removing foo: file is untracked
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	? foo
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 00 state added, options none
		not removing bar: file has been marked for add (use -f to force removal)
		A bar
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./bar
		./foo
Benoit Boissinot update --clean: do not unlink added files (issue575)	r8518	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	% 01 state clean, options none
		R foo
Benoit Boissinot update --clean: do not unlink added files (issue575)	r8518	? bar
		./bar
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 02 state modified, options none
		not removing foo: file is modified (use -f to force removal)
		M foo
Benoit Boissinot update --clean: do not unlink added files (issue575)	r8518	? bar
		./bar
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 03 state missing, options none
		R foo
Benoit Boissinot update --clean: do not unlink added files (issue575)	r8518	? bar
		./bar
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 10 state added, options -f
		? bar
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./bar
		./foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 11 state clean, options -f
		R foo
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 12 state modified, options -f
		R foo
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 13 state missing, options -f
		R foo
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 20 state added, options -A
		not removing bar: file still exists (use -f to force removal)
		A bar
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./bar
		./foo
Benoit Boissinot update --clean: do not unlink added files (issue575)	r8518	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	% 21 state clean, options -A
		not removing foo: file still exists (use -f to force removal)
Benoit Boissinot update --clean: do not unlink added files (issue575)	r8518	? bar
		./bar
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 22 state modified, options -A
		not removing foo: file still exists (use -f to force removal)
		M foo
Benoit Boissinot update --clean: do not unlink added files (issue575)	r8518	? bar
		./bar
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 23 state missing, options -A
		R foo
Benoit Boissinot update --clean: do not unlink added files (issue575)	r8518	? bar
		./bar
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 30 state added, options -Af
		? bar
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./bar
		./foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 31 state clean, options -Af
		R foo
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 32 state modified, options -Af
		R foo
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% 33 state missing, options -Af
		R foo
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		adding test/bar
		adding test/foo
		% dir, options none
Matt Mackall remove: work directly off status...	r6761	removing test/bar
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	removing test/foo
		R test/bar
		R test/foo
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% dir, options -f
Matt Mackall remove: work directly off status...	r6761	removing test/bar
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	removing test/foo
		R test/bar
		R test/foo
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% dir, options -A
		not removing test/foo: file still exists (use -f to force removal)
		removing test/bar
		R test/bar
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./foo
		./test/foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% dir, options -Af
Matt Mackall remove: work directly off status...	r6761	removing test/bar
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	removing test/foo
		R test/bar
		R test/foo
Florent Guillaume test-remove: make it pass on Mac OS X 10.5	r6356	./foo
		./test/foo
Dirkjan Ochtman improved semantics for remove (issue438)...	r6346	2 files updated, 0 files merged, 0 files removed, 0 files unresolved

	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