Regularize some eror messages. Regression test passes.

diff --git a/src b/src
index 97ad9f6c09f826d865f2a97eeebfc85ea97bed20..c3951a509a7cbdd09817a4553b72131f94ec606a 100755 (executable)
--- a/src
+++ b/src
@@ -781,9 +781,9 @@ def tag_helper(args, legend, validation_hook, delete_method, set_method):
             for arg in ctx.args:
                 metadata = History(arg)
                 if name not in metadata.symbols:
-                    croak("cannot rename nonexistent %s %s" % (legend, name))
+                    croak("in %s, cannot rename nonexistent %s %s" % (arg, legend, name))
                 if newname in metadata.symbols:
-                    croak("cannot rename to existing %s %s" % (legend, name))
+                    croak("in %s, cannot rename to existing %s %s" % (arg, legend, name))
                 ctx = CommandContext(legend, args)
                 if not ctx.is_empty():
                     croak("can't accept a revision-spec when renaming a %s." \
@@ -794,7 +794,7 @@ def tag_helper(args, legend, validation_hook, delete_method, set_method):
                     backend.set_tag(newname, metadata.symbols[name], metadata, arg)
                     backend.delete_tag(name, arg)
                 if not quiet and len(args) > 1:
-                    announce("%s -> %s in %s" % (name, newname, arg))
+                    announce("in %s, %s -> %s" % (arg, name, newname))
             return
     if not args:
         croak("%s setting requires a name argument" % legend)
@@ -808,7 +808,7 @@ def tag_helper(args, legend, validation_hook, delete_method, set_method):
         with backend.lifter(arg):
             set_method(name, revision, metadata, arg)
             if not quiet and len(args) > 1:
-                announce("%s %s = %s in %s" % (legend, name, revno, arg))
+                announce("in %s, %s %s = %s in %s" % (arg, legend, name, revno))
 
 def tag_method(*args):
     "Inspect, create, and delete tags."