Mercurial > hg
comparison tests/test-http.t @ 40655:69d4c8c5c25e stable
subrepo: print the status line before creating the peer for better diagnostics
I ran into a problem where I tried updating to a different branch, and the
process appeared to hang. It turned out that the subrepo revision wasn't
available locally, and I must have originally cloned it from an `hg serve -S` on
a machine that currently wasn't serving anything. It took 2+ minutes to
timeout, and didn't mention what it was connecting to even then.
There are a couple of other issues in this scenario too.
- The repo is dirty after the failed checkout because the top level repo is
updated first. We should probably make 2 passes- top down to pull
everything needed, and then do an update once everything is in place.
- Something must be reading .hgsubstate from wdir because if the same merge
command is run after the timeout, a prompt is issued that the local and
remote subrepo diverged, instead of hanging. But it lists the local version
and remote version as having the same hash.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 16 Nov 2018 18:37:26 -0500 |
parents | 4bd6e444c76f |
children | 73da729ccfef |
comparison
equal
deleted
inserted
replaced
40637:4790732559ad | 40655:69d4c8c5c25e |
---|---|
415 adding manifests | 415 adding manifests |
416 adding file changes | 416 adding file changes |
417 added 3 changesets with 7 changes to 7 files | 417 added 3 changesets with 7 changes to 7 files |
418 new changesets 8b6053c928fe:56f9bc90cce6 | 418 new changesets 8b6053c928fe:56f9bc90cce6 |
419 updating to branch default | 419 updating to branch default |
420 cloning subrepo sub from http://localhost:$HGPORT/sub | |
420 abort: HTTP Error 404: Not Found | 421 abort: HTTP Error 404: Not Found |
421 [255] | 422 [255] |
422 $ hg clone http://localhost:$HGPORT/ slash-clone | 423 $ hg clone http://localhost:$HGPORT/ slash-clone |
423 requesting all changes | 424 requesting all changes |
424 adding changesets | 425 adding changesets |
425 adding manifests | 426 adding manifests |
426 adding file changes | 427 adding file changes |
427 added 3 changesets with 7 changes to 7 files | 428 added 3 changesets with 7 changes to 7 files |
428 new changesets 8b6053c928fe:56f9bc90cce6 | 429 new changesets 8b6053c928fe:56f9bc90cce6 |
429 updating to branch default | 430 updating to branch default |
431 cloning subrepo sub from http://localhost:$HGPORT/sub | |
430 abort: HTTP Error 404: Not Found | 432 abort: HTTP Error 404: Not Found |
431 [255] | 433 [255] |
432 | 434 |
433 check error log | 435 check error log |
434 | 436 |