shelve: status messages from unshelve It was hard for the user to know what was going on when unshelving - especially if the user had to resolve conflicts and thus got to see the intermediate states. Seeing that pending changes was gone could scare the user, make him panic, and do stuff that really made him lose data. Merging (both when rebasing and with pending changes) also requires some understanding of where in the process you are and what you are merging. To help the user we now show a couple of status messages (when relevant): temporarily committing pending changes (restore with 'hg unshelve --abort') rebasing shelved changes

     1

     2

  $ "$TESTDIR/hghave" inotify || exit 80

     3

  $ hg init

     4

  $ touch a b c d e f

     5

  $ echo "[extensions]" >> $HGRCPATH

     6

  $ echo "inotify=" >> $HGRCPATH

     7

     8

inserve

     9

    10

  $ hg inserve -d --pid-file=hg.pid 2>&1

    11

  $ cat hg.pid >> "$DAEMON_PIDS"

    12

  $ hg ci -Am m

    13

  adding a

    14

  adding b

    15

  adding c

    16

  adding d

    17

  adding e

    18

  adding f

    19

  adding hg.pid

    20

    21

let the daemon finish its stuff

    22

    23

  $ sleep 1

    24

    25

eed to test all file operations

    26

    27

  $ hg rm a

    28

  $ rm b

    29

  $ echo c >> c

    30

  $ touch g

    31

  $ hg add g

    32

  $ hg mv e h

    33

  $ hg status

    34

  M c

    35

  A g

    36

  A h

    37

  R a

    38

  R e

    39

  ! b

    40

  $ sleep 1

    41

    42

Are we able to kill the service? if not, the service died on some error

    43

    44

  $ "$TESTDIR/killdaemons.py" hg.pid