( )⚙ D4095 narrow: extract part of narrowspec backup to core

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4095

narrow: extract part of narrowspec backup to core
ClosedPublic

Authored by martinvonz on Aug 3 2018, 5:23 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfed6fe856333: narrow: extract part of narrowspec backup to core
Summary

Just a little preparation for the next patch.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 3 2018, 5:23 PM
pulkit accepted this revision.Aug 3 2018, 5:40 PM
Closed by commit rHGfed6fe856333: narrow: extract part of narrowspec backup to core (authored by martinvonz). · Explain WhyAug 3 2018, 6:01 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowdirstate.py (13 lines)
Mmercurial/narrowspec.py (10 lines)

Diff 9857

hgext/narrow/narrowdirstate.py

# narrowdirstate.py - extensions to mercurial dirstate to support narrow clones # narrowdirstate.py - extensions to mercurial dirstate to support narrow clones
# #
# Copyright 2017 Google, Inc. # Copyright 2017 Google, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
error, error,
match as matchmod, match as matchmod,
narrowspec, narrowspec,
util as hgutil,
) )
def wrapdirstate(repo, dirstate): def wrapdirstate(repo, dirstate):
"""Add narrow spec dirstate ignore, block changes outside narrow spec.""" """Add narrow spec dirstate ignore, block changes outside narrow spec."""
def _editfunc(fn): def _editfunc(fn):
def _wrapper(self, *args): def _wrapper(self, *args):
dirstate = repo.dirstate dirstate = repo.dirstate
def rebuild(self, parent, allfiles, changedfiles=None): def rebuild(self, parent, allfiles, changedfiles=None):
if changedfiles is None: if changedfiles is None:
# Rebuilding entire dirstate, let's filter allfiles to match the # Rebuilding entire dirstate, let's filter allfiles to match the
# narrowspec. # narrowspec.
allfiles = [f for f in allfiles if repo.narrowmatch()(f)] allfiles = [f for f in allfiles if repo.narrowmatch()(f)]
super(narrowdirstate, self).rebuild(parent, allfiles, changedfiles) super(narrowdirstate, self).rebuild(parent, allfiles, changedfiles)
def restorebackup(self, tr, backupname): def restorebackup(self, tr, backupname):
self._opener.rename(_narrowbackupname(backupname), narrowspec.restorebackup(self._opener,
narrowspec.FILENAME, checkambig=True) _narrowbackupname(backupname))
super(narrowdirstate, self).restorebackup(tr, backupname) super(narrowdirstate, self).restorebackup(tr, backupname)
def savebackup(self, tr, backupname): def savebackup(self, tr, backupname):
super(narrowdirstate, self).savebackup(tr, backupname) super(narrowdirstate, self).savebackup(tr, backupname)
narrowspec.savebackup(self._opener, _narrowbackupname(backupname))
narrowbackupname = _narrowbackupname(backupname)
self._opener.tryunlink(narrowbackupname)
hgutil.copyfile(self._opener.join(narrowspec.FILENAME),
self._opener.join(narrowbackupname), hardlink=True)
def clearbackup(self, tr, backupname): def clearbackup(self, tr, backupname):
super(narrowdirstate, self).clearbackup(tr, backupname) super(narrowdirstate, self).clearbackup(tr, backupname)
self._opener.unlink(_narrowbackupname(backupname)) narrowspec.clearbackup(self._opener, _narrowbackupname(backupname))
dirstate.__class__ = narrowdirstate dirstate.__class__ = narrowdirstate
return dirstate return dirstate

mercurial/narrowspec.py

return set(), set() return set(), set()
raise raise
return _parsestoredpatterns(spec) return _parsestoredpatterns(spec)
def save(repo, includepats, excludepats): def save(repo, includepats, excludepats):
spec = format(includepats, excludepats) spec = format(includepats, excludepats)
repo.vfs.write(FILENAME, spec) repo.vfs.write(FILENAME, spec)
def savebackup(vfs, backupname):
vfs.tryunlink(backupname)
util.copyfile(vfs.join(FILENAME), vfs.join(backupname), hardlink=True)
def restorebackup(vfs, backupname):
vfs.rename(backupname, FILENAME, checkambig=True)
def clearbackup(vfs, backupname):
vfs.unlink(backupname)
def restrictpatterns(req_includes, req_excludes, repo_includes, repo_excludes): def restrictpatterns(req_includes, req_excludes, repo_includes, repo_excludes):
r""" Restricts the patterns according to repo settings, r""" Restricts the patterns according to repo settings,
results in a logical AND operation results in a logical AND operation
:param req_includes: requested includes :param req_includes: requested includes
:param req_excludes: requested excludes :param req_excludes: requested excludes
:param repo_includes: repo includes :param repo_includes: repo includes
:param repo_excludes: repo excludes :param repo_excludes: repo excludes