11 and O(changes) merge between branches.

    11 and O(changes) merge between branches.

    12 """

    12 """

    13 

    13 

    14 from __future__ import absolute_import

    14 from __future__ import absolute_import

    15 

    15 

    17 import collections

    16 import collections

    18 import contextlib

    17 import contextlib

    19 import errno

    18 import errno

    20 import hashlib

    19 import hashlib

    21 import heapq

    20 import heapq

  1428                     raise LookupError(id, self.indexfile,

  1427                     raise LookupError(id, self.indexfile,

  1429                                       _('ambiguous identifier'))

  1428                                       _('ambiguous identifier'))

  1430                 if maybewdir:

  1429                 if maybewdir:

  1431                     raise error.WdirUnsupported

  1430                     raise error.WdirUnsupported

  1432                 return None

  1431                 return None

  1434                 pass

  1433                 pass

  1435 

  1434 

  1436     def lookup(self, id):

  1435     def lookup(self, id):

  1437         """locate a node based on:

  1436         """locate a node based on:

  1438             - revision number or str(revision number)

  1437             - revision number or str(revision number)