annotate tests/test-inotify-issue1556.t @ 18944:a9c443b3b240

unionrepo: read-only operations on a union of two localrepos unionrepo is just like bundlerepo without bundles. The implementation is very similar to bundlerepo, but I don't see any obvious way to generalize it. Some most obvious use cases for this would be log and diff across local repos, as a kind of preview of pulls, for instance: $ hg -R union:repo1+repo2 heads $ hg -R union:repo1+repo2 log -r REPO1REV -r REPO2REV $ hg -R union:repo1+repo2 log -r '::REPO1REV-::REPO2REV' $ hg -R union:repo1+repo2 log -r 'ancestor(REPO1REV,REPO2REV)' $ hg -R union:repo1+repo2 diff -r REPO1REV -r REPO2REV This is going to be used in RhodeCode, and Bitbucket already uses something similar. Having a core implementation would be beneficial.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 18 Jan 2013 15:54:09 +0100
parents 895d65364570
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
1
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
2 $ "$TESTDIR/hghave" inotify || exit 80
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
3 $ hg init
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
4 $ touch a b
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
5 $ hg add a b
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
6 $ rm b
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
7
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
8 status without inotify
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
9
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
10 $ hg st
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
11 A a
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
12 ! b
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
13 $ echo "[extensions]" >> $HGRCPATH
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
14 $ echo "inotify=" >> $HGRCPATH
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
15
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
16 inserve
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
17
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
18 $ hg inserve -d --pid-file=hg.pid 2>&1
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
19 $ cat hg.pid >> "$DAEMON_PIDS"
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
20
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
21 status
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
22
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
23 $ hg st
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
24 A a
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
25 ! b
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
26 ? hg.pid
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
27 $ sleep 1
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
28
12456
1f74b0d0f485 tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com>
parents: 8601
diff changeset
29 Are we able to kill the service? if not, the service died on some error
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
30
18593
895d65364570 test-inotify-issue1556.t: migrate to killdaemons from kill `cat pidfile`
Augie Fackler <raf@durin42.com>
parents: 12456
diff changeset
31 $ "$TESTDIR/killdaemons.py" hg.pid