Skip to content

Commit

Permalink
git-p4: Cleanup; Turn self.revision into a function local variable (i…
Browse files Browse the repository at this point in the history
…t's not used anywhere outside the function).

Signed-off-by: Simon Hausmann <simon@lst.de>
  • Loading branch information
Simon Hausmann committed Sep 3, 2007
1 parent e87f37a commit 1c49fc1
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions contrib/fast-import/git-p4
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,7 @@ class P4Sync(Command):

self.depotPaths = sorted(args)

self.revision = ""
revision = ""
self.users = {}

newPaths = []
Expand All @@ -1296,15 +1296,15 @@ class P4Sync(Command):
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.revision = p[hashIdx:]
revision = p[hashIdx:]
p = p[:hashIdx]
elif self.previousDepotPaths == []:
self.revision = "#head"
revision = "#head"

p = re.sub ("\.\.\.$", "", p)
if not p.endswith("/"):
Expand Down Expand Up @@ -1345,19 +1345,19 @@ class P4Sync(Command):
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"
% (' '.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"
% (p, self.revision)
% (p, revision)
for p in self.depotPaths])):

if info['code'] == 'error':
Expand Down

0 comments on commit 1c49fc1

Please sign in to comment.