# HG changeset patch # User Boris Feld <boris.feld@octobus.net> # Date 1542246391 -3600 # Thu Nov 15 02:46:31 2018 +0100 # Node ID d5622dfe4ba3942ad4561e44fcd9d762f4c24160 # Parent 64cdfcc73706bf75d8304917ed0666f313221ab6 cache: create `wcache` directory at init time The cache directory will be needed very quickly, so it seems simpler to create it early to make sure it has the same owner and permission than the other directory in the repository. diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -3012,6 +3012,7 @@ hgvfs.makedir(notindexed=True) if 'sharedrepo' not in createopts: hgvfs.mkdir(b'cache') + hgvfs.mkdir(b'wcache') if b'store' in requirements and 'sharedrepo' not in createopts: hgvfs.mkdir(b'store') diff --git a/tests/test-bundle.t b/tests/test-bundle.t --- a/tests/test-bundle.t +++ b/tests/test-bundle.t @@ -212,6 +212,7 @@ cache requires store + wcache Pull ../full.hg into empty (with hook) diff --git a/tests/test-empty.t b/tests/test-empty.t --- a/tests/test-empty.t +++ b/tests/test-empty.t @@ -23,6 +23,7 @@ cache requires store + wcache Should be empty: diff --git a/tests/test-inherit-mode.t b/tests/test-inherit-mode.t --- a/tests/test-inherit-mode.t +++ b/tests/test-inherit-mode.t @@ -42,7 +42,7 @@ $ hg init repo $ cd repo - $ chmod 0770 .hg/store .hg/cache + $ chmod 0770 .hg/store .hg/cache .hg/wcache before commit store can be written by the group, other files cannot @@ -54,6 +54,7 @@ 00770 ./.hg/cache/ 00600 ./.hg/requires 00770 ./.hg/store/ + 00770 ./.hg/wcache/ $ mkdir dir $ touch foo dir/bar @@ -120,6 +121,7 @@ 00770 ../push/.hg/cache/ 00660 ../push/.hg/requires 00770 ../push/.hg/store/ + 00770 ../push/.hg/wcache/ $ umask 077 $ hg -q push ../push @@ -155,6 +157,7 @@ 00660 ../push/.hg/undo.branch 00660 ../push/.hg/undo.desc 00660 ../push/.hg/undo.dirstate + 00770 ../push/.hg/wcache/ Test that we don't lose the setgid bit when we call chmod. diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t --- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -1242,6 +1242,7 @@ ../shared/subrepo-1/.hg/hgrc ../shared/subrepo-1/.hg/requires ../shared/subrepo-1/.hg/sharedpath + ../shared/subrepo-1/.hg/wcache ../shared/subrepo-2 ../shared/subrepo-2/.hg ../shared/subrepo-2/.hg/branch