This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1267

treemanifest: update test for pushing a treeonly commit to a server
ClosedPublic

Authored by durham on Oct 30 2017, 11:29 AM.
Tags
None
Subscribers
phillco

Details

Reviewers
phillco
Group Reviewers
Restricted Project
Commits
rFBHGX7f572ce5e513: treemanifest: update test for pushing a treeonly commit to a server
Summary

The old version of this test relied on the sendflat config being set to false so
it would only send the trees. Since that config is gone, the test then started
sending flat manifests, so it wasn't actually testing what it should've been.

This patch fixes that by making it push a tree only commit and ensuring the
commit hook executes correctly. The test changed a bit, because the hash changed
after the push, because it was a tree only commit on the client (and therefore
used the tree hash) but a hybrid commit on the server (and therefore used the
flat hash).

The patch required some changes to fastmanifest because it wasn't properly looking aside into the tree store for parent information in some cases.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durham created this revision.Oct 30 2017, 11:29 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 30 2017, 11:29 AM
phillco accepted this revision.Nov 1 2017, 3:37 PM
phillco added a subscriber: phillco.
phillco added inline comments.
fastmanifest/implementation.py
826–832

This change doesn't seem to be reflected in the commit message.

This revision is now accepted and ready to land.Nov 1 2017, 3:37 PM
durham edited the summary of this revision. (Show Details)Nov 1 2017, 7:03 PM
durham added inline comments.
fastmanifest/implementation.py
826–832

Fixed

Closed by commit rFBHGX7f572ce5e513: treemanifest: update test for pushing a treeonly commit to a server (authored by durham). · Explain WhyNov 2 2017, 3:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3221

fastmanifest/implementation.py

def copy(self): def copy(self):
memmf = manifest.memmanifestctx(self._manifestlog) memmf = manifest.memmanifestctx(self._manifestlog)
memmf._manifestdict = self.read().copy() memmf._manifestdict = self.read().copy()
return memmf return memmf
@propertycache @propertycache
def parents(self): def parents(self):
if util.safehasattr(self._manifestlog, 'historystore'):
store = self._manifestlog.historystore
try:
p1, p2, linknode, copyfrom = store.getnodeinfo('', self._node)
return p1, p2
except KeyError:
pass
phillcoUnsubmitted
Not Done

This change doesn't seem to be reflected in the commit message.

phillco: This change doesn't seem to be reflected in the commit message.
durhamAuthorUnsubmitted
Not Done

Fixed

durham: Fixed
return self._revlog.parents(self._node) return self._revlog.parents(self._node)
def read(self): def read(self):
if self._hybridmanifest is None: if self._hybridmanifest is None:
def loadflat(): def loadflat():
# This should eventually be made lazy loaded, so consumers can # This should eventually be made lazy loaded, so consumers can
# access the node/p1/linkrev data without having to parse the # access the node/p1/linkrev data without having to parse the
# whole manifest. # whole manifest.

tests/test-treemanifest-server.t

