diff tests/test-remotefilelog-sparse.t @ 42223:d69bc8ffbe6f

copies: inline _computenonoverlap() in mergecopies() We now call pathcopies() from the base to each of the commits, and that calls _computeforwardmissing(), which does file prefetching (in the remotefilelog override). So the call to _computenonoverlap() is now pointless (the sets of files from _computenonoverlap() are subsets of the sets of files from _computeforwardmissing()). This somehow also fixes a broken remotefilelog test. Differential Revision: https://phab.mercurial-scm.org/D6256
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 12 Apr 2019 10:44:37 -0700
parents 0800d9e6e216
children d7304434390f
line wrap: on
line diff
--- a/tests/test-remotefilelog-sparse.t	Thu Apr 11 23:22:54 2019 -0700
+++ b/tests/test-remotefilelog-sparse.t	Fri Apr 12 10:44:37 2019 -0700
@@ -98,12 +98,5 @@
   $ clearcache
   $ hg prefetch -r '. + .^' -I x -I z
   4 files fetched over 1 fetches - (4 misses, 0.00% hit ratio) over * (glob)
-Originally this was testing that the rebase doesn't fetch pointless
-blobs. Right now it fails because core's sparse can't load a spec from
-the working directory. Presumably there's a fix, but I'm not sure what it is.
   $ hg rebase -d 2 --keep
   rebasing 1:876b1317060d "x2" (foo)
-  transaction abort!
-  rollback completed
-  abort: cannot parse sparse patterns from working directory
-  [255]