]> thyrsus.com Git - src.git/commitdiff
Pass baserev down to the brabch method, we'll need it.
authorEric S. Raymond <esr@thyrsus.com>
Sun, 9 Nov 2014 16:54:50 +0000 (11:54 -0500)
committerEric S. Raymond <esr@thyrsus.com>
Sun, 9 Nov 2014 16:54:50 +0000 (11:54 -0500)
src

diff --git a/src b/src
index c82f277860ee51fe0876e56eb066e82cf9ada647..5f25b452433bbe37904b75c680e71cb02da237bf 100755 (executable)
--- a/src
+++ b/src
@@ -124,7 +124,7 @@ class RCSRevisionItem:
         self.log = ""
         self.date = None
     def selected(self):
-        return self.revision == self.master.lockrevs[0]
+        return self.revision == self.master.current()
     def unixtime(self):
         try:
             return calendar.timegm(time.strptime(self.date, "%Y-%m-%dT%H:%M:%SZ"))
@@ -227,6 +227,8 @@ class History:
         return len(self.revlist)
     def __getitem__(self, i):
         return self.revlist[i]
+    def current(self):
+        return self.lockrevs[0]
     def tip(self):
         return self.revlist[0]
     def rcs_to_revno(self, revision):
@@ -667,7 +669,7 @@ def tag_helper(args, legend, delete_method, set_method):
         else:
             croak("can't accept a range when %s setting" % legend)
         with backend.lifter(arg):
-            set_method(name, revision, arg)
+            set_method(name, revision, metadata.current(), arg)
             if not quiet and len(args) > 1:
                 announce("%s %s = %s in " % (legend, name, revno, arg))
 
@@ -865,13 +867,13 @@ 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, arg):
+    def set_tag(self, tagname, revision, _baserev, arg):
         "Set a specified tag."
         do_or_die("rcs -N{0}:{1} {2}".format(tagname, revision, arg))
     def delete_branch(self, branchname, arg):
         "Delete a specified branch."
         croak("branch deletion is not yet supported")
-    def set_branch(self, branchname, revision, arg):
+    def set_branch(self, branchname, revision, baserev, arg):
         "Set a specified branch."
         croak("branch creation is not yet supported")
     def move(self, source, target):