From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 10 Nov 2014 17:12:01 +0000 (-0500)
Subject: Code simplification.
X-Git-Tag: 0.4~14
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=cadacce278c03d5f0577eba3de5eca8ae09509cb;p=src.git

Code simplification.
---

diff --git a/src b/src
index b381596..fce15d3 100755
--- a/src
+++ b/src
@@ -665,6 +665,8 @@ def tag_helper(args, legend, delete_method, set_method):
         croak("%s setting requires a name argument" % legend)
     name = args.pop(0)
     ctx = CommandContext(legend, args)
+    if ctx.is_range():
+        croak("can't accept a range when setting a %s" % legend)
     for arg in ctx.args:
         metadata = History(arg)
         # Semantics differs between tags and branches here
@@ -673,13 +675,7 @@ def tag_helper(args, legend, delete_method, set_method):
             if name in metadata.symbols:
                 croak("%s %s already set." % (legend, name))
             if ctx.is_empty():
-                revision = metadata.tip().revision
-                revno = metadata.tip().revno
-            elif ctx.is_singleton():
-                revision = metadata.revno_to_rcs(ctx.start)
-                revno = ctx.start
-            else:
-                croak("can't accept a range when %s setting" % legend)
+                ctx.start = metadata.tip().revno
         elif legend == "branch":
             if not ctx.is_empty():
                 croak("cannot accept a revision after a branch name")
@@ -688,7 +684,7 @@ def tag_helper(args, legend, delete_method, set_method):
         else:
             croak("internal error - what is this thing called %s" % legend)
         with backend.lifter(arg):
-            set_method(name, revision, arg)
+            set_method(name, metadata.revno_to_rcs(ctx.start), arg)
             if not quiet and len(args) > 1:
                 announce("%s %s = %s in " % (legend, name, revno, arg))