facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

treemanifest: fix pack transaction closing

Browse Source 
Summary:
When adding manifests, we keep the mutable packs open for the duration of the
transaction. The old code had a bug where it didn't realize the pack files were
already open and it would open new ones. This meant only the last pack file was
finalized and the rest were left open as unfinished temp files.

This patch fixes it and adds a test.

Test Plan: Added a test

Reviewers: #mercurial, quark

Reviewed By: quark

Subscribers: medson, mjpieters

Differential Revision: https://phabricator.intern.facebook.com/D5297004

Signature: t1:5297004:1498086398:5cbe6e6c78d02f09d341417ec3a745853dac9849
This commit is contained in:
Durham Goode 2017-06-21 16:59:44 -07:00
parent d4f324c561
commit d31e2ec441
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fastmanifest/implementation.py
View File

@ -987,7 +987,7 @@ class manifestfactory(object):
fflag = m.flags(filename)
newtree.set(filename, fnode, fflag)
if not util.safehasattr(transaction, 'treepack'):
if not util.safehasattr(transaction, 'treedatapack'):
packpath = shallowutil.getlocalpackpath(
origself.opener.vfs.base,
'manifests')

31
tests/test-treemanifest.t
View File

@ -103,3 +103,34 @@ Test config validation
$ hg log -r . --config extensions.treemanifest=!
abort: fastmanifest.usetree cannot be enabled without enabling treemanifest
[255]
Test rebasing a stack of commits results in a pack with all the trees
$ echo >> subdir/y
$ hg commit -qAm 'modify subdir/y'
$ echo >> subdir/y
$ hg commit -Am 'modify subdir/y again'
$ hg rebase -d 0 -s '.^'
rebasing 3:6a2476258ba5 "modify subdir/y"
rebasing 4:f096b21e165f "modify subdir/y again" (tip)
saved backup bundle to $TESTTMP/client/.hg/strip-backup/6a2476258ba5-a90056a1-backup.hg (glob)
$ hg log -r '.^::.' -T '{manifest}\n'
3:0d05c20bb7eb
4:8289b85c6a30
$ hg debugdatapack .hg/store/packs/manifests/5a5fb42e99986c90ac86b57d184561c44238b7b7.datapack
subdir
Node Delta Base Delta Length
a4e2f032ee0f 000000000000 43
Node Delta Base Delta Length
0d05c20bb7eb 000000000000 92
subdir
Node Delta Base Delta Length
ad0a48a2ec1e 000000000000 43
Node Delta Base Delta Length
8289b85c6a30 000000000000 92