upstream/mercurial-mirror Files · tests/test-rename-merge1.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-merge1.out
        
                    43 lines
            
             | 1.2 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-rename-merge1.out

History | Source | Raw |Copy content |Copy permalink

Matt Mackall Add core copy detection algorithm...	r3153	checkout
		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 Add core copy detection algorithm...	r3153	merge
Matt Mackall merge: add debug diagnostics for findcopies	r5371	searching for copies back to rev 1
		unmatched files in local:
		c2
		unmatched files in other:
		b
		b2
		all copies found (* = to merge, ! = divergent):
Matt Mackall merge: add a bit more sanity to divergent copy checks	r5857	c2 -> a2 !
Matt Mackall merge: add debug diagnostics for findcopies	r5371	b -> a *
Matt Mackall merge: add a bit more sanity to divergent copy checks	r5857	b2 -> a2 !
Matt Mackall merge: add debug diagnostics for findcopies	r5371	checking for directory renames
Matt Mackall merge: warn user about divergent renames	r4674	a2: divergent renames -> dr
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	resolving manifests
		overwrite None partial False
		ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
Matt Mackall merge: report destinations of moves in merge action messages	r3727	a: remote moved to b -> m
Matt Mackall Add core copy detection algorithm...	r3153	b2: remote created -> g
Matt Mackall merge: introduce mergestate	r6512	preserving a for resolve of b
		removing a
		picked tool 'internal:merge' for b (binary False symlink False)
		merging a and b to b
		my b@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
Matt Mackall merge: allow smarter tool configuration...	r6004	premerge successful
Matt Mackall merge: warn user about divergent renames	r4674	warning: detected divergent renames of a2 to:
		c2
		b2
Matt Mackall Add core copy detection algorithm...	r3153	getting b2
Matt Mackall merge: fixes for merge+rename...	r3251	1 files updated, 1 files merged, 0 files removed, 0 files unresolved
Matt Mackall Add core copy detection algorithm...	r3153	(branch merge, don't forget to commit)
Matt Mackall merge: fixes for merge+rename...	r3251	M b
		a
		M b2
		R a
Matt Mackall Backed out changeset c2a21fe60994...	r5764	C c2
Matt Mackall Add core copy detection algorithm...	r3153	blahblah
Matt Mackall merge: remember rename copies and parents properly on commit...	r3292	rev offset length base linkrev nodeid p1 p2
		0 0 67 0 1 dc51707dfc98 000000000000 000000000000
		1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98
Matt Mackall refactor debugrenamed	r3652	b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66

	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