##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.
Martin Geisler - - Load All Authors

File last commit:

r8523:5b7da468 default
r9115:b55d4471 default
Show More
test-merge-commit
74 lines | 1.6 KiB | text/plain | TextLexer
/ tests / test-merge-commit
History | Source | Raw |Copy content |Copy permalink
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058 #!/bin/sh
# check that renames are correctly saved by a commit after a merge
# test with the merge on 3 having the rename on the local parent
hg init a
cd a
echo line1 > foo
hg add foo
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m '0: add foo'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058
echo line2 >> foo
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m '1: change foo'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058
hg up -C 0
hg mv foo bar
rm bar
echo line0 > bar
echo line1 >> bar
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m '2: mv foo bar; change bar'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058
hg merge 1
echo '% contents of bar should be line0 line1 line2'
cat bar
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m '3: merge with local rename'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058 hg debugindex .hg/store/data/bar.i
hg debugrename bar
hg debugindex .hg/store/data/foo.i
# revert the content change from rev 2
hg up -C 2
rm bar
echo line1 > bar
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m '4: revert content change from rev 2'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058
Martin Geisler
tests: replace #...# syntax with {...}
 r8523 hg log --template '{rev}:{node|short} {parents}\n'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058 echo '% this should use bar@rev2 as the ancestor'
hg --debug merge 3
echo '% contents of bar should be line1 line2'
cat bar
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m '5: merge'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058 hg debugindex .hg/store/data/bar.i
# same thing, but with the merge on 3 having the rename on the remote parent
echo
echo
cd ..
hg clone -U -r 1 -r 2 a b
cd b
hg up -C 1
hg merge 2
echo '% contents of bar should be line0 line1 line2'
cat bar
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m '3: merge with remote rename'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058 hg debugindex .hg/store/data/bar.i
hg debugrename bar
hg debugindex .hg/store/data/foo.i
# revert the content change from rev 2
hg up -C 2
rm bar
echo line1 > bar
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m '4: revert content change from rev 2'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058
Martin Geisler
tests: replace #...# syntax with {...}
 r8523 hg log --template '{rev}:{node|short} {parents}\n'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058 echo '% this should use bar@rev2 as the ancestor'
hg --debug merge 3
echo '% contents of bar should be line1 line2'
cat bar
Martin Geisler
tests: removed redundant "-d '0 0'" from test scripts...
 r8167 hg ci -m '5: merge'
Alexis S. L. Carvalho
filecommit: don't forget the local parent on a merge with a local rename
 r4058 hg debugindex .hg/store/data/bar.i