Mercurial > hg
view tests/test-narrow-patch.t @ 42943:5fadf6103790
remotefilelog: replace repack lock to solve race condition
2c74337e6483 reduced the probability of race-conditions when starting
background repack and prefetch and we saw the difference in our CI instance
with all failures disappearing except one where one call to waitonrepack seems
to returns too early.
I'm not sure what exactly goes wrong but I realized that while the prefetch
operation uses a standard Mercurial lock, the repack operation is using a
custom lock based on `fcntl.flock` on available platforms. As `extutil.flock`
fallback on traditional Mercurial locks on other platforms and the tests are
stable on my laptop, our CI environment and GCC112, I'm sending this patch to
standardize the behavior across environments.
Differential Revision: https://phab.mercurial-scm.org/D6844
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 11 Sep 2019 17:41:13 +0200 |
parents | dc01484606da |
children |
line wrap: on
line source
#testcases flat tree $ . "$TESTDIR/narrow-library.sh" #if tree $ cat << EOF >> $HGRCPATH > [experimental] > treemanifest = 1 > EOF #endif create full repo $ hg init master $ cd master $ mkdir inside $ echo inside > inside/f1 $ mkdir outside $ echo outside > outside/f1 $ hg ci -Aqm 'initial' $ echo modified > inside/f1 $ hg ci -qm 'modify inside' $ echo modified > outside/f1 $ hg ci -qm 'modify outside' $ cd .. $ hg clone --narrow ssh://user@dummy/master narrow --include inside requesting all changes adding changesets adding manifests adding file changes added 3 changesets with 2 changes to 1 files new changesets *:* (glob) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd narrow Can show patch touching paths outside $ hg log -p changeset: 2:* (glob) tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: modify outside changeset: 1:* (glob) user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: modify inside diff -r * -r * inside/f1 (glob) --- a/inside/f1 Thu Jan 01 00:00:00 1970 +0000 +++ b/inside/f1 Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,1 @@ -inside +modified changeset: 0:* (glob) user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: initial diff -r 000000000000 -r * inside/f1 (glob) --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/inside/f1 Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,1 @@ +inside $ hg status --rev 1 --rev 2 Can show copies inside the narrow clone $ hg cp inside/f1 inside/f2 $ hg diff --git diff --git a/inside/f1 b/inside/f2 copy from inside/f1 copy to inside/f2