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

Matt Mackall - - Load All Authors

File last commit:

r8753:af5f099d default


                r9115:b55d4471

default

Download file

             test-issue672.out
        
                    58 lines
            
             | 2.0 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-issue672.out

History | Source | Raw |Copy content |Copy permalink

Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	adding 1
		adding 2
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall merge: add debug diagnostics for findcopies	r5371	searching for copies back to rev 1
		unmatched files in other:
		1a
		all copies found (* = to merge, ! = divergent):
		1a -> 1
		checking for directory renames
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	resolving manifests
		overwrite None partial False
		ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	1: other deleted -> r
		1a: remote created -> g
		removing 1
		getting 1a
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Matt Mackall merge: add debug diagnostics for findcopies	r5371	searching for copies back to rev 1
		unmatched files in local:
		1a
		all copies found (* = to merge, ! = divergent):
		1a -> 1 *
		checking for directory renames
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	resolving manifests
		overwrite None partial False
		ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96
Matt Mackall merge: combine a copy and move case	r8748	1a: local copied/moved to 1 -> m
Matt Mackall merge: introduce mergestate	r6512	preserving 1a for resolve of 1a
Matt Mackall merge: allow smarter tool configuration...	r6004	picked tool 'internal:merge' for 1a (binary False symlink False)
Matt Mackall merge: introduce mergestate	r6512	merging 1a and 1 to 1a
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
Matt Mackall merge: allow smarter tool configuration...	r6004	premerge successful
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Matt Mackall merge: add debug diagnostics for findcopies	r5371	searching for copies back to rev 1
		unmatched files in other:
		1a
		all copies found (* = to merge, ! = divergent):
		1a -> 1 *
		checking for directory renames
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	resolving manifests
		overwrite None partial False
		ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	1: remote moved to 1a -> m
Matt Mackall merge: introduce mergestate	r6512	preserving 1 for resolve of 1a
		removing 1
		picked tool 'internal:merge' for 1a (binary False symlink False)
		merging 1 and 1a to 1a
		my 1a@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d
Matt Mackall merge: allow smarter tool configuration...	r6004	premerge successful
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

	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