Removed unused variable, more cleanups

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 49114d2c6f3e377b2805f0e5e3442d71fb306f41..f76d198d64739a9d8f540b57f5a4c73604f4cbe2 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -551,9 +551,7 @@ class P4Sync(Command):
 
         change = int(details["change"])
 
 
         change = int(details["change"])
 

-        self.lastChange = change
-
-        if change in self.labels:
+        if self.labels.has_key(change):

             label = self.labels[change]
             labelDetails = label[0]
             labelRevisions = label[1]
             label = self.labels[change]
             labelDetails = label[0]
             labelRevisions = label[1]


@@ -620,7 +618,10 @@ class P4Sync(Command):
                 if change > newestChange:
                     newestChange = change
 
                 if change > newestChange:
                     newestChange = change
 

-            self.labels[int(newestChange)] = [output, revisions]
+            self.labels[newestChange] = [output, revisions]
+
+        if self.verbose:
+            print "Label changes: %s" % self.labels.keys()

 
     def getBranchMapping(self):
         self.projectName = self.depotPath[self.depotPath[:-1].rfind("/") + 1:]
 
     def getBranchMapping(self):
         self.projectName = self.depotPath[self.depotPath[:-1].rfind("/") + 1:]


@@ -748,7 +749,6 @@ class P4Sync(Command):
 
         self.revision = ""
         self.users = {}
 
         self.revision = ""
         self.users = {}

-        self.lastChange = 0

 
         if self.depotPath.find("@") != -1:
             atIdx = self.depotPath.index("@")
 
         if self.depotPath.find("@") != -1:
             atIdx = self.depotPath.index("@")