tests/test-inotify-issue1371.t
author Siddharth Agarwal <sid0@fb.com>
Sat, 09 Feb 2013 15:36:00 +0000
changeset 18606 95773237df7f
parent 18591 f58175f409b0
permissions -rw-r--r--
manifestmerge: handle abort on local unknown, remote created files This replaces the _checkunknown call in calculateupdates with a more performant version. On a repository with over 150,000 files, this speeds up an update by 0.6-0.8 seconds, which is up to 25%. This does not introduce any UI changes. There is existing test coverage for every case, mostly in test-merge*.t.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
     1
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
     2
  $ "$TESTDIR/hghave" inotify || exit 80
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 12454
diff changeset
     3
  $ hg init
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
     4
  $ touch a b c d e f
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
     5
  $ echo "[extensions]" >> $HGRCPATH
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
     6
  $ echo "inotify=" >> $HGRCPATH
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
     7
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
     8
inserve
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
     9
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    10
  $ hg inserve -d --pid-file=hg.pid 2>&1
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    11
  $ cat hg.pid >> "$DAEMON_PIDS"
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    12
  $ hg ci -Am m
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    13
  adding a
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    14
  adding b
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    15
  adding c
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    16
  adding d
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    17
  adding e
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    18
  adding f
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    19
  adding hg.pid
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
    20
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    21
let the daemon finish its stuff
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
    22
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    23
  $ sleep 1
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
    24
17503
adeb9dad3df6 spelling: operations
timeless@mozdev.org
parents: 17345
diff changeset
    25
eed to test all file operations
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
    26
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    27
  $ hg rm a
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    28
  $ rm b
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    29
  $ echo c >> c
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    30
  $ touch g
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    31
  $ hg add g
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    32
  $ hg mv e h
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    33
  $ hg status
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    34
  M c
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    35
  A g
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    36
  A h
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    37
  R a
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    38
  R e
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    39
  ! b
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    40
  $ sleep 1
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
    41
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
    42
Are we able to kill the service? if not, the service died on some error
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
    43
18591
f58175f409b0 test-inotify-issue1371.t: switch to killdaemons from kill `cat pidfile`
Augie Fackler <raf@durin42.com>
parents: 17503
diff changeset
    44
  $ "$TESTDIR/killdaemons.py" hg.pid