searching for changes searching for changes
remote: +++ hg log -r 15486e46ccf6947fbb0a0209e6ce479e7f87ffae -T '{file_adds}' remote: +++ hg log -r 15486e46ccf6947fbb0a0209e6ce479e7f87ffae -T '{file_adds}'
remote: ++ [[ subdir2/z == \s\u\b\d\i\r\2\/\z ]] remote: ++ [[ subdir2/z == \s\u\b\d\i\r\2\/\z ]]
remote: ++ exit 1 remote: ++ exit 1
remote: prepushrebase.myhook hook exited with status 1 remote: prepushrebase.myhook hook exited with status 1
abort: push failed on remote abort: push failed on remote
[255] [255]
Test pushing only trees with commit hooks Test pushing tree-only commit with commit hooks
TODO: change this to create a treeonly commit and try to push it $ hg up -q '.^'
$ hg push --to mybook $ mkdir subdir2
$ echo >> subdir2/z
$ hg commit -qAm 'add subdir2/z (treeonly)' --config treemanifest.treeonly=True
1 trees fetched over * (glob)
$ hg push --to mybook -r .
pushing to ssh://user@dummy/master pushing to ssh://user@dummy/master
searching for changes searching for changes
remote: +++ hg log -r 15486e46ccf6947fbb0a0209e6ce479e7f87ffae -T '{file_adds}' remote: +++ hg log -r aa8c79ec65bb33cc0dff01df2d70f8635cffc02d -T '{file_adds}'
remote: ++ [[ subdir2/z == \s\u\b\d\i\r\2\/\z ]] remote: ++ [[ subdir2/z == \s\u\b\d\i\r\2\/\z ]]
remote: ++ exit 1 remote: ++ exit 1
remote: prepushrebase.myhook hook exited with status 1 remote: prepushrebase.myhook hook exited with status 1
abort: push failed on remote abort: push failed on remote
[255] [255]
$ mv ../master/.hg/hgrc.bak ../master/.hg/hgrc $ mv ../master/.hg/hgrc.bak ../master/.hg/hgrc
Test pushing only trees (no flats) with pushrebase creates trees on the server Test pushing only trees (no flats) with pushrebase creates trees on the server
$ hg push --to mybook $ hg push --to mybook -r .
pushing to ssh://user@dummy/master pushing to ssh://user@dummy/master
searching for changes searching for changes
remote: pushing 1 changeset: remote: pushing 1 changeset:
remote: 15486e46ccf6 add subdir2/z remote: aa8c79ec65bb add subdir2/z (treeonly)
remote: 1 new changeset from the server will be downloaded
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
$ ls ../master/.hg/store/meta $ ls ../master/.hg/store/meta
subdir subdir
subdir2 subdir2
- Verify it doesn't put anything in the pack directory - Verify it doesn't put anything in the pack directory
$ ls_l ../master/.hg/store | grep pack $ ls_l ../master/.hg/store | grep pack
[1] [1]
$ cd ../master $ cd ../master
Verify flat was updated and tree was updated, even though only tree was sent Verify flat was updated and tree was updated, even though only tree was sent
$ hg debugdata .hg/store/00manifest.i 1 $ hg debugdata .hg/store/00manifest.i 1
subdir/x\x001406e74118627694268417491f018a4a883152f0 (esc) subdir/x\x001406e74118627694268417491f018a4a883152f0 (esc)
subdir2/z\x0069a1b67522704ec122181c0890bd16e9d3e7516a (esc) subdir2/z\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
$ hg debugdata .hg/store/00manifesttree.i 1 $ hg debugdata .hg/store/00manifesttree.i 1
subdir\x00bc0c2c938b929f98b1c31a8c5994396ebb096bf0t (esc) subdir\x00bc0c2c938b929f98b1c31a8c5994396ebb096bf0t (esc)
subdir2\x00ddb35f099a648a43a997aef53123bce309c794fdt (esc) subdir2\x0002fd4859c40acf72a0ce0f75c2f8bef76935f3dct (esc)
$ hg debugdata .hg/store/meta/subdir2/00manifest.i 0 $ hg debugdata .hg/store/meta/subdir2/00manifest.i 0
z\x0069a1b67522704ec122181c0890bd16e9d3e7516a (esc) z\x00cc31c19aff7dbbbed214ec304839a8003fdd0b10 (esc)
Test stripping trees Test stripping trees
$ hg up -q tip $ hg up -q tip
$ echo a >> subdir/a $ echo a >> subdir/a
$ hg commit -Aqm 'modify subdir/a' $ hg commit -Aqm 'modify subdir/a'
$ hg debugindex .hg/store/00manifesttree.i $ hg debugindex .hg/store/00manifesttree.i
rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2
0 0 50 -1 0 85b359fdb09e 000000000000 000000000000 0 0 50 -1 0 85b359fdb09e 000000000000 000000000000
1 50 62 0 1 54cbf534b62b 85b359fdb09e 000000000000 1 50 62 0 1 7e680cec965b 85b359fdb09e 000000000000
2 112 61 1 2 a6f4164c3e4e 54cbf534b62b 000000000000 2 112 61 1 2 d03189a14084 7e680cec965b 000000000000
$ hg debugindex .hg/store/meta/subdir/00manifest.i $ hg debugindex .hg/store/meta/subdir/00manifest.i
rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2
0 0 44 -1 0 bc0c2c938b92 000000000000 000000000000 0 0 44 -1 0 bc0c2c938b92 000000000000 000000000000
1 44 54 0 2 126c4ddee02e bc0c2c938b92 000000000000 1 44 54 0 2 126c4ddee02e bc0c2c938b92 000000000000
$ hg strip -r tip $ hg strip -r tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/master/.hg/strip-backup/0619d7982079-bc05b04f-backup.hg (glob) saved backup bundle to $TESTTMP/master/.hg/strip-backup/4fd4fee9fca1-46b625db-backup.hg (glob)
$ hg debugindex .hg/store/00manifesttree.i $ hg debugindex .hg/store/00manifesttree.i
rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2
0 0 50 -1 0 85b359fdb09e 000000000000 000000000000 0 0 50 -1 0 85b359fdb09e 000000000000 000000000000
1 50 62 0 1 54cbf534b62b 85b359fdb09e 000000000000 1 50 62 0 1 7e680cec965b 85b359fdb09e 000000000000
$ hg debugindex .hg/store/meta/subdir/00manifest.i $ hg debugindex .hg/store/meta/subdir/00manifest.i
rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2
0 0 44 -1 0 bc0c2c938b92 000000000000 000000000000 0 0 44 -1 0 bc0c2c938b92 000000000000 000000000000