# HG changeset patch # User Matt Harbison # Date 2014-07-18 00:17:17 # Node ID ac3b3a2d976d1b8ea8d81920f0f53a6b575c0495 # Parent 792ebd7dc5f64095d172f93e33eb1c9172ebbd6d largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate Previously, the directory '.hg/largefiles' would always be created if it didn't exist when the lfdirstate was opened. If there were no standin files, no dirstate file would be created in the directory. The end result was that enabling the largefiles extension globally, but not explicitly adding a largefile would result in the repository eventually sprouting this directory. Creation of this directory effectively changes readonly operations like summary and status into operations that require write access. Without write access, commands that would succeed without the extension loaded would abort with a surprising error when the extension is loaded, but not actively used: $ hg sum -R /tmp/thg --config extensions.largefiles= parent: 16541:00dc703d5aed repowidget: specify incoming bundle by plain file path to avoid url parsing branch: default abort: Permission denied: '/tmp/thg/.hg/largefiles' This change is simpler than changing the callers of openlfdirstate() to use the 'create' parameter that was introduced in ae57920ac188, and probably how that should have been implemented in the first place. diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py --- a/hgext/largefiles/lfutil.py +++ b/hgext/largefiles/lfutil.py @@ -123,9 +123,13 @@ def openlfdirstate(ui, repo, create=True # it. This ensures that we create it on the first meaningful # largefiles operation in a new clone. if create and not os.path.exists(os.path.join(lfstoredir, 'dirstate')): - util.makedirs(lfstoredir) matcher = getstandinmatcher(repo) - for standin in repo.dirstate.walk(matcher, [], False, False): + standins = repo.dirstate.walk(matcher, [], False, False) + + if len(standins) > 0: + util.makedirs(lfstoredir) + + for standin in standins: lfile = splitstandin(standin) lfdirstate.normallookup(lfile) return lfdirstate diff --git a/tests/test-issue3084.t b/tests/test-issue3084.t --- a/tests/test-issue3084.t +++ b/tests/test-issue3084.t @@ -154,7 +154,20 @@ Prepare test repo: $ hg init merges $ cd merges $ touch f1 - $ hg ci -Aqm "0-root" + $ hg ci -Aqm "0-root" --config extensions.largefiles=! + +Ensure that .hg/largefiles isn't created before largefiles are added +#if unix-permissions + $ chmod 555 .hg +#endif + $ hg status +#if unix-permissions + $ chmod 755 .hg +#endif + + $ find .hg/largefiles + find: `.hg/largefiles': No such file or directory + [1] ancestor is "normal": $ echo normal > f