comparison mercurial/sparse.py @ 48559:6bd42f9bc97e

merge: with stable
author Augie Fackler <augie@google.com>
date Tue, 04 Jan 2022 14:21:22 -0500
parents b74ee41addee
children a62ba3345534
comparison
equal deleted inserted replaced
48558:823e906d879d 48559:6bd42f9bc97e
716 716
717 Only one of the actions may be performed. 717 Only one of the actions may be performed.
718 718
719 The new config is written out and a working directory refresh is performed. 719 The new config is written out and a working directory refresh is performed.
720 """ 720 """
721 with repo.wlock(), repo.dirstate.parentchange(): 721 with repo.wlock(), repo.lock(), repo.dirstate.parentchange():
722 raw = repo.vfs.tryread(b'sparse') 722 raw = repo.vfs.tryread(b'sparse')
723 oldinclude, oldexclude, oldprofiles = parseconfig( 723 oldinclude, oldexclude, oldprofiles = parseconfig(
724 repo.ui, raw, b'sparse' 724 repo.ui, raw, b'sparse'
725 ) 725 )
726 726