##// END OF EJS Templates
convert: when getting file from Perforce concatenate data at the end...
Eugene Baranov -
r25882:97a9f760 stable
parent child Browse files
Show More
@@ -216,7 +216,7 b' class p4_source(converter_source):'
216 216 stdout = util.popen(cmd, mode='rb')
217 217
218 218 mode = None
219 contents = ""
219 contents = []
220 220 keywords = None
221 221
222 222 for d in loaditer(stdout):
@@ -252,7 +252,7 b' class p4_source(converter_source):'
252 252 keywords = self.re_keywords
253 253
254 254 elif code == "text" or code == "binary":
255 contents += data
255 contents.append(data)
256 256
257 257 lasterror = None
258 258
@@ -262,6 +262,8 b' class p4_source(converter_source):'
262 262 if mode is None:
263 263 return None, None
264 264
265 contents = ''.join(contents)
266
265 267 if keywords:
266 268 contents = keywords.sub("$\\1$", contents)
267 269 if mode == "l" and contents.endswith("\n"):
General Comments 0
You need to be logged in to leave comments. Login now