view tests/test-diff-subdir.t @ 40440: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.

  $ hg init

  $ mkdir alpha
  $ touch alpha/one
  $ mkdir beta
  $ touch beta/two

  $ hg add alpha/one beta/two
  $ hg ci -m "start"

  $ echo 1 > alpha/one
  $ echo 2 > beta/two

everything

  $ hg diff --nodates
  diff -r 7d5ef1aea329 alpha/one
  --- a/alpha/one
  +++ b/alpha/one
  @@ -0,0 +1,1 @@
  +1
  diff -r 7d5ef1aea329 beta/two
  --- a/beta/two
  +++ b/beta/two
  @@ -0,0 +1,1 @@
  +2

beta only

  $ hg diff --nodates beta
  diff -r 7d5ef1aea329 beta/two
  --- a/beta/two
  +++ b/beta/two
  @@ -0,0 +1,1 @@
  +2

inside beta

  $ cd beta
  $ hg diff --nodates .
  diff -r 7d5ef1aea329 beta/two
  --- a/beta/two
  +++ b/beta/two
  @@ -0,0 +1,1 @@
  +2

relative to beta

  $ cd ..
  $ hg diff --nodates --root beta
  diff -r 7d5ef1aea329 two
  --- a/two
  +++ b/two
  @@ -0,0 +1,1 @@
  +2

inside beta

  $ cd beta
  $ hg diff --nodates --root .
  diff -r 7d5ef1aea329 two
  --- a/two
  +++ b/two
  @@ -0,0 +1,1 @@
  +2

  $ cd ..