##// END OF EJS Templates
cvsps: cvs log loop uses lookahead to avoid misleading text...
David Champion -
r7593:9811cc67 default
parent child Browse files
Show More
@@ -191,7 +191,13 b' def createlog(ui, directory=None, root="'
191 ui.note(_("running %s\n") % (' '.join(cmd)))
191 ui.note(_("running %s\n") % (' '.join(cmd)))
192 ui.debug(_("prefix=%r directory=%r root=%r\n") % (prefix, directory, root))
192 ui.debug(_("prefix=%r directory=%r root=%r\n") % (prefix, directory, root))
193
193
194 for line in util.popen(' '.join(cmd)):
194 pfp = util.popen(' '.join(cmd))
195 peek = pfp.readline()
196 while True:
197 line = peek
198 if line == '':
199 break
200 peek = pfp.readline()
195 if line.endswith('\n'):
201 if line.endswith('\n'):
196 line = line[:-1]
202 line = line[:-1]
197 #ui.debug('state=%d line=%r\n' % (state, line))
203 #ui.debug('state=%d line=%r\n' % (state, line))
@@ -312,7 +318,7 b' def createlog(ui, directory=None, root="'
312 e.branches = [tuple([int(y) for y in x.strip().split('.')])
318 e.branches = [tuple([int(y) for y in x.strip().split('.')])
313 for x in m.group(1).split(';')]
319 for x in m.group(1).split(';')]
314 state = 8
320 state = 8
315 elif re_31.match(line):
321 elif re_31.match(line) and re_50.match(peek):
316 state = 5
322 state = 5
317 store = True
323 store = True
318 elif re_32.match(line):
324 elif re_32.match(line):
General Comments 0
You need to be logged in to leave comments. Login now