annotate tests/test-inotify-dirty-dirstate.t @ 12664:545ec1775021

merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents f727db60abb4
children ffb5c09ba822
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
1 issues when status queries are issued when dirstate is dirty
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
2
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
3 $ "$TESTDIR/hghave" inotify || exit 80
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
4 $ echo "[extensions]" >> $HGRCPATH
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
5 $ echo "inotify=" >> $HGRCPATH
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
6 $ echo "fetch=" >> $HGRCPATH
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
7
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
8 issue1810: inotify and fetch
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
9
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
10 $ mkdir test; cd test
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
11 $ hg init
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
12 $ hg inserve -d --pid-file=../hg.pid
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
13 $ cat ../hg.pid >> "$DAEMON_PIDS"
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
14 $ echo foo > foo
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
15 $ hg add
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
16 adding foo
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
17 $ hg ci -m foo
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
18 $ cd ..
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
19 $ hg --config "inotify.pidfile=../hg2.pid" clone test test2
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
20 updating to branch default
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
22 $ cat ../hg2.pid >> "$DAEMON_PIDS"
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
23 $ cd test2
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
24 $ echo bar > bar
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
25 $ hg add
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
26 adding bar
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
27 $ hg ci -m bar
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
28 $ cd ../test
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
29 $ echo spam > spam
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
30 $ hg add
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
31 adding spam
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
32 $ hg ci -m spam
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
33 $ cd ../test2
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
34 $ hg st
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
35
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
36 abort, outstanding changes
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
37
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
38 $ hg fetch -q
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
39 $ hg st
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
40 $ cd ..
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
41
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
42 issue1719: inotify and mq
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
43
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
44 $ echo "mq=" >> $HGRCPATH
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
45 $ hg init test-1719
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
46 $ cd test-1719
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
47
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
48 inserve
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
49
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
50 $ hg inserve -d --pid-file=../hg-test-1719.pid
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
51 $ cat ../hg-test-1719.pid >> "$DAEMON_PIDS"
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
52 $ echo content > file
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
53 $ hg add file
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
54 $ hg qnew -f test.patch
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
55 $ hg status
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
56 $ hg qpop
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
57 popping test.patch
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
58 patch queue now empty
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
59
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
60 st should not output anything
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
61
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
62 $ hg status
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
63 $ hg qpush
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
64 applying test.patch
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
65 now at: test.patch
9855
f47c0881b16e inotify: Do not access inotify when dirstate is dirty (issue1811)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
66
12452
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
67 st should not output anything
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
68
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
69 $ hg status
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
70 $ hg qrefresh
f727db60abb4 tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com>
parents: 9897
diff changeset
71 $ hg status