equal
deleted
inserted
replaced
196 |
196 |
197 # Collect information about copied files |
197 # Collect information about copied files |
198 for filename in copiedfiles: |
198 for filename in copiedfiles: |
199 oldname = depotname[filename] |
199 oldname = depotname[filename] |
200 |
200 |
201 flcmd = 'p4 -G filelog %s' \ |
201 flcmd = ('p4 -G filelog %s' |
202 % procutil.shellquote(oldname) |
202 % procutil.shellquote(oldname)) |
203 flstdout = procutil.popen(flcmd, mode='rb') |
203 flstdout = procutil.popen(flcmd, mode='rb') |
204 |
204 |
205 copiedfilename = None |
205 copiedfilename = None |
206 for d in loaditer(flstdout): |
206 for d in loaditer(flstdout): |
207 copiedoldname = None |
207 copiedoldname = None |
270 |
270 |
271 def getheads(self): |
271 def getheads(self): |
272 return self.heads |
272 return self.heads |
273 |
273 |
274 def getfile(self, name, rev): |
274 def getfile(self, name, rev): |
275 cmd = 'p4 -G print %s' \ |
275 cmd = ('p4 -G print %s' |
276 % procutil.shellquote("%s#%s" % (self.depotname[name], rev)) |
276 % procutil.shellquote("%s#%s" % (self.depotname[name], rev))) |
277 |
277 |
278 lasterror = None |
278 lasterror = None |
279 while True: |
279 while True: |
280 stdout = procutil.popen(cmd, mode='rb') |
280 stdout = procutil.popen(cmd, mode='rb') |
281 |
281 |