This is an archive of the discontinued Mercurial Phabricator instance.

Differential D524

changelog: abort on attempt to write wdir revision
ClosedPublic

Authored by martinvonz on Aug 26 2017, 1:29 AM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHG3939b30d0cb7: changelog: abort on attempt to write wdir revision
Summary

Similar to the previous patch which prevented writing the null
revision to any revlog, but this is for the wdir revision.

Thanks to Jun for pointing this out.

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

martinvonz created this revision.Aug 26 2017, 1:29 AM
quark accepted this revision.Aug 26 2017, 11:58 AM
yuja added a subscriber: yuja.Aug 28 2017, 9:40 AM

Perhaps this could be handled by revlog.py. I've already added several
wdir hacks to it.

durin42 accepted this revision.Aug 28 2017, 2:44 PM
durin42 added a subscriber: durin42.

I like yuya's suggestion, but this seems like it stands to prevent bugs now, so I'll land it and we can continue with a followup in the revlog layer.

This revision is now accepted and ready to land.Aug 28 2017, 2:44 PM
Closed by commit rHG3939b30d0cb7: changelog: abort on attempt to write wdir revision (authored by martinvonz). · Explain WhyAug 28 2017, 3:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changelog.py (4 lines)

Diff 1364

mercurial/changelog.py

# changelog.py - changelog class for mercurial # changelog.py - changelog class for mercurial
# #
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
# #
# 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
import collections import collections
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin, bin,
hex, hex,
nullid, nullid,
wdirid,
) )
from . import ( from . import (
encoding, encoding,
error, error,
revlog, revlog,
util, util,
) )
just to access this is costly.""" just to access this is costly."""
extra = self.read(rev)[5] extra = self.read(rev)[5]
return encoding.tolocal(extra.get("branch")), 'close' in extra return encoding.tolocal(extra.get("branch")), 'close' in extra
def _addrevision(self, node, rawtext, transaction, *args, **kwargs): def _addrevision(self, node, rawtext, transaction, *args, **kwargs):
# overlay over the standard revlog._addrevision to track the new # overlay over the standard revlog._addrevision to track the new
# revision on the transaction. # revision on the transaction.
rev = len(self) rev = len(self)
if node == wdirid: # nullid is checked in super method
raise error.RevlogError(_("%s: attempt to add wdir revision") %
(self.indexfile))
node = super(changelog, self)._addrevision(node, rawtext, transaction, node = super(changelog, self)._addrevision(node, rawtext, transaction,
*args, **kwargs) *args, **kwargs)
revs = transaction.changes.get('revs') revs = transaction.changes.get('revs')
if revs is not None: if revs is not None:
revs.add(rev) revs.add(rev)
return node return node