From patchwork Tue Oct 5 11:44:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D11611: largefiles: add tr backup for largefilesdirstate From: phabricator X-Patchwork-Id: 49934 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Tue, 5 Oct 2021 11:44:08 +0000 pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will help us in automatically restoring the largefilesdirstate if a transaction is rolled back. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11611 AFFECTED FILES hgext/largefiles/lfutil.py tests/test-largefiles-cache.t CHANGE DETAILS To: pulkit, #hg-reviewers Cc: mercurial-patches, mercurial-devel diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t --- a/tests/test-largefiles-cache.t +++ b/tests/test-largefiles-cache.t @@ -185,10 +185,12 @@ $ find share_dst/.hg/largefiles/* | sort share_dst/.hg/largefiles/dirstate + share_dst/.hg/largefiles/undo.backup.dirstate $ find src/.hg/largefiles/* | egrep "(dirstate|$hash)" | sort src/.hg/largefiles/dirstate src/.hg/largefiles/e2fb5f2139d086ded2cb600d5a91a196e76bf020 + src/.hg/largefiles/undo.backup.dirstate Verify that backwards compatibility is maintained for old storage layout $ mv src/.hg/largefiles/$hash share_dst/.hg/largefiles diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py --- a/hgext/largefiles/lfutil.py +++ b/hgext/largefiles/lfutil.py @@ -195,6 +195,8 @@ # (1) disable PENDING mode always # (lfdirstate isn't yet managed as a part of the transaction) # (2) avoid develwarn 'use dirstate.write with ....' + if tr: + tr.addbackup(b'largefiles/dirstate', location=b'plain') super(largefilesdirstate, self).write(None)