|
|
$ echo "[ui]" >> $HGRCPATH
|
|
|
$ echo "commitsubrepos = Yes" >> $HGRCPATH
|
|
|
$ echo "[extensions]" >> $HGRCPATH
|
|
|
$ echo "mq=" >> $HGRCPATH
|
|
|
$ echo "record=" >> $HGRCPATH
|
|
|
$ echo "[diff]" >> $HGRCPATH
|
|
|
$ echo "nodates=1" >> $HGRCPATH
|
|
|
|
|
|
$ stdin=`pwd`/stdin.tmp
|
|
|
|
|
|
fn to create new repository w/dirty subrepo, and cd into it
|
|
|
$ mkrepo() {
|
|
|
> hg init $1
|
|
|
> cd $1
|
|
|
> hg qinit
|
|
|
> }
|
|
|
|
|
|
fn to create dirty subrepo
|
|
|
$ mksubrepo() {
|
|
|
> hg init $1
|
|
|
> cd $1
|
|
|
> echo a > a
|
|
|
> hg add
|
|
|
> cd ..
|
|
|
> }
|
|
|
|
|
|
$ testadd() {
|
|
|
> cat - > "$stdin"
|
|
|
> mksubrepo sub
|
|
|
> echo sub = sub >> .hgsub
|
|
|
> hg add .hgsub
|
|
|
> echo % abort when adding .hgsub w/dirty subrepo
|
|
|
> hg status -S
|
|
|
> echo '%' $*
|
|
|
> cat "$stdin" | hg $*
|
|
|
> echo [$?]
|
|
|
> hg -R sub ci -m0sub
|
|
|
> echo % update substate when adding .hgsub w/clean updated subrepo
|
|
|
> hg status -S
|
|
|
> echo '%' $*
|
|
|
> cat "$stdin" | hg $*
|
|
|
> hg debugsub
|
|
|
> }
|
|
|
|
|
|
$ testmod() {
|
|
|
> cat - > "$stdin"
|
|
|
> mksubrepo sub2
|
|
|
> echo sub2 = sub2 >> .hgsub
|
|
|
> echo % abort when modifying .hgsub w/dirty subrepo
|
|
|
> hg status -S
|
|
|
> echo '%' $*
|
|
|
> cat "$stdin" | hg $*
|
|
|
> echo [$?]
|
|
|
> hg -R sub2 ci -m0sub2
|
|
|
> echo % update substate when modifying .hgsub w/clean updated subrepo
|
|
|
> hg status -S
|
|
|
> echo '%' $*
|
|
|
> cat "$stdin" | hg $*
|
|
|
> hg debugsub
|
|
|
> }
|
|
|
|
|
|
$ testrm1() {
|
|
|
> cat - > "$stdin"
|
|
|
> mksubrepo sub3
|
|
|
> echo sub3 = sub3 >> .hgsub
|
|
|
> hg ci -Aqmsub3
|
|
|
> $EXTRA
|
|
|
> echo b >> sub3/a
|
|
|
> hg rm .hgsub
|
|
|
> echo % update substate when removing .hgsub w/dirty subrepo
|
|
|
> hg status -S
|
|
|
> echo '%' $*
|
|
|
> cat "$stdin" | hg $*
|
|
|
> echo % debugsub should be empty
|
|
|
> hg debugsub
|
|
|
> }
|
|
|
|
|
|
$ testrm2() {
|
|
|
> cat - > "$stdin"
|
|
|
> mksubrepo sub4
|
|
|
> echo sub4 = sub4 >> .hgsub
|
|
|
> hg ci -Aqmsub4
|
|
|
> $EXTRA
|
|
|
> hg rm .hgsub
|
|
|
> echo % update substate when removing .hgsub w/clean updated subrepo
|
|
|
> hg status -S
|
|
|
> echo '%' $*
|
|
|
> cat "$stdin" | hg $*
|
|
|
> echo % debugsub should be empty
|
|
|
> hg debugsub
|
|
|
> }
|
|
|
|
|
|
|
|
|
handle subrepos safely on qnew
|
|
|
|
|
|
$ mkrepo repo-2499-qnew
|
|
|
$ testadd qnew -m0 0.diff
|
|
|
adding a
|
|
|
% abort when adding .hgsub w/dirty subrepo
|
|
|
A .hgsub
|
|
|
A sub/a
|
|
|
% qnew -m0 0.diff
|
|
|
abort: uncommitted changes in subrepository sub
|
|
|
[255]
|
|
|
% update substate when adding .hgsub w/clean updated subrepo
|
|
|
A .hgsub
|
|
|
% qnew -m0 0.diff
|
|
|
path sub
|
|
|
source sub
|
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
|
|
|
$ testmod qnew -m1 1.diff
|
|
|
adding a
|
|
|
% abort when modifying .hgsub w/dirty subrepo
|
|
|
M .hgsub
|
|
|
A sub2/a
|
|
|
% qnew -m1 1.diff
|
|
|
abort: uncommitted changes in subrepository sub2
|
|
|
[255]
|
|
|
% update substate when modifying .hgsub w/clean updated subrepo
|
|
|
M .hgsub
|
|
|
% qnew -m1 1.diff
|
|
|
path sub
|
|
|
source sub
|
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
path sub2
|
|
|
source sub2
|
|
|
revision 1f94c7611cc6b74f5a17b16121a1170d44776845
|
|
|
|
|
|
$ hg qpop -qa
|
|
|
patch queue now empty
|
|
|
$ testrm1 qnew -m2 2.diff
|
|
|
adding a
|
|
|
% update substate when removing .hgsub w/dirty subrepo
|
|
|
M sub3/a
|
|
|
R .hgsub
|
|
|
% qnew -m2 2.diff
|
|
|
% debugsub should be empty
|
|
|
|
|
|
$ hg qpop -qa
|
|
|
patch queue now empty
|
|
|
$ testrm2 qnew -m3 3.diff
|
|
|
adding a
|
|
|
% update substate when removing .hgsub w/clean updated subrepo
|
|
|
R .hgsub
|
|
|
% qnew -m3 3.diff
|
|
|
% debugsub should be empty
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
handle subrepos safely on qrefresh
|
|
|
|
|
|
$ mkrepo repo-2499-qrefresh
|
|
|
$ hg qnew -m0 0.diff
|
|
|
$ testadd qrefresh
|
|
|
adding a
|
|
|
% abort when adding .hgsub w/dirty subrepo
|
|
|
A .hgsub
|
|
|
A sub/a
|
|
|
% qrefresh
|
|
|
abort: uncommitted changes in subrepository sub
|
|
|
[255]
|
|
|
% update substate when adding .hgsub w/clean updated subrepo
|
|
|
A .hgsub
|
|
|
% qrefresh
|
|
|
path sub
|
|
|
source sub
|
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
|
|
|
$ hg qnew -m1 1.diff
|
|
|
$ testmod qrefresh
|
|
|
adding a
|
|
|
% abort when modifying .hgsub w/dirty subrepo
|
|
|
M .hgsub
|
|
|
A sub2/a
|
|
|
% qrefresh
|
|
|
abort: uncommitted changes in subrepository sub2
|
|
|
[255]
|
|
|
% update substate when modifying .hgsub w/clean updated subrepo
|
|
|
M .hgsub
|
|
|
% qrefresh
|
|
|
path sub
|
|
|
source sub
|
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
path sub2
|
|
|
source sub2
|
|
|
revision 1f94c7611cc6b74f5a17b16121a1170d44776845
|
|
|
|
|
|
$ hg qpop -qa
|
|
|
patch queue now empty
|
|
|
$ EXTRA='hg qnew -m2 2.diff'
|
|
|
$ testrm1 qrefresh
|
|
|
adding a
|
|
|
% update substate when removing .hgsub w/dirty subrepo
|
|
|
M sub3/a
|
|
|
R .hgsub
|
|
|
% qrefresh
|
|
|
% debugsub should be empty
|
|
|
|
|
|
$ hg qpop -qa
|
|
|
patch queue now empty
|
|
|
$ EXTRA='hg qnew -m3 3.diff'
|
|
|
$ testrm2 qrefresh
|
|
|
adding a
|
|
|
% update substate when removing .hgsub w/clean updated subrepo
|
|
|
R .hgsub
|
|
|
% qrefresh
|
|
|
% debugsub should be empty
|
|
|
$ EXTRA=
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
handle subrepos safely on qpush/qpop
|
|
|
|
|
|
$ mkrepo repo-2499-qpush
|
|
|
$ mksubrepo sub
|
|
|
adding a
|
|
|
$ hg -R sub ci -m0sub
|
|
|
$ echo sub = sub > .hgsub
|
|
|
$ hg add .hgsub
|
|
|
$ hg qnew -m0 0.diff
|
|
|
$ hg debugsub
|
|
|
path sub
|
|
|
source sub
|
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
|
|
|
qpop
|
|
|
$ hg qpop
|
|
|
popping 0.diff
|
|
|
patch queue now empty
|
|
|
$ hg status -AS
|
|
|
$ hg debugsub
|
|
|
|
|
|
qpush
|
|
|
$ hg qpush
|
|
|
applying 0.diff
|
|
|
now at: 0.diff
|
|
|
$ hg status -AS
|
|
|
C .hgsub
|
|
|
C .hgsubstate
|
|
|
C sub/a
|
|
|
$ hg debugsub
|
|
|
path sub
|
|
|
source sub
|
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
handle subrepos safely on qrecord
|
|
|
|
|
|
$ mkrepo repo-2499-qrecord
|
|
|
$ testadd qrecord --config ui.interactive=1 -m0 0.diff <<EOF
|
|
|
> y
|
|
|
> y
|
|
|
> EOF
|
|
|
adding a
|
|
|
% abort when adding .hgsub w/dirty subrepo
|
|
|
A .hgsub
|
|
|
A sub/a
|
|
|
% qrecord --config ui.interactive=1 -m0 0.diff
|
|
|
diff --git a/.hgsub b/.hgsub
|
|
|
new file mode 100644
|
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
|
abort: uncommitted changes in subrepository sub
|
|
|
[255]
|
|
|
% update substate when adding .hgsub w/clean updated subrepo
|
|
|
A .hgsub
|
|
|
% qrecord --config ui.interactive=1 -m0 0.diff
|
|
|
diff --git a/.hgsub b/.hgsub
|
|
|
new file mode 100644
|
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
|
path sub
|
|
|
source sub
|
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
|
|
|
$ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF
|
|
|
> y
|
|
|
> y
|
|
|
> EOF
|
|
|
adding a
|
|
|
% abort when modifying .hgsub w/dirty subrepo
|
|
|
M .hgsub
|
|
|
A sub2/a
|
|
|
% qrecord --config ui.interactive=1 -m1 1.diff
|
|
|
diff --git a/.hgsub b/.hgsub
|
|
|
1 hunks, 1 lines changed
|
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
|
@@ -1,1 +1,2 @@
|
|
|
sub = sub
|
|
|
+sub2 = sub2
|
|
|
record this change to '.hgsub'? [Ynesfdaq?]
|
|
|
abort: uncommitted changes in subrepository sub2
|
|
|
[255]
|
|
|
% update substate when modifying .hgsub w/clean updated subrepo
|
|
|
M .hgsub
|
|
|
% qrecord --config ui.interactive=1 -m1 1.diff
|
|
|
diff --git a/.hgsub b/.hgsub
|
|
|
1 hunks, 1 lines changed
|
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
|
@@ -1,1 +1,2 @@
|
|
|
sub = sub
|
|
|
+sub2 = sub2
|
|
|
record this change to '.hgsub'? [Ynesfdaq?]
|
|
|
path sub
|
|
|
source sub
|
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
path sub2
|
|
|
source sub2
|
|
|
revision 1f94c7611cc6b74f5a17b16121a1170d44776845
|
|
|
|
|
|
$ hg qpop -qa
|
|
|
patch queue now empty
|
|
|
$ testrm1 qrecord --config ui.interactive=1 -m2 2.diff <<EOF
|
|
|
> y
|
|
|
> y
|
|
|
> EOF
|
|
|
adding a
|
|
|
% update substate when removing .hgsub w/dirty subrepo
|
|
|
M sub3/a
|
|
|
R .hgsub
|
|
|
% qrecord --config ui.interactive=1 -m2 2.diff
|
|
|
diff --git a/.hgsub b/.hgsub
|
|
|
deleted file mode 100644
|
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
|
% debugsub should be empty
|
|
|
|
|
|
$ hg qpop -qa
|
|
|
patch queue now empty
|
|
|
$ testrm2 qrecord --config ui.interactive=1 -m3 3.diff <<EOF
|
|
|
> y
|
|
|
> y
|
|
|
> EOF
|
|
|
adding a
|
|
|
% update substate when removing .hgsub w/clean updated subrepo
|
|
|
R .hgsub
|
|
|
% qrecord --config ui.interactive=1 -m3 3.diff
|
|
|
diff --git a/.hgsub b/.hgsub
|
|
|
deleted file mode 100644
|
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
|
% debugsub should be empty
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
correctly handle subrepos with patch queues
|
|
|
$ mkrepo repo-subrepo-with-queue
|
|
|
$ mksubrepo sub
|
|
|
adding a
|
|
|
$ hg -R sub qnew sub0.diff
|
|
|
$ echo sub = sub >> .hgsub
|
|
|
$ hg add .hgsub
|
|
|
$ hg qnew 0.diff
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
check whether MQ operations can import updated .hgsubstate correctly
|
|
|
both into 'revision' and 'patch file under .hg/patches':
|
|
|
|
|
|
$ hg init importing-hgsubstate
|
|
|
$ cd importing-hgsubstate
|
|
|
|
|
|
$ echo a > a
|
|
|
$ hg commit -u test -d '0 0' -Am '#0 in parent'
|
|
|
adding a
|
|
|
$ hg init sub
|
|
|
$ echo sa > sub/sa
|
|
|
$ hg -R sub commit -u test -d '0 0' -Am '#0 in sub'
|
|
|
adding sa
|
|
|
$ echo 'sub = sub' > .hgsub
|
|
|
$ touch .hgsubstate
|
|
|
$ hg add .hgsub .hgsubstate
|
|
|
|
|
|
$ hg qnew -u test -d '0 0' import-at-qnew
|
|
|
$ hg -R sub parents --template '{node} sub\n'
|
|
|
b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub
|
|
|
$ cat .hgsubstate
|
|
|
b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub
|
|
|
$ hg diff -c tip
|
|
|
diff -r f499373e340c -r b20ffac88564 .hgsub
|
|
|
--- /dev/null
|
|
|
+++ b/.hgsub
|
|
|
@@ -0,0 +1,1 @@
|
|
|
+sub = sub
|
|
|
diff -r f499373e340c -r b20ffac88564 .hgsubstate
|
|
|
--- /dev/null
|
|
|
+++ b/.hgsubstate
|
|
|
@@ -0,0 +1,1 @@
|
|
|
+b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub
|
|
|
$ cat .hg/patches/import-at-qnew
|
|
|
# HG changeset patch
|
|
|
# Parent f499373e340cdca5d01dee904aeb42dd2a325e71
|
|
|
# User test
|
|
|
# Date 0 0
|
|
|
|
|
|
diff -r f499373e340c -r b20ffac88564 .hgsub
|
|
|
--- /dev/null
|
|
|
+++ b/.hgsub
|
|
|
@@ -0,0 +1,1 @@
|
|
|
+sub = sub
|
|
|
diff -r f499373e340c -r b20ffac88564 .hgsubstate
|
|
|
--- /dev/null
|
|
|
+++ b/.hgsubstate
|
|
|
@@ -0,0 +1,1 @@
|
|
|
+b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub
|
|
|
$ hg qpop
|
|
|
popping import-at-qnew
|
|
|
patch queue now empty
|
|
|
$ hg qpush
|
|
|
applying import-at-qnew
|
|
|
now at: import-at-qnew
|
|
|
|
|
|
$ hg qnew import-at-qrefresh
|
|
|
$ echo sb > sub/sb
|
|
|
$ hg -R sub commit -u test -d '0 0' -Am '#1 in sub'
|
|
|
adding sb
|
|
|
$ hg qrefresh -u test -d '0 0'
|
|
|
$ hg -R sub parents --template '{node} sub\n'
|
|
|
88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
$ cat .hgsubstate
|
|
|
88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
$ hg diff -c tip
|
|
|
diff -r 44f846335325 -r b3e8c5fa3aaa .hgsubstate
|
|
|
--- a/.hgsubstate
|
|
|
+++ b/.hgsubstate
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub
|
|
|
+88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
$ cat .hg/patches/import-at-qrefresh
|
|
|
# HG changeset patch
|
|
|
# Date 0 0
|
|
|
# User test
|
|
|
# Parent 44f846335325209be6be35dc2c9a4be107278c09
|
|
|
|
|
|
diff -r 44f846335325 .hgsubstate
|
|
|
--- a/.hgsubstate
|
|
|
+++ b/.hgsubstate
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub
|
|
|
+88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
|
|
|
$ hg qrefresh -u test -d '0 0'
|
|
|
$ cat .hgsubstate
|
|
|
88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
$ hg diff -c tip
|
|
|
diff -r 44f846335325 -r b3e8c5fa3aaa .hgsubstate
|
|
|
--- a/.hgsubstate
|
|
|
+++ b/.hgsubstate
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub
|
|
|
+88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
$ cat .hg/patches/import-at-qrefresh
|
|
|
# HG changeset patch
|
|
|
# Date 0 0
|
|
|
# User test
|
|
|
# Parent 44f846335325209be6be35dc2c9a4be107278c09
|
|
|
|
|
|
diff -r 44f846335325 .hgsubstate
|
|
|
--- a/.hgsubstate
|
|
|
+++ b/.hgsubstate
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub
|
|
|
+88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
|
|
|
$ hg update -C tip
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ hg qpop -a
|
|
|
popping import-at-qrefresh
|
|
|
popping import-at-qnew
|
|
|
patch queue now empty
|
|
|
|
|
|
$ hg -R sub update -C 0
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
$ echo 'sub = sub' > .hgsub
|
|
|
$ hg commit -Am '#1 in parent'
|
|
|
adding .hgsub
|
|
|
$ hg -R sub update -C 1
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
$ hg commit -Am '#2 in parent (but will be rolled back soon)'
|
|
|
$ hg rollback
|
|
|
repository tip rolled back to revision 1 (undo commit)
|
|
|
working directory now based on revision 1
|
|
|
$ hg status
|
|
|
M .hgsubstate
|
|
|
$ hg qnew -u test -d '0 0' checkstate-at-qnew
|
|
|
$ hg -R sub parents --template '{node} sub\n'
|
|
|
88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
$ cat .hgsubstate
|
|
|
88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
$ hg diff -c tip
|
|
|
diff -r 4d91eb2fa1d1 -r 1259c112d884 .hgsubstate
|
|
|
--- a/.hgsubstate
|
|
|
+++ b/.hgsubstate
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub
|
|
|
+88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
$ cat .hg/patches/checkstate-at-qnew
|
|
|
# HG changeset patch
|
|
|
# Parent 4d91eb2fa1d1b22ec513347b9cd06f6b49d470fa
|
|
|
# User test
|
|
|
# Date 0 0
|
|
|
|
|
|
diff -r 4d91eb2fa1d1 -r 1259c112d884 .hgsubstate
|
|
|
--- a/.hgsubstate
|
|
|
+++ b/.hgsubstate
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-b6f6e9c41f3dfd374a6d2ed4535c87951cf979cf sub
|
|
|
+88ac1bef5ed43b689d1d200b59886b675dec474b sub
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
$ cd ..
|
|
|
|
