Rename a field to make it clearer what namespace we're in.

diff --git a/src b/src
index a4af34cce4bc6ee48eeaa95f25ccf960daf48a53..e5fbbb01dd1b9b0d1f2a7cc5d65300bf680d704c 100755 (executable)
--- a/src
+++ b/src
@@ -156,11 +156,11 @@ class HistoryEntry:
     def __init__(self, master):
         self.master = master
         self.revno = None
-        self.revision = None
+        self.native = None
         self.log = ""
         self.date = None
     def selected(self):
-        return self.revision == self.master.current()
+        return self.native == self.master.current()
     def unixtime(self):
         try:
             return calendar.timegm(time.strptime(self.date, "%Y-%m-%dT%H:%M:%SZ"))
@@ -182,7 +182,7 @@ class History:
         self.by_native_d = {}
         for item in self.revlist:
             self.by_revno_d[item.revno] = item
-            self.by_native_d[item.revision] = item
+            self.by_native_d[item.native] = item
     def __len__(self):
         return len(self.revlist)
     def current(self):
@@ -239,7 +239,7 @@ class History:
             croak("{0} has no revno {1}".format(self.name, revno))
     def revno_to_native(self, revno):
         "Map a revno to a native ID"
-        return self.by_revno(revno).revision
+        return self.by_revno(revno).native
 
 def help_method(*_args):
     "Summarize src commands, or (with argument) show help for a single command."
@@ -485,7 +485,7 @@ class CommandContext:
         if debug >= DEBUG_SEQUENCE:
             sys.stderr.write("selection: %s, branchwise is %s\n" % (self.seq, "on" if self.branchwise else "off"))
             for item in metadata.revlist:
-                sys.stdout.write("%s\t%s\t%s\n" % (item.revno, item.date, item.revision))
+                sys.stdout.write("%s\t%s\t%s\n" % (item.revno, item.date, item.native))
         # Because in the branchwise case the seqence is generated in reverse
         if backwards != self.branchwise:
             self.seq.reverse()
@@ -732,7 +732,7 @@ def cat_method(*args):
         with backend.lifter(arg):
             for item in metadata.revlist:
                 if item.revno in ctx:
-                    backend.cat(arg, item.revision)
+                    backend.cat(arg, item.native)
 
 def diff_method(*args):
     "Dump diffs between revisions to standard output."
@@ -955,7 +955,7 @@ def fast_export_method(*args):
             for i in range(ctx.start, ctx.end+1):
                 item = metadata.by_revno(i)
                 scratchfile = "/tmp/src%dtmp" % os.getpid()
-                backend.cat(arg, item.revision, scratchfile)
+                backend.cat(arg, item.native, scratchfile)
                 size = os.path.getsize(scratchfile)
                 mark += 1
                 markmap[item.revno] = mark
@@ -1180,7 +1180,7 @@ class RCS:
                 return len(c) == len(p) + 2 and c[len(p):] == p
             baserev = metadata.current()
             newsib = len([item for item in metadata.revlist \
-                         if branchfrom(item.revision, baserev)])
+                         if branchfrom(item.native, baserev)])
             newsib += 1
             base = baserev + "." + str(newsib)
             sticky = baserev + ".0." + str(newsib)
@@ -1263,7 +1263,7 @@ class RCS:
                 elif state == "logheader":
                     if line.startswith("revision "):
                         fields = line.split()
-                        metadata.revlist[-1].revision = fields[1]
+                        metadata.revlist[-1].native = fields[1]
                     elif line.startswith("----------------------------"):
                         metadata.revlist.append(HistoryEntry(metadata))
                     elif line.startswith("date: "):