mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

look for 'text' and 'binary' files.

Browse Source 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
This commit is contained in:
Han-Wen Nienhuys
2007-05-23 18:49:35 -03:00
parent b1ce944726
commit 7530a40ce2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -697,7 +697,8 @@ class P4Sync(Command):
stat = filedata[j] stat = filedata[j]
j += 1 j += 1
text = '' text = ''
while j < len(filedata) and filedata[j]['code'] == 'text': while j < len(filedata) and filedata[j]['code'] in ('text',
'binary'):
text += filedata[j]['data'] text += filedata[j]['data']
j += 1 j += 1
@ -773,7 +774,7 @@ class P4Sync(Command):
if self.isWindows and file["type"].endswith("text"): if self.isWindows and file["type"].endswith("text"):
data = data.replace("\r\n", "\n") data = data.replace("\r\n", "\n")
self.gitStream.write("M %s inline %s\n" % (mode, relPath)) self.gitStream.write("M %d inline %s\n" % (mode, relPath))
self.gitStream.write("data %s\n" % len(data)) self.gitStream.write("data %s\n" % len(data))
self.gitStream.write(data) self.gitStream.write(data)
self.gitStream.write("\n") self.gitStream.write("\n")