Mercurial > public > mercurial-scm > hg

diff tests/test-push-http.t @ 25502:bd41c19383db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phases: abort the whole push if phases fail to update (BC) When using bundle2, the phase pushkey parts are now made mandatory. As a result, failure to update the bookmark server side will result in the transaction being aborted.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 27 May 2015 22:25:51 -0700
parents d19787db6fe0
children d6d3cf5fda6f
line wrap: on
line diff
--- a/tests/test-push-http.t	Wed May 27 22:25:33 2015 -0700
+++ b/tests/test-push-http.t	Wed May 27 22:25:51 2015 -0700
@@ -125,8 +125,11 @@
   remote: added 1 changesets with 1 changes to 1 files
   remote: prepushkey hook: HG_BUNDLE2=1 HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:127.0.0.1: (glob)
   remote: pushkey-abort: prepushkey hook exited with status 1
-  updating ba677d0156c1 to public failed!
+  remote: transaction abort!
+  remote: rollback completed
+  abort: updating ba677d0156c1 to public failed
   % serve errors
+  [255]
 
 expect phase change success
 
@@ -134,9 +137,12 @@
   $ req
   pushing to http://localhost:$HGPORT/
   searching for changes
-  no changes found
+  remote: adding changesets
+  remote: adding manifests
+  remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files
+  remote: prepushkey hook: HG_BUNDLE2=1 HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_OLD=1 HG_PENDING=$TESTTMP/test HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_URL=remote:http:127.0.0.1: (glob)
   % serve errors
-  [1]
   $ hg rollback
   repository tip rolled back to revision 0 (undo serve)