De-RCSify some names.

diff --git a/src b/src
index 6b802f2b9a44993f75cd50909ae811caa7734915..d7c2bd90d842fcb85c1f644a8c5aa9c426404d4b 100755 (executable)
--- a/src
+++ b/src
@@ -147,7 +147,7 @@ def capture_or_die(command):
         sys.stderr.write(content)
     return content
 
-class RCSRevisionItem:
+class HistoryEntry:
     "Capture the state of an RCS revision item in the log."
     def __init__(self, master):
         self.master = master
@@ -186,7 +186,7 @@ class History:
             croak("no current revision? src checkout to recover")
     def current_branch(self, reversed=False):
         "Return a list of items that are descendants or ancestors of current."
-        p = s = self.rcs_to_revno(self.current())
+        p = s = self.native_to_revno(self.current())
         selection = [self.by_revno(p)]
         while True:
             p = backend.pred(p, self)
@@ -216,7 +216,7 @@ class History:
         return selection
     def tip(self):
         return self.revlist[0]
-    def rcs_to_revno(self, revision):
+    def native_to_revno(self, revision):
         "Map a native ID to a revno"
         for item in self.revlist:
             if item.revision == revision:
@@ -228,7 +228,7 @@ class History:
             if item.revno == revno:
                 return item
         croak("{0} has no revno {1}".format(self.name, revno))
-    def revno_to_rcs(self, revno):
+    def revno_to_native(self, revno):
         "Map a revno to a native ID"
         for item in self.revlist:
             if item.revno == revno:
@@ -514,7 +514,7 @@ def amend_method(*args):
            ctx.start = metadata.tip().revno
        with backend.lifter(arg):
            backend.amend(arg,
-                         metadata.revno_to_rcs(ctx.start),
+                         metadata.revno_to_native(ctx.start),
                          comment.content())
        if not quiet and len(args) > 1:
            announce("%s : %d" % (arg, len(metadata)))
@@ -565,7 +565,7 @@ def checkout_method(*args):
         elif ctx.start > len(metadata):
             croak("%s has only %d revisions" % (arg, len(metadata)))
         else:
-            revision = metadata.revno_to_rcs(ctx.start)
+            revision = metadata.revno_to_native(ctx.start)
         with backend.lifter(arg):
             backend.checkout(arg, revision)
             # We change access and modification times of
@@ -647,9 +647,9 @@ def diff_method(*args):
         if not ctx.is_empty():
             metadata = History(arg)
             ctx.resolve(metadata)
-            diffspec1 += metadata.revno_to_rcs(ctx.start)
+            diffspec1 += metadata.revno_to_native(ctx.start)
             if ctx.is_range():
-                diffspec2 += metadata.revno_to_rcs(ctx.end)
+                diffspec2 += metadata.revno_to_native(ctx.end)
         with backend.lifter(arg):
             backend.diff(diffspec1, diffspec2, diffopts, arg)
 
@@ -700,7 +700,7 @@ def tag_helper(args, legend, validation_hook, delete_method, set_method):
                     else:
                         display = value
                     if metadata.isbranch(value) == (legend == "branch"):
-                        sys.stdout.write("%4d\t%s\n" % (metadata.rcs_to_revno(display),key))
+                        sys.stdout.write("%4d\t%s\n" % (metadata.native_to_revno(display),key))
             return
         if args[0] in ("-r", "rename"):
             args.pop(0)
@@ -741,7 +741,7 @@ def tag_method(*args):
             croak("tag %s already set.")
         if ctx.is_empty():
             ctx.start = metadata.tip().revno
-        return metadata.revno_to_rcs(ctx.start)
+        return metadata.revno_to_native(ctx.start)
     tag_helper(args, "tag",
                tag_set_validate,
                backend.delete_tag, backend.set_tag)
@@ -864,7 +864,7 @@ def fast_export_method(*args):
                 markmap[item.revno] = mark
             sys.stdout.write("reset refs/heads/%s\nfrom :%d\n\n" % (branch, mark))
             for (key, val) in list(metadata.symbols.items()):
-                val = metadata.rcs_to_revno(val)
+                val = metadata.native_to_revno(val)
                 if val in ctx:
                     sys.stdout.write("reset refs/tags/%s\nfrom :%d\n\n" % (key, markmap[val]))
 
@@ -1095,7 +1095,7 @@ class RCS:
                         if debug >= DEBUG_PARSE:
                             sys.stderr.write("\t-> logheader\n")
                         state = "logheader"
-                        metadata.revlist.append(RCSRevisionItem(metadata))
+                        metadata.revlist.append(HistoryEntry(metadata))
                 elif state == "locks":
                     if not line[0].isspace():
                         if debug >= DEBUG_PARSE:
@@ -1121,7 +1121,7 @@ class RCS:
                         fields = line.split()
                         metadata.revlist[-1].revision = fields[1]
                     elif line.startswith("----------------------------"):
-                        metadata.revlist.append(RCSRevisionItem(metadata))
+                        metadata.revlist.append(HistoryEntry(metadata))
                     elif line.startswith("date: "):
                         fields = line.split()
                         date = fields[1] + " " + fields[2]