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