Show More
@@ -677,7 +677,7 b' def addchangegroup(repo, source, srctype' | |||||
677 |
|
677 | |||
678 | added = [cl.node(r) for r in xrange(clstart, clend)] |
|
678 | added = [cl.node(r) for r in xrange(clstart, clend)] | |
679 | publishing = repo.ui.configbool('phases', 'publish', True) |
|
679 | publishing = repo.ui.configbool('phases', 'publish', True) | |
680 |
if srctype |
|
680 | if srctype in ('push', 'serve'): | |
681 | # Old servers can not push the boundary themselves. |
|
681 | # Old servers can not push the boundary themselves. | |
682 | # New servers won't push the boundary if changeset already |
|
682 | # New servers won't push the boundary if changeset already | |
683 | # exists locally as secret |
|
683 | # exists locally as secret |
@@ -267,7 +267,6 b' test http authentication' | |||||
267 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks |
|
267 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks | |
268 | "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524 |
|
268 | "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524 | |
269 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases |
|
269 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases | |
270 | "POST /?cmd=pushkey HTTP/1.1" 200 - x-hgarg-1:key=7f4e523d01f2cc3765ac8934da3d14db775ff872&namespace=phases&new=0&old=1 |
|
|||
271 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks |
|
270 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks | |
272 |
|
271 | |||
273 | #endif |
|
272 | #endif |
@@ -68,7 +68,6 b' expect success' | |||||
68 | remote: adding file changes |
|
68 | remote: adding file changes | |
69 | remote: added 1 changesets with 1 changes to 1 files |
|
69 | remote: added 1 changesets with 1 changes to 1 files | |
70 | remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http:*: (glob) |
|
70 | remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http:*: (glob) | |
71 | remote: pushkey hook: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1 |
|
|||
72 | % serve errors |
|
71 | % serve errors | |
73 | $ hg rollback |
|
72 | $ hg rollback | |
74 | repository tip rolled back to revision 0 (undo serve) |
|
73 | repository tip rolled back to revision 0 (undo serve) | |
@@ -85,7 +84,6 b' expect success, server lacks the httphea' | |||||
85 | remote: adding file changes |
|
84 | remote: adding file changes | |
86 | remote: added 1 changesets with 1 changes to 1 files |
|
85 | remote: added 1 changesets with 1 changes to 1 files | |
87 | remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http:*: (glob) |
|
86 | remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http:*: (glob) | |
88 | remote: pushkey hook: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1 |
|
|||
89 | % serve errors |
|
87 | % serve errors | |
90 | $ hg rollback |
|
88 | $ hg rollback | |
91 | repository tip rolled back to revision 0 (undo serve) |
|
89 | repository tip rolled back to revision 0 (undo serve) | |
@@ -102,7 +100,6 b' expect success, server lacks the unbundl' | |||||
102 | remote: adding file changes |
|
100 | remote: adding file changes | |
103 | remote: added 1 changesets with 1 changes to 1 files |
|
101 | remote: added 1 changesets with 1 changes to 1 files | |
104 | remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http:*: (glob) |
|
102 | remote: changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http:*: (glob) | |
105 | remote: pushkey hook: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 HG_RET=1 |
|
|||
106 | % serve errors |
|
103 | % serve errors | |
107 | $ hg rollback |
|
104 | $ hg rollback | |
108 | repository tip rolled back to revision 0 (undo serve) |
|
105 | repository tip rolled back to revision 0 (undo serve) | |
@@ -123,8 +120,6 b' expect push success, phase change failur' | |||||
123 | remote: adding manifests |
|
120 | remote: adding manifests | |
124 | remote: adding file changes |
|
121 | remote: adding file changes | |
125 | remote: added 1 changesets with 1 changes to 1 files |
|
122 | remote: added 1 changesets with 1 changes to 1 files | |
126 | remote: prepushkey hook: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 |
|
|||
127 | updating ba677d0156c1 to public failed! |
|
|||
128 | % serve errors |
|
123 | % serve errors | |
129 |
|
124 | |||
130 | expect phase change success |
|
125 | expect phase change success | |
@@ -134,7 +129,6 b' expect phase change success' | |||||
134 | pushing to http://localhost:$HGPORT/ |
|
129 | pushing to http://localhost:$HGPORT/ | |
135 | searching for changes |
|
130 | searching for changes | |
136 | no changes found |
|
131 | no changes found | |
137 | remote: prepushkey hook: HG_KEY=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_NAMESPACE=phases HG_NEW=0 HG_OLD=1 |
|
|||
138 | % serve errors |
|
132 | % serve errors | |
139 | [1] |
|
133 | [1] | |
140 | $ hg rollback |
|
134 | $ hg rollback |
General Comments 0
You need to be logged in to leave comments.
Login now