##// END OF EJS Templates
shelve: add a shelve extension to save/restore working changes...
shelve: add a shelve extension to save/restore working changes This extension saves shelved changes using a temporary draft commit, and bundles the temporary commit and its draft ancestors, then strips them. This strategy makes it possible to use Mercurial's bundle and merge machinery to resolve conflicts if necessary when unshelving, even when the destination commit or its ancestors have been amended, squashed, or evolved. (Once a change has been unshelved, its associated unbundled commits are either rolled back or stripped.) Storing the shelved change as a bundle also avoids the difficulty that hidden commits would cause, of making it impossible to amend the parent if it is a draft commits (a common scenario). Although this extension shares its name and some functionality with the third party hgshelve extension, it has little else in common. Notably, the hgshelve extension shelves changes as unified diffs, which makes conflict resolution a matter of finding .rej files and conflict markers, and cleaning up the mess by hand. We do not yet allow hunk-level choosing of changes to record. Compared to the hgshelve extension, this is a small regression in usability, but we hope to integrate that at a later point, once the record machinery becomes more reusable and robust.

File last commit:

r18595:37479af4 default
r19854:49d4919d default
Show More
test-inotify.t
182 lines | 3.3 KiB | text/troff | Tads3Lexer
$ "$TESTDIR/hghave" inotify || exit 80
$ hg init repo1
$ cd repo1
$ touch a b c d e
$ mkdir dir
$ mkdir dir/bar
$ touch dir/x dir/y dir/bar/foo
$ hg ci -Am m
adding a
adding b
adding c
adding d
adding dir/bar/foo
adding dir/x
adding dir/y
adding e
$ cd ..
$ hg clone repo1 repo2
updating to branch default
8 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "[extensions]" >> $HGRCPATH
$ echo "inotify=" >> $HGRCPATH
$ cd repo2
$ echo b >> a
check that daemon started automatically works correctly
and make sure that inotify.pidfile works
$ hg --config "inotify.pidfile=../hg2.pid" status
M a
make sure that pidfile worked. Output should be silent.
$ "$TESTDIR/killdaemons.py" ../hg2.pid
$ cd ../repo1
inserve
$ hg inserve -d --pid-file=hg.pid
$ cat hg.pid >> "$DAEMON_PIDS"
let the daemon finish its stuff
$ sleep 1
cannot start, already bound
$ hg inserve
abort: inotify-server: cannot start: socket is already bound
[255]
issue907
$ hg status
? hg.pid
clean
$ hg status -c
C a
C b
C c
C d
C dir/bar/foo
C dir/x
C dir/y
C e
all
$ hg status -A
? hg.pid
C a
C b
C c
C d
C dir/bar/foo
C dir/x
C dir/y
C e
path patterns
$ echo x > dir/x
$ hg status .
M dir/x
? hg.pid
$ hg status dir
M dir/x
$ cd dir
$ hg status .
M x
$ cd ..
issue 1375
testing that we can remove a folder and then add a file with the same name
issue 1375
$ mkdir h
$ echo h > h/h
$ hg ci -Am t
adding h/h
adding hg.pid
$ hg rm h
removing h/h
$ echo h >h
$ hg add h
$ hg status
A h
R h/h
$ hg ci -m0
Test for issue1735: inotify watches files in .hg/merge
$ hg st
$ echo a > a
$ hg ci -Am a
$ hg st
$ echo b >> a
$ hg ci -m ab
$ hg st
$ echo c >> a
$ hg st
M a
$ HGMERGE=internal:local hg up 0
1 files updated, 1 files merged, 2 files removed, 0 files unresolved
$ hg st
M a
$ HGMERGE=internal:local hg up
3 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg st
M a
Test for 1844: "hg ci folder" will not commit all changes beneath "folder"
$ mkdir 1844
$ echo a > 1844/foo
$ hg add 1844
adding 1844/foo
$ hg ci -m 'working'
$ echo b >> 1844/foo
$ hg ci 1844 -m 'broken'
Test for issue884: "Build products not ignored until .hgignore is touched"
$ echo '^build$' > .hgignore
$ hg add .hgignore
$ hg ci .hgignore -m 'ignorelist'
Now, lets add some build products...
$ mkdir build
$ touch build/x
$ touch build/y
build/x & build/y shouldn't appear in "hg st"
$ hg st
$ "$TESTDIR/killdaemons.py" hg.pid
$ cd ..
Ensure that if the repo is in a directory whose name is too long, the
unix domain socket is reached through a symlink (issue1208).
$ mkdir 0_3456789_10_456789_20_456789_30_456789_40_456789_50_45678_
$ cd 0_3456789_10_456789_20_456789_30_456789_40_456789_50_45678_
$ mkdir 60_456789_70_456789_80_456789_90_456789_100_56789_
$ cd 60_456789_70_456789_80_456789_90_456789_100_56789_
$ hg --config inotify.pidfile=hg3.pid clone -q ../../repo1
$ readlink repo1/.hg/inotify.sock
*/inotify.sock (glob)
Trying to start the server a second time should fail as usual.
$ hg --cwd repo1 inserve
abort: inotify-server: cannot start: socket is already bound
[255]
$ "$TESTDIR/killdaemons.py" hg3.pid