upstream/mercurial-mirror Files · tests/test-merge-types

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:

r5710:026eb800 default


                r9115:b55d4471

default

Download file

             test-merge-types
        
                    39 lines
            
             | 643 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-types

History | Source | Raw |Copy content |Copy permalink

Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503	#!/bin/sh

		hg init
		echo a > a
Matt Mackall add --debug to test-merge-types	r5701	hg ci -Amadd # 0
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503
		chmod +x a
Matt Mackall add --debug to test-merge-types	r5701	hg ci -mexecutable # 1
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503
		hg up 0
		rm a
		ln -s symlink a
Matt Mackall add --debug to test-merge-types	r5701	hg ci -msymlink # 2
		hg merge --debug
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503
Matt Mackall add --debug to test-merge-types	r5701	echo % symlink is local parent, executable is other
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503
Thomas Arendsen Hein Use test -h instead of test -L for portability...	r5682	if [ -h a ]; then
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503	echo a is a symlink
Thomas Arendsen Hein Use common readlink.py instead of own implementations per test script.	r5683	$TESTDIR/readlink.py a
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503	elif [ -x a ]; then
		echo a is executable
Matt Mackall update test-merge-types	r5710	else
		echo "a has no flags (default for conflicts)"
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503	fi

		hg update -C 1
Matt Mackall add --debug to test-merge-types	r5701	hg merge --debug
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503
Matt Mackall add --debug to test-merge-types	r5701	echo % symlink is other parent, executable is local
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503
Thomas Arendsen Hein Use test -h instead of test -L for portability...	r5682	if [ -h a ]; then
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503	echo a is a symlink
Thomas Arendsen Hein Use common readlink.py instead of own implementations per test script.	r5683	$TESTDIR/readlink.py a
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503	elif [ -x a ]; then
		echo a is executable
Matt Mackall update test-merge-types	r5710	else
		echo "a has no flags (default for conflicts)"
Bryan O'Sullivan Test a merge of a symlink against an executable file....	r5503	fi

	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