Mercurial > hg
comparison tests/test-bundle2-remote-changegroup.t @ 34661:eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Upon pull or unbundle, we display a message with the range of new revisions
fetched. This revision range could readily be used after a pull to look out
what's new with 'hg log'. The algorithm takes care of filtering "obsolete"
revisions that might be present in transaction's "changes" but should not be
displayed to the end user.
| author | Denis Laxalde <denis.laxalde@logilab.fr> |
|---|---|
| date | Thu, 12 Oct 2017 09:39:50 +0200 |
| parents | 5ede882c249c |
| children | 1ee1a42bfdae |
comparison
equal
deleted
inserted
replaced
| 34660:d00ec62d156f | 34661:eb586ed5d8ce |
|---|---|
| 89 $ hg -R repo unbundle $TESTDIR/bundles/rebase.hg | 89 $ hg -R repo unbundle $TESTDIR/bundles/rebase.hg |
| 90 adding changesets | 90 adding changesets |
| 91 adding manifests | 91 adding manifests |
| 92 adding file changes | 92 adding file changes |
| 93 added 8 changesets with 7 changes to 7 files (+2 heads) | 93 added 8 changesets with 7 changes to 7 files (+2 heads) |
| 94 new changesets cd010b8cd998:02de42196ebe | |
| 94 (run 'hg heads' to see heads, 'hg merge' to merge) | 95 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 95 | 96 |
| 96 $ hg -R repo log -G | 97 $ hg -R repo log -G |
| 97 o 7:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H | 98 o 7:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> H |
| 98 | | 99 | |
| 129 $ hg clone orig clone -r 3 -r 4 | 130 $ hg clone orig clone -r 3 -r 4 |
| 130 adding changesets | 131 adding changesets |
| 131 adding manifests | 132 adding manifests |
| 132 adding file changes | 133 adding file changes |
| 133 added 5 changesets with 5 changes to 5 files (+1 heads) | 134 added 5 changesets with 5 changes to 5 files (+1 heads) |
| 135 new changesets cd010b8cd998:9520eea781bc | |
| 134 updating to branch default | 136 updating to branch default |
| 135 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | 137 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 136 $ hg pull -R clone ssh://user@dummy/repo | 138 $ hg pull -R clone ssh://user@dummy/repo |
| 137 pulling from ssh://user@dummy/repo | 139 pulling from ssh://user@dummy/repo |
| 138 searching for changes | 140 searching for changes |
| 139 remote: remote-changegroup | 141 remote: remote-changegroup |
| 140 adding changesets | 142 adding changesets |
| 141 adding manifests | 143 adding manifests |
| 142 adding file changes | 144 adding file changes |
| 143 added 3 changesets with 2 changes to 2 files (+1 heads) | 145 added 3 changesets with 2 changes to 2 files (+1 heads) |
| 146 new changesets 24b6387c8c8c:02de42196ebe | |
| 144 (run 'hg heads .' to see heads, 'hg merge' to merge) | 147 (run 'hg heads .' to see heads, 'hg merge' to merge) |
| 145 $ hg -R clone log -G | 148 $ hg -R clone log -G |
| 146 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H | 149 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
| 147 | | 150 | |
| 148 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G | 151 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G |
| 172 $ hg clone orig clone -r 2 | 175 $ hg clone orig clone -r 2 |
| 173 adding changesets | 176 adding changesets |
| 174 adding manifests | 177 adding manifests |
| 175 adding file changes | 178 adding file changes |
| 176 added 3 changesets with 3 changes to 3 files | 179 added 3 changesets with 3 changes to 3 files |
| 180 new changesets cd010b8cd998:5fddd98957c8 | |
| 177 updating to branch default | 181 updating to branch default |
| 178 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 182 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 179 $ hg pull -R clone ssh://user@dummy/repo | 183 $ hg pull -R clone ssh://user@dummy/repo |
| 180 pulling from ssh://user@dummy/repo | 184 pulling from ssh://user@dummy/repo |
| 181 searching for changes | 185 searching for changes |
| 187 remote: changegroup | 191 remote: changegroup |
| 188 adding changesets | 192 adding changesets |
| 189 adding manifests | 193 adding manifests |
| 190 adding file changes | 194 adding file changes |
| 191 added 3 changesets with 2 changes to 2 files (+1 heads) | 195 added 3 changesets with 2 changes to 2 files (+1 heads) |
| 196 new changesets 32af7686d403:02de42196ebe | |
| 192 (run 'hg heads' to see heads, 'hg merge' to merge) | 197 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 193 $ hg -R clone log -G | 198 $ hg -R clone log -G |
| 194 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H | 199 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
| 195 | | 200 | |
| 196 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G | 201 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G |
| 220 $ hg clone orig clone -r 2 | 225 $ hg clone orig clone -r 2 |
| 221 adding changesets | 226 adding changesets |
| 222 adding manifests | 227 adding manifests |
| 223 adding file changes | 228 adding file changes |
| 224 added 3 changesets with 3 changes to 3 files | 229 added 3 changesets with 3 changes to 3 files |
| 230 new changesets cd010b8cd998:5fddd98957c8 | |
| 225 updating to branch default | 231 updating to branch default |
| 226 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 232 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 227 $ hg pull -R clone ssh://user@dummy/repo | 233 $ hg pull -R clone ssh://user@dummy/repo |
| 228 pulling from ssh://user@dummy/repo | 234 pulling from ssh://user@dummy/repo |
| 229 searching for changes | 235 searching for changes |
| 235 remote: remote-changegroup | 241 remote: remote-changegroup |
| 236 adding changesets | 242 adding changesets |
| 237 adding manifests | 243 adding manifests |
| 238 adding file changes | 244 adding file changes |
| 239 added 3 changesets with 2 changes to 2 files (+1 heads) | 245 added 3 changesets with 2 changes to 2 files (+1 heads) |
| 246 new changesets 32af7686d403:02de42196ebe | |
| 240 (run 'hg heads' to see heads, 'hg merge' to merge) | 247 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 241 $ hg -R clone log -G | 248 $ hg -R clone log -G |
| 242 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H | 249 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
| 243 | | 250 | |
| 244 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G | 251 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G |
| 271 $ hg clone orig clone -r 2 | 278 $ hg clone orig clone -r 2 |
| 272 adding changesets | 279 adding changesets |
| 273 adding manifests | 280 adding manifests |
| 274 adding file changes | 281 adding file changes |
| 275 added 3 changesets with 3 changes to 3 files | 282 added 3 changesets with 3 changes to 3 files |
| 283 new changesets cd010b8cd998:5fddd98957c8 | |
| 276 updating to branch default | 284 updating to branch default |
| 277 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 285 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 278 $ hg pull -R clone ssh://user@dummy/repo | 286 $ hg pull -R clone ssh://user@dummy/repo |
| 279 pulling from ssh://user@dummy/repo | 287 pulling from ssh://user@dummy/repo |
| 280 searching for changes | 288 searching for changes |
| 291 remote: changegroup | 299 remote: changegroup |
| 292 adding changesets | 300 adding changesets |
| 293 adding manifests | 301 adding manifests |
| 294 adding file changes | 302 adding file changes |
| 295 added 1 changesets with 1 changes to 1 files (+1 heads) | 303 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 304 new changesets 32af7686d403:02de42196ebe | |
| 296 (run 'hg heads' to see heads, 'hg merge' to merge) | 305 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 297 $ hg -R clone log -G | 306 $ hg -R clone log -G |
| 298 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H | 307 o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
| 299 | | 308 | |
| 300 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G | 309 | o 6:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> G |
| 326 remote: remote-changegroup | 335 remote: remote-changegroup |
| 327 adding changesets | 336 adding changesets |
| 328 adding manifests | 337 adding manifests |
| 329 adding file changes | 338 adding file changes |
| 330 added 8 changesets with 7 changes to 7 files (+2 heads) | 339 added 8 changesets with 7 changes to 7 files (+2 heads) |
| 340 new changesets cd010b8cd998:02de42196ebe | |
| 331 updating to branch default | 341 updating to branch default |
| 332 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 342 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 333 $ rm -rf clone | 343 $ rm -rf clone |
| 334 | 344 |
| 335 $ cat > repo/.hg/bundle2maker << EOF | 345 $ cat > repo/.hg/bundle2maker << EOF |
| 340 remote: remote-changegroup | 350 remote: remote-changegroup |
| 341 adding changesets | 351 adding changesets |
| 342 adding manifests | 352 adding manifests |
| 343 adding file changes | 353 adding file changes |
| 344 added 8 changesets with 7 changes to 7 files (+2 heads) | 354 added 8 changesets with 7 changes to 7 files (+2 heads) |
| 355 new changesets cd010b8cd998:02de42196ebe | |
| 345 updating to branch default | 356 updating to branch default |
| 346 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 357 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 347 $ rm -rf clone | 358 $ rm -rf clone |
| 348 | 359 |
| 349 Hash digest mismatch throws an error | 360 Hash digest mismatch throws an error |
| 374 remote: remote-changegroup | 385 remote: remote-changegroup |
| 375 adding changesets | 386 adding changesets |
| 376 adding manifests | 387 adding manifests |
| 377 adding file changes | 388 adding file changes |
| 378 added 8 changesets with 7 changes to 7 files (+2 heads) | 389 added 8 changesets with 7 changes to 7 files (+2 heads) |
| 390 new changesets cd010b8cd998:02de42196ebe | |
| 379 updating to branch default | 391 updating to branch default |
| 380 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 392 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 381 $ rm -rf clone | 393 $ rm -rf clone |
| 382 | 394 |
| 383 If either of the multiple hash digests mismatches, an error is thrown | 395 If either of the multiple hash digests mismatches, an error is thrown |
| 419 $ hg clone orig clone -r 2 | 431 $ hg clone orig clone -r 2 |
| 420 adding changesets | 432 adding changesets |
| 421 adding manifests | 433 adding manifests |
| 422 adding file changes | 434 adding file changes |
| 423 added 3 changesets with 3 changes to 3 files | 435 added 3 changesets with 3 changes to 3 files |
| 436 new changesets cd010b8cd998:5fddd98957c8 | |
| 424 updating to branch default | 437 updating to branch default |
| 425 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 438 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 426 | 439 |
| 427 $ cat > repo/.hg/bundle2maker << EOF | 440 $ cat > repo/.hg/bundle2maker << EOF |
| 428 > remote-changegroup http://localhost:$HGPORT/bundle4.hg bundle4.hg | 441 > remote-changegroup http://localhost:$HGPORT/bundle4.hg bundle4.hg |