From b1cdf3f0e6bdc187406e22b44d666f0614d51ea7 Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Wed, 5 Apr 2017 15:49:08 -0700 Subject: [PATCH] lfs: remove setup.py Summary: The logic in `setup.py` is now simple enough to be moved to `reposetup`. `setup.py` becomes unused and gets removed. Test Plan: `rt test-lfs.t` Reviewers: #mercurial, simonfar Reviewed By: simonfar Subscribers: mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4813193 Signature: t1:4813193:1491212154:0238ea448269b0e5516c927c1fa989d6d9130d4a --- hgext3rd/lfs/__init__.py | 13 ++++++++----- hgext3rd/lfs/setup.py | 25 ------------------------- 2 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 hgext3rd/lfs/setup.py diff --git a/hgext3rd/lfs/__init__.py b/hgext3rd/lfs/__init__.py index 3291c91f46..c780dd7e79 100644 --- a/hgext3rd/lfs/__init__.py +++ b/hgext3rd/lfs/__init__.py @@ -35,7 +35,7 @@ from mercurial import ( ) from . import ( - setup, + blobstore, wrapper, ) @@ -48,10 +48,13 @@ def reposetup(ui, repo): # Do not setup blobstores if bypass is True return - setup.threshold(ui, repo) - setup.localblobstore(ui, repo) - setup.chunking(ui, repo) - setup.remoteblobstore(ui, repo) + threshold = repo.ui.configbytes('lfs', 'threshold', None) + chunksize = repo.ui.configbytes('lfs', 'chunksize', None) + + repo.svfs.options['lfsthreshold'] = threshold + repo.svfs.options['lfschunksize'] = chunksize + repo.svfs.lfslocalblobstore = blobstore.local(repo) + repo.svfs.lfsremoteblobstore = blobstore.remote(repo) # Push hook repo.prepushoutgoinghooks.add('lfs', wrapper.prepush) diff --git a/hgext3rd/lfs/setup.py b/hgext3rd/lfs/setup.py deleted file mode 100644 index 69ddee651c..0000000000 --- a/hgext3rd/lfs/setup.py +++ /dev/null @@ -1,25 +0,0 @@ -# coding=UTF-8 - -from __future__ import absolute_import - -from . import ( - blobstore, -) - -def threshold(ui, repo): - """Configure threshold for a file to be handled by LFS""" - threshold = ui.configbytes('lfs', 'threshold', None) - repo.svfs.options['lfsthreshold'] = threshold - -def localblobstore(ui, repo): - """Configure local blobstore""" - repo.svfs.lfslocalblobstore = blobstore.local(repo) - -def chunking(ui, repo): - """Configure chunking for massive blobs to be split into smaller chunks.""" - chunksize = ui.configbytes('lfs', 'chunksize', None) - repo.svfs.options['lfschunksize'] = chunksize - -def remoteblobstore(ui, repo): - """Configure remote blobstore.""" - repo.svfs.lfsremoteblobstore = blobstore.remote(repo)