# HG changeset patch # User Martin von Zweigbergk # Date 2019-10-19 00:46:37 # Node ID 73e6d3346e4f8f856a5ebdd586a8ce33fc656f63 # Parent ae5e39512ca06908a55fd9b19b6c35e6166d8105 largefiles: move lfstatus context manager to lfutil Differential Revision: https://phab.mercurial-scm.org/D7139 diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py --- a/hgext/largefiles/lfutil.py +++ b/hgext/largefiles/lfutil.py @@ -9,6 +9,7 @@ '''largefiles utility code: must not import other modules in this package.''' from __future__ import absolute_import +import contextlib import copy import hashlib import os @@ -39,6 +40,16 @@ longname = b'largefiles' # -- Private worker functions ------------------------------------------ +@contextlib.contextmanager +def lfstatus(repo): + oldvalue = getattr(repo, 'lfstatus', False) + repo.lfstatus = True + try: + yield + finally: + repo.lfstatus = oldvalue + + def getminsize(ui, assumelfiles, opt, default=10): lfsize = opt if not lfsize and assumelfiles: diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -9,7 +9,6 @@ '''Overridden Mercurial commands and functions for the largefiles extension''' from __future__ import absolute_import -import contextlib import copy import os @@ -50,6 +49,8 @@ from . import ( eh = exthelper.exthelper() +lfstatus = lfutil.lfstatus + # -- Utility functions: commonly/repeatedly needed functionality --------------- @@ -158,16 +159,6 @@ def addlargefiles(ui, repo, isaddremove, return added, bad -@contextlib.contextmanager -def lfstatus(repo): - oldvalue = getattr(repo, 'lfstatus', False) - repo.lfstatus = True - try: - yield - finally: - repo.lfstatus = oldvalue - - def removelargefiles(ui, repo, isaddremove, matcher, uipathfn, dryrun, **opts): after = opts.get('after') m = composelargefilematcher(matcher, repo[None].manifest())