( )⚙ D5506 narrow: copy store narrowspec to working copy immediately

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5506

narrow: copy store narrowspec to working copy immediately
ClosedPublic

Authored by martinvonz on Jan 7 2019, 3:45 AM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG50ca531f1f24: narrow: copy store narrowspec to working copy immediately
Summary

We no longer need to delay it until the end of the transaction since
we now restore a backup if the transaction aborts.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jan 7 2019, 3:45 AM
martinvonz updated this revision to Diff 13035.Jan 7 2019, 4:18 AM
martinvonz updated this revision to Diff 13055.Jan 7 2019, 2:02 PM
martinvonz updated this revision to Diff 13146.Jan 10 2019, 4:50 PM
pulkit accepted this revision.Jan 16 2019, 2:23 AM
Closed by commit rHG50ca531f1f24: narrow: copy store narrowspec to working copy immediately (authored by martinvonz). · Explain WhyJan 16 2019, 2:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 13055

hgext/narrow/narrowcommands.py

for i in sorted(oldexcludes): for i in sorted(oldexcludes):
fm.startitem() fm.startitem()
fm.write('status', '%s ', 'X', label='narrow.excluded') fm.write('status', '%s ', 'X', label='narrow.excluded')
fm.write('pat', '%s\n', i, label='narrow.excluded') fm.write('pat', '%s\n', i, label='narrow.excluded')
fm.end() fm.end()
return 0 return 0
if update_working_copy: if update_working_copy:
with repo.wlock(), repo.lock(), repo.transaction('narrow-wc') as tr: with repo.wlock(), repo.lock(), repo.transaction('narrow-wc'):
narrowspec.updateworkingcopy(repo) narrowspec.updateworkingcopy(repo)
narrowspec.copytoworkingcopy(repo, tr) narrowspec.copytoworkingcopy(repo)
return 0 return 0
if not widening and not narrowing: if not widening and not narrowing:
ui.status(_("nothing to widen or narrow\n")) ui.status(_("nothing to widen or narrow\n"))
return 0 return 0
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)

mercurial/hg.py

""" """
default = defaultpath or sourcerepo.ui.config('paths', 'default') default = defaultpath or sourcerepo.ui.config('paths', 'default')
if default: if default:
template = ('[paths]\n' template = ('[paths]\n'
'default = %s\n') 'default = %s\n')
destrepo.vfs.write('hgrc', util.tonativeeol(template % default)) destrepo.vfs.write('hgrc', util.tonativeeol(template % default))
if repositorymod.NARROW_REQUIREMENT in sourcerepo.requirements: if repositorymod.NARROW_REQUIREMENT in sourcerepo.requirements:
with destrepo.wlock(): with destrepo.wlock():
narrowspec.copytoworkingcopy(destrepo, None) narrowspec.copytoworkingcopy(destrepo)
def _postshareupdate(repo, update, checkout=None): def _postshareupdate(repo, update, checkout=None):
"""Maybe perform a working directory update after a shared repo is created. """Maybe perform a working directory update after a shared repo is created.
``update`` can be a boolean or a revision to update to. ``update`` can be a boolean or a revision to update to.
""" """
if not update: if not update:
return return

mercurial/localrepo.py

em = matchmod.exact(match._root, match._cwd, match.files()) em = matchmod.exact(match._root, match._cwd, match.files())
nm = matchmod.unionmatcher([self._narrowmatch, em]) nm = matchmod.unionmatcher([self._narrowmatch, em])
return matchmod.intersectmatchers(match, nm) return matchmod.intersectmatchers(match, nm)
return matchmod.intersectmatchers(match, self._narrowmatch) return matchmod.intersectmatchers(match, self._narrowmatch)
return self._narrowmatch return self._narrowmatch
def setnarrowpats(self, newincludes, newexcludes): def setnarrowpats(self, newincludes, newexcludes):
narrowspec.save(self, newincludes, newexcludes) narrowspec.save(self, newincludes, newexcludes)
narrowspec.copytoworkingcopy(self, self.currenttransaction()) narrowspec.copytoworkingcopy(self)
self.invalidate(clearfilecache=True) self.invalidate(clearfilecache=True)
# So the next access won't be considered a conflict # So the next access won't be considered a conflict
# TODO: It seems like there should be a way of doing this that # TODO: It seems like there should be a way of doing this that
# doesn't involve replacing these attributes. # doesn't involve replacing these attributes.
self.narrowpats = newincludes, newexcludes self.narrowpats = newincludes, newexcludes
self._narrowmatch = narrowspec.match(self.root, include=newincludes, self._narrowmatch = narrowspec.match(self.root, include=newincludes,
exclude=newexcludes) exclude=newexcludes)

mercurial/narrowspec.py

return parseconfig(repo.ui, spec) return parseconfig(repo.ui, spec)
def save(repo, includepats, excludepats): def save(repo, includepats, excludepats):
validatepatterns(includepats) validatepatterns(includepats)
validatepatterns(excludepats) validatepatterns(excludepats)
spec = format(includepats, excludepats) spec = format(includepats, excludepats)
repo.svfs.write(FILENAME, spec) repo.svfs.write(FILENAME, spec)
def copytoworkingcopy(repo, tr): def copytoworkingcopy(repo):
if tr:
def write(file):
spec = repo.svfs.read(FILENAME)
file.write(spec)
file.close()
tr.addfilegenerator('narrowspec', (DIRSTATE_FILENAME,), write,
location='plain')
else:
spec = repo.svfs.read(FILENAME) spec = repo.svfs.read(FILENAME)
repo.vfs.write(DIRSTATE_FILENAME, spec) repo.vfs.write(DIRSTATE_FILENAME, spec)
def savebackup(repo, backupname): def savebackup(repo, backupname):
if repository.NARROW_REQUIREMENT not in repo.requirements: if repository.NARROW_REQUIREMENT not in repo.requirements:
return return
svfs = repo.svfs svfs = repo.svfs
svfs.tryunlink(backupname) svfs.tryunlink(backupname)
util.copyfile(svfs.join(FILENAME), svfs.join(backupname), hardlink=True) util.copyfile(svfs.join(FILENAME), svfs.join(backupname), hardlink=True)