From: Eric S. Raymond <esr@thyrsus.com>
Date: Sat, 13 Nov 2010 19:34:44 +0000 (-0500)
Subject: Function name change.
X-Git-Tag: 0.1~28
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=605196092f451636a16a2672e63df87e79156406;p=rcs-fast-import.git

Function name change.
---

diff --git a/rcs-fast-import b/rcs-fast-import
index 148998d..55f5e20 100755
--- a/rcs-fast-import
+++ b/rcs-fast-import
@@ -637,7 +637,8 @@ class RCS:
                 except OSError, e:
                     raise FatalException("refusing to step on %s: %s." % (path, `e`))
         return rcsdir
-    def normal_checkin(self, commit, path, legend, state=None):
+    def checkin(self, commit, path, legend, state=None):
+        "Check in a new revision - also used to create new masters."
         if self.roundtrip:
             comment = event.email_out()
         else:
@@ -659,13 +660,13 @@ class RCS:
             raise FatalException("ignoring a submodule link %s", path)
         else:
             RCS.instantiate(path, copyfile)
-            self.normal_checkin(event, path, "modify")
+            self.checkin(event, path, "modify")
             RCS.record("M", path)
     def delete(self, commit, path, legend="delete"):
         "Mark a path deleted, but don't actually remove the master."
         RCS.instantiate(path)
         open(path, "w").close()
-        self.normal_checkin(commit, path, legend="delete", state="Deleted")
+        self.checkin(commit, path, legend="delete", state="Deleted")
         RCS.record("D", path)
     def copy(self, commit, source, target, legend="Copy"):
         "Perform RCS copies. Start the copy with no history."
@@ -674,7 +675,7 @@ class RCS:
         do_or_die("co %s" % RCS.master(source), legend)
         RCS.instantiate(target)
         loud_rename(source, target)
-        self.normal_checkin(commit, target, legend="copy")
+        self.checkin(commit, target, legend="copy")
         RCS.record("C", source)
         RCS.record("T", target)
     def rename(self, commit, source, target):
@@ -690,8 +691,6 @@ class RCS:
                       % (tag.name, tag.tagger.date.rfc822()))
             os.remove("ANNOTATED-TAGS")
             do_or_die("rcs -n'%s': %s" % (tag.name, " ".join(RCS.rcsfiles())))
-        if event.is_tip():
-            do_or_die("rcs -n'%s': %s" % (event.branch, " ".join(RCS.rcsfiles())))
     def checkout(self, switch):
         "Post-conversion actions."
         if switch != '-l':