upstream/mercurial-mirror Files · tests/test-rename-dir-merge.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-rename-dir-merge.out
        
                    75 lines
            
             | 1.8 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-rename-dir-merge.out

History | Source | Raw |Copy content |Copy permalink

Matt Mackall Add missing test output	r3735	adding a/a
		adding a/b
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall copy: handle rename internally...	r5610	moving a/a to b/a
		moving a/b to b/b
Matt Mackall Add missing test output	r3735	2 files updated, 0 files merged, 2 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 local:
		a/c
Matt Mackall rename: add test for moving untracked files in directories	r5567	a/d
Matt Mackall merge: add debug diagnostics for findcopies	r5371	unmatched files in other:
		b/a
		b/b
		all copies found (* = to merge, ! = divergent):
		b/a -> a/a
		b/b -> a/b
		checking for directory renames
		dir a/ -> b/
		file a/c -> b/c
Matt Mackall rename: add test for moving untracked files in directories	r5567	file a/d -> b/d
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	resolving manifests
		overwrite None partial False
		ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
Matt Mackall rename: add test for moving untracked files in directories	r5567	a/d: remote renamed directory to b/d -> d
Matt Mackall Add missing test output	r3735	a/c: remote renamed directory to b/c -> d
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	a/b: other deleted -> r
		a/a: other deleted -> r
		b/a: remote created -> g
		b/b: remote created -> g
Matt Mackall Add missing test output	r3735	removing a/a
		removing a/b
		moving a/c to b/c
Matt Mackall rename: add test for moving untracked files in directories	r5567	moving a/d to b/d
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	getting b/a
		getting b/b
Matt Mackall rename: add test for moving untracked files in directories	r5567	4 files updated, 0 files merged, 2 files removed, 0 files unresolved
Matt Mackall Add missing test output	r3735	(branch merge, don't forget to commit)
Matt Mackall rename: add test for moving untracked files in directories	r5567	a/* b/a b/b b/c b/d
Matt Mackall Add missing test output	r3735	M b/a
		M b/b
		A b/c
		a/c
		R a/a
		R a/b
		R a/c
Matt Mackall rename: add test for moving untracked files in directories	r5567	? b/d
Alexis S. L. Carvalho correctly record file-level history when the local side renames a directory	r5229	b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	0 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:
		b/a
		b/b
Matt Mackall rename: add test for moving untracked files in directories	r5567	b/d
Matt Mackall merge: add debug diagnostics for findcopies	r5371	unmatched files in other:
		a/c
		all copies found (* = to merge, ! = divergent):
		b/a -> a/a
		b/b -> a/b
		checking for directory renames
		dir a/ -> b/
		file a/c -> b/c
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	resolving manifests
		overwrite None partial False
		ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
Matt Mackall Add missing test output	r3735	None: local renamed directory to b/c -> d
		getting a/c to b/c
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall Add missing test output	r3735	(branch merge, don't forget to commit)
Matt Mackall rename: add test for moving untracked files in directories	r5567	a/* b/a b/b b/c b/d
Matt Mackall Add missing test output	r3735	A b/c
		a/c
Matt Mackall rename: add test for moving untracked files in directories	r5567	? b/d
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Alexis S. L. Carvalho correctly record file-level history when the local side renames a directory	r5229	b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88

	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