From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 9 Nov 2014 16:45:31 +0000 (-0500)
Subject: Rename for clarity.  Regression test passes.
X-Git-Tag: 0.3~8
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=8344a33a932cd24608a9002667287af990bd0efb;p=src.git

Rename for clarity.  Regression test passes.
---

diff --git a/src b/src
index e4da321..c82f277 100755
--- a/src
+++ b/src
@@ -480,9 +480,9 @@ def list_method(*args):
     width = screenwidth()
     for arg in args:
         sys.stdout.write("= %s %s\n" % (arg, ((width - len(arg) - 5) * "=")))
-        master = History(arg)
-        revspec = master.resolve(revspec)
-        for item in master:
+        metadata = History(arg)
+        revspec = metadata.resolve(revspec)
+        for item in metadata:
             if not revspec or item.revno in revspec:
                 # Must allow enough room for revno and date
                 summary = item.log.strip()[:width - 34]
@@ -499,9 +499,9 @@ def log_method(*args):
     width = screenwidth()
     for arg in args:
         sys.stdout.write("= %s %s\n" % (arg, ((width - len(arg) - 5) * "=")))
-        master = History(arg)
-        revspec = master.resolve(revspec)
-        for item in master:
+        metadata = History(arg)
+        revspec = metadata.resolve(revspec)
+        for item in metadata:
             if not revspec or item.revno in revspec:
                 sys.stdout.write("%-4d | %s\n%s" % (item.revno, item.date, item.log))
                 sys.stdout.write(("-" * (width - 1)) + "\n")
@@ -512,23 +512,23 @@ def checkout_method(*args):
     if revspec and revspec[0] != revspec[1]:
         croak("checkout needs an empty or singleton revision spec")
     for arg in args:
-        master = History(arg)
-        revspec = master.resolve(revspec)
+        metadata = History(arg)
+        revspec = metadata.resolve(revspec)
         if revspec is None:
-            revspec = [len(master)]
+            revspec = [len(metadata)]
             revision = ""
         elif len(revspec) != 1:
             croak("checkout cannot take a range")
-        elif revspec[0] > len(master):
-            croak("%s has only %d revisions" % (arg, len(master)))
+        elif revspec[0] > len(metadata):
+            croak("%s has only %d revisions" % (arg, len(metadata)))
         else:
-            revision = master[len(master) - revspec[0]].revision
+            revision = metadata[len(metadata) - revspec[0]].revision
         with backend.lifter(arg):
             backend.checkout(arg, revision)
             # Changes the access and modification times
             # Later, src status will see this.  Alas,
             # there's a tiny race window here.
-            os.utime(backend.master(arg, None))
+            os.utime(backend.metadata(arg, None))
         if not quiet and len(args) > 1:
             announce("%s <- %d" % (arg, revspec[0]))