##// 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.
Mads Kiilerich - - Load All Authors

File last commit:

r8901:94319ae5 default
r9115:b55d4471 default
Show More
test-merge-tools
186 lines | 4.6 KiB | text/plain | TextLexer
/ tests / test-merge-tools
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# test merge-tools configuration - mostly exercising filemerge.py
unset HGMERGE # make sure HGMERGE doesn't interfere with the test
hg init
echo "# revision 0"
echo "revision 0" > f
echo "space" >> f
hg commit -Am "revision 0" -d "1000000 0"
echo "# revision 1"
echo "revision 1" > f
echo "space" >> f
hg commit -Am "revision 1" -d "1000000 0"
hg update 0 > /dev/null
echo "# revision 2"
echo "revision 2" > f
echo "space" >> f
hg commit -Am "revision 2" -d "1000000 0"
hg update 0 > /dev/null
echo "# revision 3 - simple to merge"
echo "revision 3" >> f
hg commit -Am "revision 3" -d "1000000 0"
echo "[merge-tools]" > .hg/hgrc
echo
beforemerge() {
cat .hg/hgrc
echo "# hg update -C 1"
hg update -C 1 > /dev/null
}
aftermerge() {
echo "# cat f"
cat f
echo "# hg stat"
hg stat
rm -f f.orig
echo
}
domerge() {
beforemerge
echo "# hg merge $*"
hg merge $*
aftermerge
}
echo
echo Tool selection
echo
echo "# default is internal merge:"
beforemerge
echo "# hg merge -r 2"
# override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
# running from a devel copy, not a temp installation
PATH=$BINDIR $PYTHON $BINDIR/hg merge -r 2
aftermerge
echo "# simplest hgrc using false for merge:"
echo "false.whatever=" >> .hg/hgrc
domerge -r 2
echo "# true with higher .priority gets precedence:"
echo "true.priority=1" >> .hg/hgrc
domerge -r 2
echo "# unless lowered on command line:"
domerge -r 2 --config merge-tools.true.priority=-7
echo "# or false set higher on command line:"
domerge -r 2 --config merge-tools.false.priority=117
echo "# or true.executable not found in PATH:"
domerge -r 2 --config merge-tools.true.executable=nonexistingmergetool
echo "# or true.executable with bogus path:"
domerge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool
echo "# but true.executable set to cat found in PATH works:"
echo "true.executable=cat" >> .hg/hgrc
domerge -r 2
echo "# and true.executable set to cat with path works:"
domerge -r 2 --config merge-tools.true.executable=cat
echo
echo Tool selection and merge-patterns
echo
echo "# merge-patterns specifies new tool false:"
domerge -r 2 --config merge-patterns.f=false
echo "# merge-patterns specifies executable not found in PATH and gets warning:"
domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool
echo "# merge-patterns specifies executable with bogus path and gets warning:"
domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool
echo
echo ui.merge overrules priority
echo
echo "# ui.merge specifies false:"
domerge -r 2 --config ui.merge=false
echo "# ui.merge specifies internal:fail:"
domerge -r 2 --config ui.merge=internal:fail
echo "# ui.merge specifies internal:local:"
domerge -r 2 --config ui.merge=internal:local
echo "# ui.merge specifies internal:other:"
domerge -r 2 --config ui.merge=internal:other
echo "# ui.merge specifies internal:prompt:"
domerge -r 2 --config ui.merge=internal:prompt
echo "# ui.merge specifies internal:dump:"
domerge -r 2 --config ui.merge=internal:dump
echo f.base:
cat f.base
echo f.local:
cat f.local
echo f.other:
cat f.other
rm f.base f.local f.other
echo
echo "# ui.merge specifies internal:other but is overruled by pattern for false:"
domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
echo
echo Premerge
echo
echo "# Default is silent simplemerge:"
domerge -r 3
echo "# .premerge=True is same:"
domerge -r 3 --config merge-tools.true.premerge=True
echo "# .premerge=False executes merge-tool:"
domerge -r 3 --config merge-tools.true.premerge=False
echo
echo Tool execution
echo
echo '# set tools.args explicit to include $base $local $other $output:' # default '$local $base $other'
beforemerge
hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \
| sed 's,==> .* <==,==> ... <==,g'
aftermerge
echo '# Merge with "echo mergeresult > $local":'
beforemerge
hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local'
aftermerge
echo '# - and $local is the file f:'
beforemerge
hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f'
aftermerge
echo '# Merge with "echo mergeresult > $output" - the variable is a bit magic:'
beforemerge
hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output'
aftermerge
echo
echo Merge post-processing
echo
echo "# cat is a bad merge-tool and doesn't change:"
domerge -y -r 2 --config merge-tools.true.checkchanged=1