Changeset 1277 in tailor for vcpx/repository/git/__init__.py

Timestamp:

09/12/06 22:17:43 (7 years ago)

Author:

lele@…

Hash name:

20060912201743-97f81-4c433ecbd1f3b8f0e368793fd3393c7d8cccec18

Message:

Rename a few ivars to lower case

File:

• vcpx/repository/git/__init__.py (modified) (5 diffs)

vcpx/repository/git/__init__.py

@@ -26 +26 @@
         Repository._load(self, project)
         self.EXECUTABLE = project.config.get(self.name, 'git-command', 'git')
-        self.PARENT_REPO = project.config.get(self.name, 'parent-repo')
-        self.BRANCHPOINT = project.config.get(self.name, 'branchpoint', 'HEAD')
-        self.BRANCHNAME = project.config.get(self.name, 'branch')
-        if self.BRANCHNAME:
-            self.BRANCHNAME = 'refs/heads/' + self.BRANCHNAME
+        self.parent_repo = project.config.get(self.name, 'parent-repo')
+        self.branch_point = project.config.get(self.name, 'branchpoint', 'HEAD')
+        self.branch_name = project.config.get(self.name, 'branch')
+        if self.branch_name:
+            self.branch_name = 'refs/heads/' + self.branch_name
 
-        if self.repository and self.PARENT_REPO:
+        if self.repository and self.parent_repo:
             self.log.critical('Cannot make sense of both "repository" and "parent-repo" parameters')
             raise ConfigurationError ('Must specify only one of "repository" and "parent-repo"')
 
-        if self.BRANCHNAME and not self.repository:
+        if self.branch_name and not self.repository:
             self.log.critical('Cannot make sense of "branch" if "repository" is not set')
             raise ConfigurationError ('Missing "repository" to make use o "branch"')
@@ -76 +76 @@
             return
 
-        if self.PARENT_REPO:
-            cmd = self.command("clone", "--shared", "-n", self.PARENT_REPO, 'tmp')
+        if self.parent_repo:
+            cmd = self.command("clone", "--shared", "-n", self.parent_repo, 'tmp')
             clone = GitExternalCommand(self, cwd=self.basedir, command=cmd)
             clone.execute()
@@ -86 +86 @@
             renames(join(self.basedir, 'tmp', '.git'), join(self.basedir, '.git'))
 
-            cmd = self.command("reset", "--soft", self.BRANCHPOINT)
+            cmd = self.command("reset", "--soft", self.branch_point)
             reset = GitExternalCommand(self, cwd=self.basedir, command=cmd)
             reset.execute()
@@ -93 +93 @@
                     "%s returned status %s" % (str(reset), reset.exit_status))
 
-        elif self.repository and self.BRANCHNAME:
+        elif self.repository and self.branch_name:
             # ...and exists(self.storagedir) ?
 
@@ -99 +99 @@
             mkdir(join(self.basedir, self.METADIR))
 
-            bp = self.runCommand(['rev-parse', self.BRANCHPOINT])[0]
+            bp = self.runCommand(['rev-parse', self.branch_point])[0]
             self.runCommand(['read-tree', bp])
-            self.runCommand(['update-ref', self.BRANCHNAME, bp])
+            self.runCommand(['update-ref', self.branch_name, bp])
             #self.runCommand(['checkout-index'])