From: Eric S. Raymond <esr@thyrsus.com>
Date: Sat, 15 Nov 2014 14:09:14 +0000 (-0500)
Subject: Code cleanup.  Regression test passes.
X-Git-Tag: 0.9~23
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=012ddd3cf9e75477c0f81ab1f23cbcaae4294044;p=src.git

Code cleanup.  Regression test passes.
---

diff --git a/src b/src
index b3975ed..07442a0 100755
--- a/src
+++ b/src
@@ -1065,7 +1065,7 @@ def tag_helper(args, legend, validation_hook, delete_method, set_method):
                 # In the case of a branch, we want to change only the
                 # tag reference.
                 with backend.lifter(arg):
-                    backend.set_tag(newname, metadata.symbols[name], metadata, arg)
+                    backend.set_tag(newname, metadata.symbols[name], metadata)
                     backend.delete_tag(name, arg)
                 if not quiet and len(args) > 1:
                     announce("in %s, %s -> %s" % (arg, name, newname))
@@ -1080,7 +1080,7 @@ def tag_helper(args, legend, validation_hook, delete_method, set_method):
         metadata = History(arg)
         revision = validation_hook(ctx, metadata, name)
         with backend.lifter(arg):
-            set_method(name, revision, metadata, arg)
+            set_method(name, revision, metadata)
             if not quiet and len(args) > 1:
                 announce("in %s, %s %s = %s" % (arg, legend, name, ctx.start))
 
@@ -1380,9 +1380,9 @@ class RCS:
     def delete_tag(self, tagname, arg):
         "Delete a specified tag."
         do_or_die("rcs -n{0} {1}".format(tagname, arg))
-    def set_tag(self, tagname, revision, _metadata, arg):
+    def set_tag(self, tagname, revision, metadata):
         "Set a specified tag."
-        do_or_die("rcs -n{0}:{1} {2}".format(tagname, revision, arg))
+        do_or_die("rcs -n{0}:{1} {2}".format(tagname, revision, metadata.name))
     def delete_branch(self, branchname, arg):
         "Delete a specified branch."
         # From rcs(1): -orange deletes ("outdates") the revisions
@@ -1400,7 +1400,7 @@ class RCS:
         # then do a delete to end of branch from there.
         croak("branch deletion is not yet supported")
         #do_or_die("rcs -o{0}: {1}".format(revision, arg)
-    def set_branch(self, name, revision, metadata, arg):
+    def set_branch(self, name, revision, metadata):
         "Set the specified branch to be default, creating it if required."
         if name in metadata.symbols:
             # Must unstickify...
@@ -1420,7 +1420,7 @@ class RCS:
             base = baserev + "." + str(newsib)
             sticky = baserev + ".0." + str(newsib)
             do_or_die("rcs -n{0}:{1} {2}".format(name, sticky, arg), loud=True)
-        do_or_die("rcs -b%s %s" % (base, arg), loud=True)
+        do_or_die("rcs -b%s %s" % (base, metadate.name), loud=True)
     def move(self, source, target):
         "Move a file and its history."
         do_or_die("mv {0} {1} && mv {2} {3}".format(source, target,