]> thyrsus.com Git - src.git/commitdiff
Tag lookup works, but there's a design isse with leading tags.
authorEric S. Raymond <esr@thyrsus.com>
Wed, 12 Nov 2014 20:39:31 +0000 (15:39 -0500)
committerEric S. Raymond <esr@thyrsus.com>
Wed, 12 Nov 2014 20:39:31 +0000 (15:39 -0500)
Regression rests pass.

src

diff --git a/src b/src
index 4dcdc438733d54b6a6b490829b517dc39fa66078..6a18d47c713aeacf0a3551a9e72a212d08caefc6 100755 (executable)
--- a/src
+++ b/src
@@ -447,12 +447,12 @@ class CommandContext:
             return self.seq
         if type(self.start) == type(""):
             if self.start in metadata.symbols:
-                self.start = metadata.symbols[self.start]
+                self.start =  metadata.native_to_revno(metadata.symbols[self.start])
             else:
                 croak("can't resolve symbol {0} in {1}".format(self.start,metadata.name))
         if type(self.end) == type(""):
             if self.end in metadata.symbols:
-                self.end = metadata.symbols[self.end]
+                self.end = metadata.native_to_revno(metadata.symbols[self.end])
             else:
                 croak("can't resolve symbol {0} in {1}".format(self.end, metadata.name))
         if self.end > len(metadata):
@@ -790,7 +790,7 @@ def tag_method(*args):
     def tag_set_validate(ctx, metadata, name):
         ctx.resolve(metadata)
         if name in metadata.symbols:
-            croak("tag %s already set.")
+            croak("tag %s already set." % name)
         if ctx.is_empty():
             ctx.select_tip(metadata)
         return metadata.revno_to_native(ctx.start)