This is an archive of the discontinued Mercurial Phabricator instance.

Differential D162

upgradegeneraldelta: update to work with upstream revlog changes
ClosedPublic

Authored by simpkins on Jul 20 2017, 10:15 PM.
Tags
None
Subscribers
None

Details

Reviewers
sid0
Group Reviewers
Restricted Project
Commits
rFBHGX407c83f671b2: upgradegeneraldelta: update to work with upstream revlog changes
Summary

Upstream mercurial commit ac6446611ad2 changed revlog.versionformat from a
string to a struct.Struct object. The upgradegeneraldelta extension needs to
be updated to deal with this.

Test Plan

Confirmed existing tests pass, and manually tested using pull with
upgradegeneraldelta enabled. I believe this extension shouldn't really be in
use in any repositories any more, but somehow some users did run into this.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

simpkins created this revision.Jul 20 2017, 10:15 PM
sid0 accepted this revision.Jul 20 2017, 10:36 PM

Honestly, I'd just delete this extension -- it is no longer useful and I'm not aware of any non-FB users of it.

This revision is now accepted and ready to land.Jul 20 2017, 10:36 PM
Closed by commit rFBHGX407c83f671b2: upgradegeneraldelta: update to work with upstream revlog changes (authored by simpkins). · Explain WhyJul 21 2017, 11:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/upgradegeneraldelta.py (4 lines)

Diff 353

hgext3rd/upgradegeneraldelta.py

:upgradegeneraldelta.backup: Set to False to disable backing up the old manifest :upgradegeneraldelta.backup: Set to False to disable backing up the old manifest
as 00manifestold.{i,d}. Default is True. as 00manifestold.{i,d}. Default is True.
''' '''
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import commands, extensions, revlog, util from mercurial import commands, extensions, revlog, util
import os, struct, weakref import os, weakref
def wrappull(orig, ui, repo, *args, **kwargs): def wrappull(orig, ui, repo, *args, **kwargs):
_upgrade(ui, repo) _upgrade(ui, repo)
orig(ui, repo, *args, **kwargs) orig(ui, repo, *args, **kwargs)
def _upgrade(ui, repo): def _upgrade(ui, repo):
if not util.safehasattr(repo, 'svfs'): if not util.safehasattr(repo, 'svfs'):
return return
if not ui.configbool('upgradegeneraldelta', 'upgrade'): if not ui.configbool('upgradegeneraldelta', 'upgrade'):
return return
f = repo.svfs('00manifest.i') f = repo.svfs('00manifest.i')
i = f.read(4) i = f.read(4)
f.close() f.close()
if len(i) < 4: if len(i) < 4:
# empty manifest # empty manifest
return return
# probably only works with revlogng -- it became the default years ago so # probably only works with revlogng -- it became the default years ago so
# that's fine # that's fine
v = struct.unpack(revlog.versionformat, i)[0] v = revlog.versionformat_unpack(i)[0]
isgeneraldelta = v & revlog.FLAG_GENERALDELTA isgeneraldelta = v & revlog.FLAG_GENERALDELTA
if isgeneraldelta: if isgeneraldelta:
return return
# write out a new revlog, this time with generaldelta # write out a new revlog, this time with generaldelta
oldopts = repo.svfs.options oldopts = repo.svfs.options
lock = repo.lock() lock = repo.lock()
tr = repo.transaction('upgradegeneraldelta') tr = repo.transaction('upgradegeneraldelta')