]> thyrsus.com Git - rcs-fast-import.git/commitdiff
A step forward.
authorEric S. Raymond <esr@thyrsus.com>
Thu, 11 Nov 2010 12:43:27 +0000 (07:43 -0500)
committerEric S. Raymond <esr@thyrsus.com>
Thu, 11 Nov 2010 12:43:27 +0000 (07:43 -0500)
rcs-fast-import

index 238fe1238bdf0225670b3516b5cbb220d1714aea..8466e9bd7ff80aad0fc1e62a7aa25882f19d7056 100755 (executable)
@@ -558,7 +558,6 @@ class RCS:
                 announce("ignoring a submodule link %s", path)
                 continue
             else:
-                inargs.append(RCS.master(path))
                 rcsdir = os.path.join(os.path.dirname(path), "RCS")
                 if not os.path.exists(rcsdir):
                     try:
@@ -569,16 +568,20 @@ class RCS:
                     announce("copying %s to %s" % (os.path.relpath(copyfile), path))
                 if not dryrun:
                     shutil.copy(copyfile, path)
-        responsible = event.authors[0] or event.committer
-        command = "ci -l"
-        # If we were going to try to match committer or author
-        # email addresses to local names, this would be the place
-        # to do it.  Not a whole lot of point in trying, though.
-        #command += " -w%s" % responsible.email
-        command += " -d'%s'" % responsible.date.rfc822()
-        command += " -m%s" % `event.comment`
-        command += " " + " ".join(inargs)
-        do_or_die(command, "checkin")
+                inargs.append(path)
+                inargs.append(RCS.master(path))
+                responsible = event.authors[0] or event.committer
+                quotified = ""
+                state = 0
+                command = "ci -l"
+                # If we were going to try to match committer or author
+                # email addresses to local names, this would be the place
+                # to do it.  Not a whole lot of point in trying, though.
+                #command += " -w%s" % responsible.email
+                command += " -d'%s'" % responsible.date.rfc822()
+                command += " -m%s" % `event.comment`
+                command += " " + " ".join(inargs)
+                do_or_die(command, "checkin")
     def rename(self, source, target):
         "Perform RCS renames."
         # Dodgy, but since user is more likely to be