tests/test-inhibit.t
changeset 1232 37c00aeb4762
parent 1225 577f5340be6f
child 1233 63ee05dd557a
equal deleted inserted replaced
1227:3d9c5f5df6d8 1232:37c00aeb4762
     1   $ cat >> $HGRCPATH <<EOF
     1   $ cat >> $HGRCPATH <<EOF
     2   > [ui]
     2   > [ui]
     3   > logtemplate = {rev}:{node|short} {desc}\n
     3   > logtemplate = {rev}:{node|short} {desc}\n
     4   > [extensions]
     4   > [extensions]
       
     5   > rebase=
     5   > EOF
     6   > EOF
     6   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
     7   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
     7   $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext/inhibit.py" >> $HGRCPATH
     8   $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext/inhibit.py" >> $HGRCPATH
     8   $ mkcommit() {
     9   $ mkcommit() {
     9   >    echo "$1" > "$1"
    10   >    echo "$1" > "$1"
   171   o  4:98065434e5c6 add cE
   172   o  4:98065434e5c6 add cE
   172   |
   173   |
   173   o  0:54ccbc537fc2 add cA
   174   o  0:54ccbc537fc2 add cA
   174   
   175   
   175 
   176 
       
   177 Test that direct access make changesets visible
       
   178 
       
   179   $ hg export 2db36d8066ff 02bcbc3f6e56
       
   180   # HG changeset patch
       
   181   # User test
       
   182   # Date 0 0
       
   183   #      Thu Jan 01 00:00:00 1970 +0000
       
   184   # Node ID 2db36d8066ff50e8be3d3e6c2da1ebc0a8381d82
       
   185   # Parent  7df62a38b9bf9daf968de235043ba88a8ef43393
       
   186   add cD
       
   187   
       
   188   diff -r 7df62a38b9bf -r 2db36d8066ff cD
       
   189   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
       
   190   +++ b/cD	Thu Jan 01 00:00:00 1970 +0000
       
   191   @@ -0,0 +1,1 @@
       
   192   +cD
       
   193   # HG changeset patch
       
   194   # User test
       
   195   # Date 0 0
       
   196   #      Thu Jan 01 00:00:00 1970 +0000
       
   197   # Node ID 02bcbc3f6e56fb2928efec2c6e24472720bf5511
       
   198   # Parent  54ccbc537fc2d6845a5d61337c1cfb80d1d2815e
       
   199   add cB
       
   200   
       
   201   diff -r 54ccbc537fc2 -r 02bcbc3f6e56 cB
       
   202   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
       
   203   +++ b/cB	Thu Jan 01 00:00:00 1970 +0000
       
   204   @@ -0,0 +1,1 @@
       
   205   +cB
       
   206 
       
   207 But only with hash
       
   208 
       
   209   $ hg export 2db36d8066ff::
       
   210   # HG changeset patch
       
   211   # User test
       
   212   # Date 0 0
       
   213   #      Thu Jan 01 00:00:00 1970 +0000
       
   214   # Node ID 2db36d8066ff50e8be3d3e6c2da1ebc0a8381d82
       
   215   # Parent  7df62a38b9bf9daf968de235043ba88a8ef43393
       
   216   add cD
       
   217   
       
   218   diff -r 7df62a38b9bf -r 2db36d8066ff cD
       
   219   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
       
   220   +++ b/cD	Thu Jan 01 00:00:00 1970 +0000
       
   221   @@ -0,0 +1,1 @@
       
   222   +cD
       
   223 
       
   224   $ hg export 1 3
       
   225   abort: hidden revision '1'!
       
   226   (use --hidden to access hidden revisions)
       
   227   [255]
       
   228 
       
   229 
       
   230 With severals hidden sha, rebase of one hidden stack onto another one:
       
   231   $ hg update -C 0
       
   232   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
       
   233   $ mkcommit cK
       
   234   created new head
       
   235   $ mkcommit cL
       
   236   $ hg update -C 9
       
   237   4 files updated, 0 files merged, 2 files removed, 0 files unresolved
       
   238   $ hg log -G
       
   239   o  11:53a94305e133 add cL
       
   240   |
       
   241   o  10:ad78ff7d621f add cK
       
   242   |
       
   243   | @  9:55c73a90e4b4 add cJ
       
   244   | |
       
   245   | | o  7:18214586bf78 add cJ
       
   246   | |/
       
   247   | o  6:cf5c4f4554ce add cH
       
   248   | |
       
   249   | o  5:5419eb264a33 add cG
       
   250   | |
       
   251   | o  4:98065434e5c6 add cE
       
   252   |/
       
   253   o  0:54ccbc537fc2 add cA
       
   254   
       
   255   $ hg prune 10:
       
   256   2 changesets pruned
       
   257   $ hg log -G
       
   258   @  9:55c73a90e4b4 add cJ
       
   259   |
       
   260   | o  7:18214586bf78 add cJ
       
   261   |/
       
   262   o  6:cf5c4f4554ce add cH
       
   263   |
       
   264   o  5:5419eb264a33 add cG
       
   265   |
       
   266   o  4:98065434e5c6 add cE
       
   267   |
       
   268   o  0:54ccbc537fc2 add cA
       
   269   
       
   270   $ hg rebase -s 10 -d 3 
       
   271   abort: hidden revision '3'!
       
   272   (use --hidden to access hidden revisions)
       
   273   [255]
       
   274   $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d  2db36d8066ff
       
   275   rebasing 10:ad78ff7d621f "add cK"
       
   276   rebasing 11:53a94305e133 "add cL"
       
   277   2 new unstable changesets
       
   278   $ hg log -G
       
   279   o  13:2f7b7704d714 add cL
       
   280   |
       
   281   o  12:fe1634cbe235 add cK
       
   282   |
       
   283   | @  9:55c73a90e4b4 add cJ
       
   284   | |
       
   285   | | o  7:18214586bf78 add cJ
       
   286   | |/
       
   287   | o  6:cf5c4f4554ce add cH
       
   288   | |
       
   289   | o  5:5419eb264a33 add cG
       
   290   | |
       
   291   | o  4:98065434e5c6 add cE
       
   292   | |
       
   293   x |  3:2db36d8066ff add cD
       
   294   | |
       
   295   x |  2:7df62a38b9bf add cC
       
   296   | |
       
   297   x |  1:02bcbc3f6e56 add cB
       
   298   |/
       
   299   o  0:54ccbc537fc2 add cA
       
   300