| indygreg | |
| quark |
| hg-reviewers |
Yuya said he preferred this (to keep them in one place, I think).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # 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 | ||||
| invariants: | invariants: | ||||
| - rawtext is optional (can be None); if not set, cachedelta must be set. | - rawtext is optional (can be None); if not set, cachedelta must be set. | ||||
| if both are set, they must correspond to each other. | if both are set, they must correspond to each other. | ||||
| """ | """ | ||||
| if node == nullid: | if node == nullid: | ||||
| raise RevlogError(_("%s: attempt to add null revision") % | raise RevlogError(_("%s: attempt to add null revision") % | ||||
| (self.indexfile)) | (self.indexfile)) | ||||
| if node == wdirid: | |||||
| raise RevlogError(_("%s: attempt to add wdir revision") % | |||||
| (self.indexfile)) | |||||
| btext = [rawtext] | btext = [rawtext] | ||||
| def buildtext(): | def buildtext(): | ||||
| if btext[0] is not None: | if btext[0] is not None: | ||||
| return btext[0] | return btext[0] | ||||
| baserev = cachedelta[0] | baserev = cachedelta[0] | ||||
| delta = cachedelta[1] | delta = cachedelta[1] | ||||
| # special case deltas which replace entire base; no need to decode | # special case deltas which replace entire base; no need to decode | ||||
| # base revision. this neatly avoids censored bases, which throw when | # base revision. this neatly avoids censored bases, which throw when | ||||