##// END OF EJS Templates
inotify: workaround test-inotify-dirty-dirstate failures...
Benoit Boissinot -
r9859:951ec6c7 default
parent child Browse files
Show More
@@ -1,67 +1,71 b''
1 #!/bin/sh
1 #!/bin/sh
2
2
3 # issues when status queries are issued when dirstate is dirty
3 # issues when status queries are issued when dirstate is dirty
4
4
5 "$TESTDIR/hghave" inotify || exit 80
5 "$TESTDIR/hghave" inotify || exit 80
6
6
7 echo "[extensions]" >> $HGRCPATH
7 echo "[extensions]" >> $HGRCPATH
8 echo "inotify=" >> $HGRCPATH
8 echo "inotify=" >> $HGRCPATH
9 echo "fetch=" >> $HGRCPATH
9 echo "fetch=" >> $HGRCPATH
10
10
11 echo % issue1810: inotify and fetch
11 echo % issue1810: inotify and fetch
12 mkdir test; cd test
12 mkdir test; cd test
13 hg init
13 hg init
14 hg inserve -d --pid-file=../hg.pid
15 cat ../hg.pid >> "$DAEMON_PIDS"
14
16
15 echo foo > foo
17 echo foo > foo
16 hg add
18 hg add
17 hg ci -m foo
19 hg ci -m foo
18
20
19 cd ..
21 cd ..
20
22
21 hg clone test test2
23 hg --config "extensions.inotify=!" clone test test2
22 cd test2
24 cd test2
25 hg inserve -d --pid-file=../hg2.pid
26 cat ../hg2.pid >> "$DAEMON_PIDS"
23 echo bar > bar
27 echo bar > bar
24 hg add
28 hg add
25 hg ci -m bar
29 hg ci -m bar
26 cd ../test
30 cd ../test
27 echo spam > spam
31 echo spam > spam
28 hg add
32 hg add
29 hg ci -m spam
33 hg ci -m spam
30 cd ../test2
34 cd ../test2
31 hg st
35 hg st
32
36
33 # abort, outstanding changes
37 # abort, outstanding changes
34 hg fetch -q
38 hg fetch -q
35 hg st
39 hg st
36 cd ..
40 cd ..
37
41
38
42
39 echo % issue1719: inotify and mq
43 echo % issue1719: inotify and mq
40
44
41 echo "mq=" >> $HGRCPATH
45 echo "mq=" >> $HGRCPATH
42
46
43 hg init test-1719
47 hg init test-1719
44 cd test-1719
48 cd test-1719
45
49
46 echo % inserve
50 echo % inserve
47 hg inserve -d --pid-file=hg.pid
51 hg inserve -d --pid-file=../hg-test-1719.pid
48 cat hg.pid >> "$DAEMON_PIDS"
52 cat ../hg-test-1719.pid >> "$DAEMON_PIDS"
49
53
50 echo content > file
54 echo content > file
51 hg add file
55 hg add file
52
56
53 hg qnew -f test.patch
57 hg qnew -f test.patch
54
58
55 hg status
59 hg status
56 hg qpop
60 hg qpop
57
61
58 echo % st should not output anything
62 echo % st should not output anything
59 hg status
63 hg status
60
64
61 hg qpush
65 hg qpush
62
66
63 echo % st should not output anything
67 echo % st should not output anything
64 hg status
68 hg status
65
69
66 hg qrefresh
70 hg qrefresh
67 hg status
71 hg status
@@ -1,18 +1,14 b''
1 % issue1810: inotify and fetch
1 % issue1810: inotify and fetch
2 adding foo
2 adding foo
3 updating working directory
3 updating to branch default
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 adding bar
5 adding bar
6 adding spam
6 adding spam
7 % issue1719: inotify and mq
7 % issue1719: inotify and mq
8 % inserve
8 % inserve
9 ? hg.pid
10 popping test.patch
9 popping test.patch
11 patch queue now empty
10 patch queue now empty
12 % st should not output anything
11 % st should not output anything
13 ? hg.pid
14 applying test.patch
12 applying test.patch
15 now at: test.patch
13 now at: test.patch
16 % st should not output anything
14 % st should not output anything
17 ? hg.pid
18 ? hg.pid
General Comments 0
You need to be logged in to leave comments. Login now