sapling/tests/test-treedirstate.t
Phil Cohen 3e592b81ae filemerge: add number of textual conflicts in each file to error message
Summary:
When you get an error, let's print the number of conflicts in each file. This will give the user some sense of how much work they have to do.

The code change is entirely in `filemerge.py`, and `tests/test-merge-conflict-count.t` adds a new test.

Reviewed By: quark-zju

Differential Revision: D9815243

fbshipit-source-id: 1b73a1db293902ac7242997a7d6ae09478344068
2018-10-22 12:47:41 -07:00

215 lines
5.7 KiB
Perl

Setup
$ setconfig format.dirstate=1
$ setconfig treestate.mingcage=0
$ hg init repo
$ cd repo
$ echo base > base
$ hg add base
$ hg debugdirstate
a 0 -1 unset base
$ hg commit -m "base"
$ hg debugdirstate
n 644 5 * base (glob)
Create path-conflicting dirstates
$ hg up -q 0
$ echo a > a
$ hg add a
$ hg commit -m a
$ hg bookmark a
$ hg up -q 0
$ mkdir a
$ echo a/a > a/a
$ hg add a/a
$ hg commit -m a/a
$ hg bookmark a/a
$ hg up -q a
$ hg status
$ hg rm a
$ hg status
R a
$ hg merge --force a/a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg status
M a/a
R a
$ hg rm --force a/a
$ hg status
R a
R a/a
$ hg up -Cq 0
Attempt to create a path conflict in the manifest
$ echo b > b
$ hg add b
$ hg commit -m b
$ rm b
$ mkdir b
$ echo b/b > b/b
$ hg add b/b
abort: file 'b' in dirstate clashes with 'b/b'
[255]
$ rm -rf b
$ hg up -Cq 0
Test warning when creating files that might give a casefold collision
#if no-icasefs
$ echo data > FiLeNaMe
$ hg add FiLeNaMe
$ echo data > FILENAME
$ hg add FILENAME
warning: possible case-folding collision for FILENAME
$ rm -f FiLeNaMe FILENAME
$ hg up -Cq 0
#endif
Test dirfoldmap and filefoldmap on case insensitive filesystems
#if icasefs
$ mkdir -p dirA/dirB/dirC
$ echo file1 > dira/File1
$ echo file2 > dira/dirb/FILE2
$ echo file3 > dira/dirb/dirc/FiLe3
$ echo file4 > dira/dirb/dirc/file4
$ hg add DIRA
adding dirA/File1
adding dirA/dirB/FILE2
adding dirA/dirB/dirC/FiLe3
adding dirA/dirB/dirC/file4
$ hg status
A dirA/File1
A dirA/dirB/FILE2
A dirA/dirB/dirC/FiLe3
A dirA/dirB/dirC/file4
$ hg forget dira/DIRB
removing dirA/dirB/FILE2
removing dirA/dirB/dirC/FiLe3
removing dirA/dirB/dirC/file4
$ hg status
A dirA/File1
? dirA/dirB/FILE2
? dirA/dirB/dirC/FiLe3
? dirA/dirB/dirC/file4
$ hg add dira/dirb/file2
$ hg status
A dirA/File1
A dirA/dirB/FILE2
? dirA/dirB/dirC/FiLe3
? dirA/dirB/dirC/file4
$ rm -rf dirA
#endif
Test autorepack
$ ls .hg/dirstate.tree.*
.hg/dirstate.tree.* (glob)
$ echo data > file
After the first repack, the old trees are kept around by the transaction undo backups.
$ hg add file --config treestate.minrepackthreshold=1 --config treestate.repackfactor=0 --debug | grep -v 'in use by'
adding file
auto-repacking treedirstate
$ ls .hg/dirstate.tree.*
.hg/dirstate.tree.* (glob)
.hg/dirstate.tree.* (glob)
After the second repack, the old trees are still kept around.
$ hg forget file --config treestate.minrepackthreshold=1 --config treestate.repackfactor=0 --debug | grep -v 'in use by'
fsmonitor: fallback to core status, full rewalk requested (fsmonitor !)
removing file
auto-repacking treedirstate
$ ls .hg/dirstate.tree.*
.hg/dirstate.tree.* (glob)
.hg/dirstate.tree.* (glob)
.hg/dirstate.tree.* (glob)
On the third repack, the original tree is removed.
$ hg add file --config treestate.minrepackthreshold=1 --config treestate.repackfactor=0 --debug | grep -v 'in use by'
adding file
auto-repacking treedirstate
removing old unreferenced dirstate tree * (glob)
$ ls .hg/dirstate.tree.*
.hg/dirstate.tree.* (glob)
.hg/dirstate.tree.* (glob)
.hg/dirstate.tree.* (glob)
On the fourth repack, the second tree is removed.
$ hg forget file --config treestate.minrepackthreshold=1 --config treestate.repackfactor=0 --debug | grep -v 'in use by'
fsmonitor: fallback to core status, full rewalk requested (fsmonitor !)
removing file
auto-repacking treedirstate
removing old unreferenced dirstate tree * (glob)
$ ls .hg/dirstate.tree.*
.hg/dirstate.tree.* (glob)
.hg/dirstate.tree.* (glob)
.hg/dirstate.tree.* (glob)
Test downgrade on pull
$ for f in 1 2 3 4 5 ; do mkdir dir$f ; echo $f > dir$f/file$f ; hg add dir$f/file$f ; done
$ echo x > a
$ hg add a
$ hg commit -m "add files"
$ cd ..
$ hg clone repo clone
updating to branch default
7 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd clone
$ hg merge 1
merging a
warning: 1 conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
$ echo data > newfile
$ hg add newfile
$ hg rm dir3/file3
$ grep treedirstate .hg/requires
treedirstate
$ hg pull --config treestate.migrateonpull=true --config format.dirstate=0
downgrading dirstate format...
pulling from $TESTTMP/repo (glob)
searching for changes
no changes found
$ hg debugdirstate
m 0 -2 * a (glob)
n 644 5 * base (glob)
n 644 2 * dir1/file1 (glob)
n 644 2 * dir2/file2 (glob)
r 0 0 * dir3/file3 (glob)
n 644 2 * dir4/file4 (glob)
n 644 2 * dir5/file5 (glob)
a 0 -1 * newfile (glob)
$ grep treedirstate .hg/requires
[1]
Test upgrade on pull
$ hg pull --config treestate.migrateonpull=true --config format.dirstate=1
please wait while we migrate dirstate format to version 1
this will make your hg commands faster...
pulling from $TESTTMP/repo (glob)
searching for changes
no changes found
$ hg debugdirstate
m 0 -2 * a (glob)
n 644 5 * base (glob)
n 644 2 * dir1/file1 (glob)
n 644 2 * dir2/file2 (glob)
r 0 0 * dir3/file3 (glob)
n 644 2 * dir4/file4 (glob)
n 644 2 * dir5/file5 (glob)
a 0 -1 * newfile (glob)
$ grep treedirstate .hg/requires
treedirstate
$ hg pull --config treedirstate.upgradeonpull=true
pulling from $TESTTMP/repo (glob)
searching for changes
no changes found