This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5505

narrow: include working copy narrowspec in transaction journal
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3b35ebdb9f8c: narrow: include working copy narrowspec in transaction journal
Summary

Now that we have separate narrowspecs for the store and the working
copy, we need to include both in the transaction journal.

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 13054.Jan 7 2019, 2:02 PM
pulkit added a subscriber: pulkit.Jan 10 2019, 1:54 PM
pulkit added inline comments.
mercurial/narrowspec.py
193–196

This change should be moved to previous patch or a separate patch.

martinvonz marked an inline comment as done.Jan 10 2019, 4:50 PM
martinvonz updated this revision to Diff 13145.
martinvonz added a comment.Jan 10 2019, 4:51 PM

Addressed comment

pulkit accepted this revision.Jan 16 2019, 2:21 AM
Closed by commit rHG3b35ebdb9f8c: narrow: include working copy narrowspec in transaction journal (authored by martinvonz). · Explain WhyJan 16 2019, 2:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (3 lines)
Mmercurial/narrowspec.py (6 lines)

Diff 13027

mercurial/localrepo.py

# transaction, if tr.addfilegenerator (via # transaction, if tr.addfilegenerator (via
# dirstate.write or so) isn't invoked while # dirstate.write or so) isn't invoked while
# transaction running # transaction running
repo.dirstate.write(None) repo.dirstate.write(None)
else: else:
# discard all changes (including ones already written # discard all changes (including ones already written
# out) in this transaction # out) in this transaction
narrowspec.restorebackup(self, 'journal.narrowspec') narrowspec.restorebackup(self, 'journal.narrowspec')
narrowspec.restorewcbackup(self, 'journal.narrowspec')
repo.dirstate.restorebackup(None, 'journal.dirstate') repo.dirstate.restorebackup(None, 'journal.dirstate')
repo.invalidate(clearfilecache=True) repo.invalidate(clearfilecache=True)
tr = transaction.transaction(rp, self.svfs, vfsmap, tr = transaction.transaction(rp, self.svfs, vfsmap,
"journal", "journal",
"undo", "undo",
aftertrans(renames), aftertrans(renames),
(self.svfs, 'journal.phaseroots')) (self.svfs, 'journal.phaseroots'))
def undofiles(self): def undofiles(self):
return [(vfs, undoname(x)) for vfs, x in self._journalfiles()] return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
@unfilteredmethod @unfilteredmethod
def _writejournal(self, desc): def _writejournal(self, desc):
self.dirstate.savebackup(None, 'journal.dirstate') self.dirstate.savebackup(None, 'journal.dirstate')
narrowspec.savewcbackup(self, 'journal.narrowspec')
narrowspec.savebackup(self, 'journal.narrowspec') narrowspec.savebackup(self, 'journal.narrowspec')
self.vfs.write("journal.branch", self.vfs.write("journal.branch",
encoding.fromlocal(self.dirstate.branch())) encoding.fromlocal(self.dirstate.branch()))
self.vfs.write("journal.desc", self.vfs.write("journal.desc",
"%d\n%s\n" % (len(self), desc)) "%d\n%s\n" % (len(self), desc))
self.vfs.write("journal.bookmarks", self.vfs.write("journal.bookmarks",
self.vfs.tryread("bookmarks")) self.vfs.tryread("bookmarks"))
self.svfs.write("journal.phaseroots", self.svfs.write("journal.phaseroots",
parentgone = (parents[0] not in self.changelog.nodemap or parentgone = (parents[0] not in self.changelog.nodemap or
parents[1] not in self.changelog.nodemap) parents[1] not in self.changelog.nodemap)
if parentgone: if parentgone:
# prevent dirstateguard from overwriting already restored one # prevent dirstateguard from overwriting already restored one
dsguard.close() dsguard.close()
narrowspec.restorebackup(self, 'undo.narrowspec') narrowspec.restorebackup(self, 'undo.narrowspec')
narrowspec.restorewcbackup(self, 'undo.narrowspec')
self.dirstate.restorebackup(None, 'undo.dirstate') self.dirstate.restorebackup(None, 'undo.dirstate')
try: try:
branch = self.vfs.read('undo.branch') branch = self.vfs.read('undo.branch')
self.dirstate.setbranch(encoding.tolocal(branch)) self.dirstate.setbranch(encoding.tolocal(branch))
except IOError: except IOError:
ui.warn(_('named branch could not be reset: ' ui.warn(_('named branch could not be reset: '
'current branch is still \'%s\'\n') 'current branch is still \'%s\'\n')
% self.dirstate.branch()) % self.dirstate.branch())

mercurial/narrowspec.py

return return
util.rename(repo.svfs.join(backupname), repo.svfs.join(FILENAME)) util.rename(repo.svfs.join(backupname), repo.svfs.join(FILENAME))
def savewcbackup(repo, backupname): def savewcbackup(repo, backupname):
if repository.NARROW_REQUIREMENT not in repo.requirements: if repository.NARROW_REQUIREMENT not in repo.requirements:
return return
vfs = repo.vfs vfs = repo.vfs
vfs.tryunlink(backupname) vfs.tryunlink(backupname)
# It may not exist in old repos
if vfs.exists(DIRSTATE_FILENAME):
util.copyfile(vfs.join(DIRSTATE_FILENAME), vfs.join(backupname), util.copyfile(vfs.join(DIRSTATE_FILENAME), vfs.join(backupname),
hardlink=True) hardlink=True)
pulkitUnsubmitted
Done

This change should be moved to previous patch or a separate patch.

pulkit: This change should be moved to previous patch or a separate patch.
def restorewcbackup(repo, backupname): def restorewcbackup(repo, backupname):
if repository.NARROW_REQUIREMENT not in repo.requirements: if repository.NARROW_REQUIREMENT not in repo.requirements:
return return
util.rename(repo.vfs.join(backupname), repo.vfs.join(DIRSTATE_FILENAME)) util.rename(repo.vfs.join(backupname), repo.vfs.join(DIRSTATE_FILENAME))
def clearwcbackup(repo, backupname): def clearwcbackup(repo, backupname):
if repository.NARROW_REQUIREMENT not in repo.requirements: if repository.NARROW_REQUIREMENT not in repo.requirements: