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

git-p4: Optimize the fetching of data from perforce.

Browse Source 
Use shallow copies in loop, and join content at the end. Then do the substitution, if needed.

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Marius Storm-Olsen 2008-03-03 13:42:47 +01:00 committed by Simon Hausmann
parent a6828f5361
commit 8ff45f2af5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/fast-import/git-p4
View File

@ -882,21 +882,21 @@ class P4Sync(Command):
while j < len(filedata): while j < len(filedata):
stat = filedata[j] stat = filedata[j]
j += 1 j += 1
text = '' text = [];
while j < len(filedata) and filedata[j]['code'] in ('text', 'unicode', 'binary'): while j < len(filedata) and filedata[j]['code'] in ('text', 'unicode', 'binary'):
tmp = filedata[j]['data'] text.append(filedata[j]['data'])
if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):
tmp = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', tmp)
elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'):
tmp = re.sub(r'(?i)\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', tmp)
text += tmp
j += 1 j += 1
text = ''.join(text)
if not stat.has_key('depotFile'): if not stat.has_key('depotFile'):
sys.stderr.write("p4 print fails with: %s\n" % repr(stat)) sys.stderr.write("p4 print fails with: %s\n" % repr(stat))
continue continue
if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):
text = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', text)
elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'):
text = re.sub(r'(?i)\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', text)
contents[stat['depotFile']] = text contents[stat['depotFile']] = text
for f in filesForCommit: for f in filesForCommit: