Submitter | phabricator |
---|---|
Date | Jan. 21, 2020, 9:59 p.m. |
Message ID | <differential-rev-PHID-DREV-elfqgnpeuxgkrhr7wqmn-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/44563/ |
State | Superseded |
Headers | show |
Comments
marmoute added a comment. marmoute accepted this revision. looks okay. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7966/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7966 To: pulkit, #hg-reviewers, marmoute Cc: marmoute, mercurial-devel
This revision now requires changes to proceed. durin42 added a comment. durin42 requested changes to this revision. Terrible damage: cd tests && python run-tests.py test-remotefilelog-linknodes.t running 1 tests using 1 parallel processes --- .../tests/test-remotefilelog-linknodes.t +++ .../hgtest/tests/test-remotefilelog-linknodes.t.err @@ -173,7 +173,6 @@ 32e6611f6149 xx2-fake-rebased public x 0632994590a8 xx public x b292c1e3311f x public x - 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) # But not after that $ hg log -f x -T '{node|short} {desc} {phase} {files}\n' @@ -184,11 +183,5 @@ # Check the contents of the remote blob for correct linknode $ hg debugremotefilelog $CACHEDIR/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/d4a3ed9310e5bd9887e3bf779da5077efab28216 - size: 6 bytes - path: $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/d4a3ed9310e5bd9887e3bf779da5077efab28216 - key: d4a3ed9310e5 - - node => p1 p2 linknode copyfrom - d4a3ed9310e5 => aee31534993a 000000000000 32e6611f6149 - aee31534993a => 1406e7411862 000000000000 0632994590a8 - 1406e7411862 => 000000000000 000000000000 b292c1e3311f + abort: $ENOENT$: '$TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/d4a3ed9310e5bd9887e3bf779da5077efab28216' + [255] ERROR: test-remotefilelog-linknodes.t output changed REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7966/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7966 To: pulkit, #hg-reviewers, marmoute, durin42 Cc: durin42, marmoute, mercurial-devel
Patch
diff --git a/hgext/remotefilelog/remotefilectx.py b/hgext/remotefilelog/remotefilectx.py --- a/hgext/remotefilelog/remotefilectx.py +++ b/hgext/remotefilelog/remotefilectx.py @@ -325,7 +325,9 @@ logmsg = b'' start = time.time() try: - repo.fileservice.prefetch([(path, hex(fnode))], force=True) + repo.fileservice.prefetch( + [(path, hex(fnode))], force=True, fetchdata=False + ) # Now that we've downloaded a new blob from the server, # we need to rebuild the ancestor map to recompute the