| indygreg | |
| durin42 |
| hg-reviewers |
Again, I'm not sure if this is the right thing, but adding a few more pseudo
hashes wouldn't be any worse than the current state.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/revlog.py (8 lines) | |||
| M | tests/test-grep.t (2 lines) |
| import zlib | import zlib | ||||
| # import stuff from node for others to import from revlog | # import stuff from node for others to import from revlog | ||||
| from .node import ( | from .node import ( | ||||
| bin, | bin, | ||||
| hex, | hex, | ||||
| nullid, | nullid, | ||||
| nullrev, | nullrev, | ||||
| wdirfilenodeids, | |||||
| wdirhex, | wdirhex, | ||||
| wdirid, | wdirid, | ||||
| wdirrev, | wdirrev, | ||||
| ) | ) | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from .thirdparty import ( | from .thirdparty import ( | ||||
| attr, | attr, | ||||
| ) | ) | ||||
| def rev(self, node): | def rev(self, node): | ||||
| try: | try: | ||||
| return self._nodecache[node] | return self._nodecache[node] | ||||
| except TypeError: | except TypeError: | ||||
| raise | raise | ||||
| except RevlogError: | except RevlogError: | ||||
| # parsers.c radix tree lookup failed | # parsers.c radix tree lookup failed | ||||
| if node == wdirid: | if node == wdirid or node in wdirfilenodeids: | ||||
| raise error.WdirUnsupported | raise error.WdirUnsupported | ||||
| raise LookupError(node, self.indexfile, _('no node')) | raise LookupError(node, self.indexfile, _('no node')) | ||||
| except KeyError: | except KeyError: | ||||
| # pure python cache lookup failed | # pure python cache lookup failed | ||||
| n = self._nodecache | n = self._nodecache | ||||
| i = self.index | i = self.index | ||||
| p = self._nodepos | p = self._nodepos | ||||
| if p is None: | if p is None: | ||||
| p = len(i) - 2 | p = len(i) - 2 | ||||
| for r in xrange(p, -1, -1): | for r in xrange(p, -1, -1): | ||||
| v = i[r][7] | v = i[r][7] | ||||
| n[v] = r | n[v] = r | ||||
| if v == node: | if v == node: | ||||
| self._nodepos = r - 1 | self._nodepos = r - 1 | ||||
| return r | return r | ||||
| if node == wdirid: | if node == wdirid or node in wdirfilenodeids: | ||||
| raise error.WdirUnsupported | raise error.WdirUnsupported | ||||
| raise LookupError(node, self.indexfile, _('no node')) | raise LookupError(node, self.indexfile, _('no node')) | ||||
| # Accessors for index entries. | # Accessors for index entries. | ||||
| # First tuple entry is 8 bytes. First 6 bytes are offset. Last 2 bytes | # First tuple entry is 8 bytes. First 6 bytes are offset. Last 2 bytes | ||||
| # are flags. | # are flags. | ||||
| def start(self, rev): | def start(self, rev): | ||||
| # a full hex nodeid? | # a full hex nodeid? | ||||
| node = bin(id) | node = bin(id) | ||||
| self.rev(node) | self.rev(node) | ||||
| return node | return node | ||||
| except (TypeError, LookupError): | except (TypeError, LookupError): | ||||
| pass | pass | ||||
| def _partialmatch(self, id): | def _partialmatch(self, id): | ||||
| # we don't care wdirfilenodeids as they should be always full hash | |||||
| maybewdir = wdirhex.startswith(id) | maybewdir = wdirhex.startswith(id) | ||||
| try: | try: | ||||
| partial = self.index.partialmatch(id) | partial = self.index.partialmatch(id) | ||||
| if partial and self.hasnode(partial): | if partial and self.hasnode(partial): | ||||
| if maybewdir: | if maybewdir: | ||||
| # single 'ff...' match in radix tree, ambiguous with wdir | # single 'ff...' match in radix tree, ambiguous with wdir | ||||
| raise RevlogError | raise RevlogError | ||||
| return partial | return partial | ||||
| 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: | if node == wdirid or node in wdirfilenodeids: | ||||
| raise RevlogError(_("%s: attempt to add wdir revision") % | raise RevlogError(_("%s: attempt to add wdir revision") % | ||||
| (self.indexfile)) | (self.indexfile)) | ||||
| if self._inline: | if self._inline: | ||||
| fh = ifh | fh = ifh | ||||
| else: | else: | ||||
| fh = dfh | fh = dfh | ||||
| Test wdir | Test wdir | ||||
| (at least, this shouldn't crash) | (at least, this shouldn't crash) | ||||
| $ hg up -q | $ hg up -q | ||||
| $ echo wport >> port2 | $ echo wport >> port2 | ||||
| $ hg stat | $ hg stat | ||||
| M port2 | M port2 | ||||
| $ hg grep -r 'wdir()' port | $ hg grep -r 'wdir()' port | ||||
| abort: data/port2.i@303030303030: no node! | abort: working directory revision cannot be specified | ||||
| [255] | [255] | ||||
| $ cd .. | $ cd .. | ||||
| $ hg init t2 | $ hg init t2 | ||||
| $ cd t2 | $ cd t2 | ||||
| $ hg grep foobar foo | $ hg grep foobar foo | ||||
| [1] | [1] | ||||
| $ hg grep foobar | $ hg grep foobar | ||||