From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 10 Nov 2014 17:30:47 +0000 (-0500)
Subject: Preparation for branch crearion.  Regression test passes.
X-Git-Tag: 0.4~12
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=1c7e6a3bc47b1e0cb5379c74c7ab2b0e6360796c;p=src.git

Preparation for branch crearion.  Regression test passes.
---

diff --git a/src b/src
index 7b34d31..0b04a19 100755
--- a/src
+++ b/src
@@ -151,7 +151,7 @@ class History:
         try:
             return self.lockrevs[0]
         except IndexError:
-            croak("no current revision? scrc checkout to recover")
+            croak("no current revision? src checkout to recover")
     def tip(self):
         return self.revlist[0]
     def rcs_to_revno(self, revision):
@@ -673,6 +673,7 @@ def tag_helper(args, legend, validation_hook, delete_method, set_method):
         with backend.lifter(arg):
             set_method(name, revision, arg)
             if not quiet and len(args) > 1:
+                # FIXME: Misleading message when creating a branch.
                 announce("%s %s = %s in " % (legend, name, revno, arg))
 
 def tag_method(*args):
@@ -695,8 +696,7 @@ def branch_method(*args):
             croak("cannot accept a revision after a branch name")
         if name not in metadata.symbols:
             with backend.lifter(arg):
-                backend.create_branch(metadata.new_branchpoint(metadata_current()))
-        return None	# Not ready yet
+                return backend.create_branch(metadata)
     tag_helper(args, "branch",
                branch_set_validate,
                backend.delete_branch, backend.set_branch)
@@ -919,6 +919,9 @@ class RCS:
     def delete_branch(self, branchname, arg):
         "Delete a specified branch."
         croak("branch deletion is not yet supported")
+    def create_branch(self, metadata, arg):
+        "Create a new branch starting from the locked revision."
+        croak("branch creation is not yet supported")
     def set_branch(self, _name, revision, arg):
         "Set the specified branch to be default."
         croak("branch change is not yet supported")