undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added missing "self"s to make the script evaluate correctly.

Browse Source 
Signed-off-by: Simon Hausmann <hausmann@kde.org>
This commit is contained in:
Simon Hausmann 2007-03-20 20:59:30 +01:00
parent b984733c80
commit 0828ab1403
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/fast-import/git-p4.py
View File

@ -489,9 +489,9 @@ class GitSync(Command):
self.committedChanges.add(int(details["change"])) self.committedChanges.add(int(details["change"]))
committer = "" committer = ""
if author in self.users: if author in self.users:
committer = "%s %s %s" % (self.users[author], epoch, tz) committer = "%s %s %s" % (self.users[author], epoch, self.tz)
else: else:
committer = "%s <a@b> %s %s" % (author, epoch, tz) committer = "%s <a@b> %s %s" % (author, epoch, self.tz)
self.gitStream.write("committer %s\n" % committer) self.gitStream.write("committer %s\n" % committer)
@ -735,10 +735,10 @@ class GitSync(Command):
except: except:
pass pass
tz = - time.timezone / 36 self.tz = - time.timezone / 36
tzsign = ("%s" % tz)[0] tzsign = ("%s" % self.tz)[0]
if tzsign != '+' and tzsign != '-': if tzsign != '+' and tzsign != '-':
tz = "+" + ("%s" % tz) self.tz = "+" + ("%s" % self.tz)
self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git-fast-import") self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git-fast-import")
@ -774,7 +774,7 @@ class GitSync(Command):
else: else:
changes = [] changes = []
if len(changesFile) > 0: if len(self.changesFile) > 0:
output = open(self.changesFile).readlines() output = open(self.changesFile).readlines()
changeSet = Set() changeSet = Set()
for line in output: for line in output:
@ -794,7 +794,7 @@ class GitSync(Command):
changes.reverse() changes.reverse()
if len(changes) == 0: if len(changes) == 0:
if not silent: if not self.silent:
print "no changes to import!" print "no changes to import!"
sys.exit(1) sys.exit(1)
@ -802,7 +802,7 @@ class GitSync(Command):
for change in changes: for change in changes:
description = p4Cmd("describe %s" % change) description = p4Cmd("describe %s" % change)
if not silent: if not self.silent:
sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes))) sys.stdout.write("\rimporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
sys.stdout.flush() sys.stdout.flush()
cnt = cnt + 1 cnt = cnt + 1
@ -841,7 +841,7 @@ class GitSync(Command):
merged = "refs/heads/" + merged merged = "refs/heads/" + merged
self.commit(description, files, branch, branchPrefix, parent, merged) self.commit(description, files, branch, branchPrefix, parent, merged)
else: else:
self.commit(description, files, branch, globalPrefix, initialParent) self.commit(description, files, self.branch, self.globalPrefix, self.initialParent)
self.initialParent = "" self.initialParent = ""
except IOError: except IOError:
print self.gitError.read() print self.gitError.read()