diff hgext/mq.py @ 7568:12df451ce205

mq: don't warn about ambiguous patch name when using patch index (issue1439)
author Jason Orendorff <jorendorff@mozilla.com>
date Tue, 06 Jan 2009 10:30:22 +0100
parents 5f7e3f17aece
children 3cf85220a9f9 f9fcb189c8e2
line wrap: on
line diff
--- a/hgext/mq.py	Mon Jan 05 14:34:20 2009 +0100
+++ b/hgext/mq.py	Tue Jan 06 10:30:22 2009 +0100
@@ -838,14 +838,11 @@
                 if s == 'qbase':
                     return self.series[0]
             return None
+
         if patch == None:
             return None
-
-        # we don't want to return a partial match until we make
-        # sure the file name passed in does not exist (checked below)
-        res = partial_name(patch)
-        if res and res == patch:
-            return res
+        if patch in self.series:
+            return patch
 
         if not os.path.isfile(self.join(patch)):
             try:
@@ -853,10 +850,11 @@
             except(ValueError, OverflowError):
                 pass
             else:
-                if sno < len(self.series):
+                if -len(self.series) <= sno < len(self.series):
                     return self.series[sno]
+
             if not strict:
-                # return any partial match made above
+                res = partial_name(patch)
                 if res:
                     return res
                 minus = patch.rfind('-')