view tests/test-merge7.t @ 37518:092eff6833a7

lfs: infer the blob store URL from paths.default

If `lfs.url` is specified, it takes precedence.  However, now that we support
serving blobs via hgweb, we shouldn't *require* this setting.  Less
configuration is better (things will work out of the box once this is sorted
out), and git has similar functionality.

This is not a complete solution- it isn't able to infer the blob store from an
explicitly supplied path, and it should consider `paths.default-push` for push.
The pull solution for that is a bit hacky, and this alone is an improvement for
the vast majority of cases.

Even though there are only a handful of references to the saved remote store,
the location of them makes things complicated.

  1) downloading files on demand in the revlog flag processor
  2) copying to readonlyvfs with bundlerepo
  3) downloading in the file prefetch hook
  4) the canupload()/skipdownload() checks
  5) uploading blobs

Since revlog doesn't have a repo or ui reference, we can't avoid creating a
remote store when the extension is loaded.  While the long term goal is to make
sure the prefetch hook is invoked early for every command for efficiency, this
handling in the flag processor is needed as a last ditch fetch.

In order to support the clone command, the remote store needs to be created
later than when the extension loads, since `paths.default` isn't set until just
before the files are checked out.  Therefore, this patch changes the prefetch
hook to ignore the saved reference, and build a new one.

The canupload()/skipdownload() checks simply check if the stored instance is a
`_nullremote`.  Since this can only be set via `lfs.url` (which is reflected in
the saved reference), checking only the instance created when the extension
loaded is fine.

The blob uploading function is called from several places:

  1) a prepush hook
  2) when writing a new bundle
  3) from infinitepush

The prepush hook gets an exchange.pushop, so it has a path to where the push is
going.  The bundle writer and infinitepush don't.  Further, bundle creation for
things like strip and amend are causing blobs to be uploaded.  This seems wrong,
but I don't want to side track this sorting that out, so punt on trying to
handle explicit push paths or `paths.default-push`.

I also think that sending blobs to a remote store when pushing to a local repo
is wrong.  This functionality predates the usercache, so perhaps that's the
reason for it.  I've got some patches floating around to stop sending blobs
remotely in this case, and instead write directly to the other repo's blob
store.  But the tests for corruption handling weren't happy with this change,
and I don't have time to rewrite them.  So exclude filesystem based paths from
this for now.

I don't think there's much of a chance to implement `paths.remote:lfsurl` style
configs, given how early these are resolved vs how late the remote store is
created.  But git has it, so I threw a TODO in there, in case anyone has ideas.

I have no idea why this is now doing http auth twice when it wasn't before.  I
don't think the original blobstore's url is ever being used in these cases.

initial
  $ hg init test-a
  $ cd test-a
  $ cat >test.txt <<"EOF"
  > 1
  > 2
  > 3
  > EOF
  $ hg add test.txt
  $ hg commit -m "Initial"

clone
  $ cd ..
  $ hg clone test-a test-b
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

change test-a
  $ cd test-a
  $ cat >test.txt <<"EOF"
  > one
  > two
  > three
  > EOF
  $ hg commit -m "Numbers as words"

change test-b
  $ cd ../test-b
  $ cat >test.txt <<"EOF"
  > 1
  > 2.5
  > 3
  > EOF
  $ hg commit -m "2 -> 2.5"

now pull and merge from test-a
  $ hg pull ../test-a
  pulling from ../test-a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files (+1 heads)
  new changesets 96b70246a118
  (run 'hg heads' to see heads, 'hg merge' to merge)
  $ hg merge
  merging test.txt
  warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
  [1]
resolve conflict
  $ cat >test.txt <<"EOF"
  > one
  > two-point-five
  > three
  > EOF
  $ rm -f *.orig
  $ hg resolve -m test.txt
  (no more unresolved files)
  $ hg commit -m "Merge 1"

change test-a again
  $ cd ../test-a
  $ cat >test.txt <<"EOF"
  > one
  > two-point-one
  > three
  > EOF
  $ hg commit -m "two -> two-point-one"

pull and merge from test-a again
  $ cd ../test-b
  $ hg pull ../test-a
  pulling from ../test-a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files (+1 heads)
  new changesets 40d11a4173a8
  (run 'hg heads' to see heads, 'hg merge' to merge)
  $ hg merge --debug
    searching for copies back to rev 1
  resolving manifests
   branchmerge: True, force: False, partial: False
   ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
   preserving test.txt for resolve of test.txt
  starting 4 threads for background file closing (?)
   test.txt: versions differ -> m (premerge)
  picked tool ':merge' for test.txt (binary False symlink False changedelete False)
  merging test.txt
  my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
   test.txt: versions differ -> m (merge)
  picked tool ':merge' for test.txt (binary False symlink False changedelete False)
  my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
  warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
  [1]

  $ cat test.txt
  one
  <<<<<<< working copy: 50c3a7e29886 - test: Merge 1
  two-point-five
  =======
  two-point-one
  >>>>>>> merge rev:    40d11a4173a8 - test: two -> two-point-one
  three

  $ hg debugindex test.txt
     rev linkrev nodeid       p1           p2
       0       0 01365c4cca56 000000000000 000000000000
       1       1 7b013192566a 01365c4cca56 000000000000
       2       2 8fe46a3eb557 01365c4cca56 000000000000
       3       3 fc3148072371 7b013192566a 8fe46a3eb557
       4       4 d40249267ae3 8fe46a3eb557 000000000000

  $ hg log
  changeset:   4:40d11a4173a8
  tag:         tip
  parent:      2:96b70246a118
  user:        test
  date:        Thu Jan 01 00:00:00 1970 +0000
  summary:     two -> two-point-one
  
  changeset:   3:50c3a7e29886
  parent:      1:d1e159716d41
  parent:      2:96b70246a118
  user:        test
  date:        Thu Jan 01 00:00:00 1970 +0000
  summary:     Merge 1
  
  changeset:   2:96b70246a118
  parent:      0:b1832b9d912a
  user:        test
  date:        Thu Jan 01 00:00:00 1970 +0000
  summary:     Numbers as words
  
  changeset:   1:d1e159716d41
  user:        test
  date:        Thu Jan 01 00:00:00 1970 +0000
  summary:     2 -> 2.5
  
  changeset:   0:b1832b9d912a
  user:        test
  date:        Thu Jan 01 00:00:00 1970 +0000
  summary:     Initial
  

  $ cd ..