This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1485

treemanifest: automatically backfill missing manifests during hg pull
ClosedPublic

Authored by durham on Nov 21 2017, 3:27 PM.
Tags
None
Subscribers
None

Details

Reviewers
simonfar
Group Reviewers
Restricted Project
Commits
rFBHGX538864f0863a: treemanifest: automatically backfill missing manifests during hg pull
Summary

Previously, if a repo went from treeonly to not treeonly, the user had to run a
command to backfill the missing flat manifests. This patch makes it happen
automatically as part of hg pull.

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.Nov 21 2017, 3:27 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 21 2017, 3:27 PM
simonfar accepted this revision.Nov 27 2017, 11:50 AM
This revision is now accepted and ready to land.Nov 27 2017, 11:50 AM
Closed by commit rFBHGX538864f0863a: treemanifest: automatically backfill missing manifests during hg pull (authored by durham). · Explain WhyNov 28 2017, 5:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3919

tests/test-treemanifest-treeonly.t

1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
Switch back to hybrid mode Switch back to hybrid mode
$ cd ../client $ cd ../client
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [treemanifest] > [treemanifest]
> treeonly=False > treeonly=False
> EOF > EOF
$ cp .hg/store/00manifest.i .hg/store/00manifest.i.bak
$ cp .hg/store/00changelog.i .hg/store/00changelog.i.bak
- Auto-backfill on pull
$ hg pull $ hg pull
backfilling missing flat manifests
adding changesets
adding manifests
adding file changes
added 0 changesets with 0 changes to 0 files
pulling from ssh://user@dummy/master pulling from ssh://user@dummy/master
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
transaction abort! adding file changes
rollback completed added 1 changesets with 0 changes to 0 files (+1 heads)
abort: 00manifest.i@d9920715ba88: unknown parent! new changesets 4f84204095e0
[255] (run 'hg heads .' to see heads, 'hg merge' to merge)
$ cp .hg/store/00manifest.i.bak .hg/store/00manifest.i
$ cp .hg/store/00changelog.i.bak .hg/store/00changelog.i
- Manually backfill via command
$ hg backfillmanifestrevlog $ hg backfillmanifestrevlog
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 0 changesets with 0 changes to 0 files added 0 changesets with 0 changes to 0 files
$ hg pull $ hg pull
pulling from ssh://user@dummy/master pulling from ssh://user@dummy/master
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads) added 1 changesets with 0 changes to 0 files (+1 heads)
new changesets 4f84204095e0 new changesets 4f84204095e0
(run 'hg heads .' to see heads, 'hg merge' to merge) (run 'hg heads .' to see heads, 'hg merge' to merge)

treemanifest/__init__.py

def getfallbackpath(repo): def getfallbackpath(repo):
if util.safehasattr(repo, 'fallbackpath'): if util.safehasattr(repo, 'fallbackpath'):
return repo.fallbackpath return repo.fallbackpath
else: else:
return repo.ui.config('paths', 'default') return repo.ui.config('paths', 'default')
def pull(orig, ui, repo, *pats, **opts): def pull(orig, ui, repo, *pats, **opts):
# If we're not in treeonly mode, and we're missing public commits from the
# revlog, backfill them.
if not ui.configbool('treemanifest', 'treeonly'):
tippublicrevs = repo.revs('last(public())')
if tippublicrevs:
ctx = repo[tippublicrevs.first()]
mfnode = ctx.manifestnode()
mfrevlog = repo.manifestlog._revlog
if mfnode not in mfrevlog.nodemap:
ui.status(_("backfilling missing flat manifests\n"))
backfillmanifestrevlog(ui, repo)
# If special arguments were passed, we can't reuse the pull connection # If special arguments were passed, we can't reuse the pull connection
if opts.get('ssh') or opts.get('remotecmd'): if opts.get('ssh') or opts.get('remotecmd'):
return orig(ui, repo, *pats, **opts) return orig(ui, repo, *pats, **opts)
# Use a connection from the connection pool for the pull, so it can be # Use a connection from the connection pool for the pull, so it can be
# reused by future requests, like tree prefetching. # reused by future requests, like tree prefetching.
fallbackpath = getfallbackpath(repo) fallbackpath = getfallbackpath(repo)
with repo.connectionpool.get(fallbackpath) as conn: with repo.connectionpool.get(fallbackpath) as conn: