##// 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:

r8940:01ada7b1 default
r9115:b55d4471 default
Show More
test-merge-prompt.out
69 lines | 2.0 KiB | text/plain | TextLexer
/ tests / test-merge-prompt.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672 adding file1
adding file2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672
# non-interactive merge
Mads Kiilerich
ui.prompt: Show prompt and selection in non-interactive mode...
 r8940 local changed file1 which remote deleted
use (c)hanged version or (d)elete? c
remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? c
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
status:
M file2
Matt Mackall
Backed out changeset c2a21fe60994...
 r5764 C file1
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672 file1:
1
changed
file2:
2
changed
# interactive merge
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
status:
file2: No such file or directory
Matt Mackall
Backed out changeset c2a21fe60994...
 r5764 C file1
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672 file1:
1
changed
file2 does not exist
# interactive merge with bad input
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
local changed file1 which remote deleted
use (c)hanged version or (d)elete? unrecognized response
local changed file1 which remote deleted
use (c)hanged version or (d)elete? unrecognized response
local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? unrecognized response
remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
status:
M file2
R file1
file1 does not exist
file2:
2
changed
# interactive merge with not enough input
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? abort: response expected
failed
status:
file2: No such file or directory
Matt Mackall
Backed out changeset c2a21fe60994...
 r5764 C file1
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672 file1:
1
changed
file2 does not exist