This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3719

narrowbundle2: when we handle a widen, mark the operation as unsafe
ClosedPublic

Authored by durin42 on Jun 12 2018, 11:31 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1ad873c3e4a4: narrowbundle2: when we handle a widen, mark the operation as unsafe
Summary

We have to manually drive the context manager here since the logic is
awkwardly split between a couple of places.

Diff Detail

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

Event Timeline

durin42 created this revision.Jun 12 2018, 11:31 AM
durin42 updated this revision to Diff 9329.Jun 27 2018, 11:47 AM
Closed by commit rHG1ad873c3e4a4: narrowbundle2: when we handle a widen, mark the operation as unsafe (authored by durin42). · Explain WhyJul 3 2018, 1:40 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowbundle2.py (3 lines)

Diff 9414

hgext/narrow/narrowbundle2.py

pass pass
def recordchange(self, tr): # legacy version def recordchange(self, tr): # legacy version
pass pass
repo._bookmarks = dummybmstore() repo._bookmarks = dummybmstore()
chgrpfile = repair.strip(op.ui, repo, list(clkills), backup=True, chgrpfile = repair.strip(op.ui, repo, list(clkills), backup=True,
topic='widen') topic='widen')
repo._bookmarks = bmstore repo._bookmarks = bmstore
if chgrpfile: if chgrpfile:
op._widen_uninterr = repo.ui.uninterruptable()
op._widen_uninterr.__enter__()
# presence of _widen_bundle attribute activates widen handler later # presence of _widen_bundle attribute activates widen handler later
op._widen_bundle = chgrpfile op._widen_bundle = chgrpfile
# Set the new narrowspec if we're widening. The setnewnarrowpats() method # Set the new narrowspec if we're widening. The setnewnarrowpats() method
# will currently always be there when using the core+narrowhg server, but # will currently always be there when using the core+narrowhg server, but
# other servers may include a changespec part even when not widening (e.g. # other servers may include a changespec part even when not widening (e.g.
# because we're deepening a shallow repo). # because we're deepening a shallow repo).
if util.safehasattr(repo, 'setnewnarrowpats'): if util.safehasattr(repo, 'setnewnarrowpats'):
repo.setnewnarrowpats() repo.setnewnarrowpats()
try: try:
undovfs.unlink(undofile) undovfs.unlink(undofile)
except OSError as e: except OSError as e:
if e.errno != errno.ENOENT: if e.errno != errno.ENOENT:
ui.warn(_('error removing %s: %s\n') % ui.warn(_('error removing %s: %s\n') %
(undovfs.join(undofile), stringutil.forcebytestr(e))) (undovfs.join(undofile), stringutil.forcebytestr(e)))
# Remove partial backup only if there were no exceptions # Remove partial backup only if there were no exceptions
op._widen_uninterr.__exit__(None, None, None)
vfs.unlink(chgrpfile) vfs.unlink(chgrpfile)
def setup(): def setup():
"""Enable narrow repo support in bundle2-related extension points.""" """Enable narrow repo support in bundle2-related extension points."""
extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps_narrow) extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps_narrow)
getbundleargs = wireprototypes.GETBUNDLE_ARGUMENTS getbundleargs = wireprototypes.GETBUNDLE_ARGUMENTS