git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function).

Signed-off-by: Simon Hausmann <simon@lst.de>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index c00702c895eef2b0c21092e701750562a51eb361..d7c5becc0e06843701b5ebf17f8263088af7c0b8 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1285,7 +1285,7 @@ class P4Sync(Command):
 
             self.depotPaths = sorted(args)
 
 
             self.depotPaths = sorted(args)
 

-        self.revision = ""
+        revision = ""

         self.users = {}
 
         newPaths = []
         self.users = {}
 
         newPaths = []


@@ -1296,15 +1296,15 @@ class P4Sync(Command):
                 if self.changeRange == "@all":
                     self.changeRange = ""
                 elif ',' not in self.changeRange:
                 if self.changeRange == "@all":
                     self.changeRange = ""
                 elif ',' not in self.changeRange:

-                    self.revision = self.changeRange
+                    revision = self.changeRange

                     self.changeRange = ""
                 p = p[:atIdx]
             elif p.find("#") != -1:
                 hashIdx = p.index("#")
                     self.changeRange = ""
                 p = p[:atIdx]
             elif p.find("#") != -1:
                 hashIdx = p.index("#")

-                self.revision = p[hashIdx:]
+                revision = p[hashIdx:]

                 p = p[:hashIdx]
             elif self.previousDepotPaths == []:
                 p = p[:hashIdx]
             elif self.previousDepotPaths == []:

-                self.revision = "#head"
+                revision = "#head"

 
             p = re.sub ("\.\.\.$", "", p)
             if not p.endswith("/"):
 
             p = re.sub ("\.\.\.$", "", p)
             if not p.endswith("/"):


@@ -1345,19 +1345,19 @@ class P4Sync(Command):
         self.gitStream = importProcess.stdin
         self.gitError = importProcess.stderr
 
         self.gitStream = importProcess.stdin
         self.gitError = importProcess.stderr
 

-        if self.revision:
-            print "Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), self.revision, self.branch)
+        if revision:
+            print "Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch)

 
             details = { "user" : "git perforce import user", "time" : int(time.time()) }
             details["desc"] = ("Initial import of %s from the state at revision %s"
 
             details = { "user" : "git perforce import user", "time" : int(time.time()) }
             details["desc"] = ("Initial import of %s from the state at revision %s"

-                               % (' '.join(self.depotPaths), self.revision))
-            details["change"] = self.revision
+                               % (' '.join(self.depotPaths), revision))
+            details["change"] = revision

             newestRevision = 0
 
             fileCnt = 0
             for info in p4CmdList("files "
                                   +  ' '.join(["%s...%s"
             newestRevision = 0
 
             fileCnt = 0
             for info in p4CmdList("files "
                                   +  ' '.join(["%s...%s"

-                                               % (p, self.revision)
+                                               % (p, revision)

                                                for p in self.depotPaths])):
 
                 if info['code'] == 'error':
                                                for p in self.depotPaths])):
 
                 if info['code'] == 'error':