equal
deleted
inserted
replaced
24 from .node import ( |
24 from .node import ( |
25 bin, |
25 bin, |
26 hex, |
26 hex, |
27 nullid, |
27 nullid, |
28 nullrev, |
28 nullrev, |
|
29 wdirid, |
29 wdirrev, |
30 wdirrev, |
30 ) |
31 ) |
31 from .i18n import _ |
32 from .i18n import _ |
32 from . import ( |
33 from . import ( |
33 ancestor, |
34 ancestor, |
414 return self._nodecache[node] |
415 return self._nodecache[node] |
415 except TypeError: |
416 except TypeError: |
416 raise |
417 raise |
417 except RevlogError: |
418 except RevlogError: |
418 # parsers.c radix tree lookup failed |
419 # parsers.c radix tree lookup failed |
|
420 if node == wdirid: |
|
421 raise error.WdirUnsupported |
419 raise LookupError(node, self.indexfile, _('no node')) |
422 raise LookupError(node, self.indexfile, _('no node')) |
420 except KeyError: |
423 except KeyError: |
421 # pure python cache lookup failed |
424 # pure python cache lookup failed |
422 n = self._nodecache |
425 n = self._nodecache |
423 i = self.index |
426 i = self.index |
428 v = i[r][7] |
431 v = i[r][7] |
429 n[v] = r |
432 n[v] = r |
430 if v == node: |
433 if v == node: |
431 self._nodepos = r - 1 |
434 self._nodepos = r - 1 |
432 return r |
435 return r |
|
436 if node == wdirid: |
|
437 raise error.WdirUnsupported |
433 raise LookupError(node, self.indexfile, _('no node')) |
438 raise LookupError(node, self.indexfile, _('no node')) |
434 |
439 |
435 # Accessors for index entries. |
440 # Accessors for index entries. |
436 |
441 |
437 # First tuple entry is 8 bytes. First 6 bytes are offset. Last 2 bytes |
442 # First tuple entry is 8 bytes. First 6 bytes are offset. Last 2 bytes |