# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1159241214 18000
# Node ID ca00ce41a2e81651631a35be0b04f80c14e4c1fa
# Parent  56c59ba7aa76b287b166c0c25cffedfb20ec73db# Parent  4fe41a9e4591704ada8b36b02280b25ab9cf9a92
Merge with crew

diff -r 56c59ba7aa76 -r ca00ce41a2e8 mercurial/revlog.py
--- a/mercurial/revlog.py	Mon Sep 25 20:31:05 2006 -0500
+++ b/mercurial/revlog.py	Mon Sep 25 22:26:54 2006 -0500
@@ -747,25 +747,42 @@
         return c
 
     def lookup(self, id):
-        """locate a node based on revision number or subset of hex nodeid"""
+        """locate a node based on:
+            - revision number or str(revision number)
+            - nodeid or subset of hex nodeid
+        """
         if type(id) == type(0):
+            # rev
             return self.node(id)
         try:
+            # str(rev)
             rev = int(id)
             if str(rev) != id: raise ValueError
             if rev < 0: rev = self.count() + rev
             if rev < 0 or rev >= self.count(): raise ValueError
             return self.node(rev)
         except (ValueError, OverflowError):
-            c = []
+            pass
+        try:
+            # hex(node)[:...]
+            if len(id) % 2 == 0:
+                bin_id = bin(id)
+            else:
+                bin_id = bin(id[:-1])
+            node = None
             for n in self.nodemap:
-                if hex(n).startswith(id):
-                    c.append(n)
-            if len(c) > 1: raise RevlogError(_("Ambiguous identifier"))
-            if len(c) == 1: return c[0]
+                if n.startswith(bin_id) and hex(n).startswith(id):
+                    if node is not None:
+                        raise RevlogError(_("Ambiguous identifier"))
+                    node = n
+            if node is not None:
+                return node
+        except TypeError:
+            pass
 
         # might need fixing if we change hash lengths
         if len(id) == 20 and id in self.nodemap:
+            # node
             return id
 
         raise RevlogError(_("No match found"))