##// END OF EJS Templates
cvsps: fix up some whitespace
Matt Mackall -
r6688:5cd7a843 default
parent child Browse files
Show More
@@ -115,7 +115,8 b' def createlog(ui, directory=None, root="'
115 # are mapped to different cache file names.
115 # are mapped to different cache file names.
116 cachefile = root.split(":")+[directory, "cache"]
116 cachefile = root.split(":") + [directory, "cache"]
117 cachefile = ['-'.join(re.findall(r'\w+', s)) for s in cachefile if s]
117 cachefile = ['-'.join(re.findall(r'\w+', s)) for s in cachefile if s]
118 cachefile = os.path.join(cachedir, '.'.join([s for s in cachefile if s]))
118 cachefile = os.path.join(cachedir,
119 '.'.join([s for s in cachefile if s]))
119
120
120 if cache == 'update':
121 if cache == 'update':
121 try:
122 try:
@@ -266,7 +267,7 b' def createlog(ui, directory=None, root="'
266 state = 7
267 state = 7
267
268
268 elif state == 7:
269 elif state == 7:
269 # read the revision numbers of branches that start at this revision,
270 # read the revision numbers of branches that start at this revision
270 # or store the commit log message otherwise
271 # or store the commit log message otherwise
271 m = re_70.match(line)
272 m = re_70.match(line)
272 if m:
273 if m:
@@ -330,7 +331,8 b' def createlog(ui, directory=None, root="'
330 listsort(log, key=lambda x:x.date)
331 listsort(log, key=lambda x:x.date)
331
332
332 if oldlog and oldlog[-1].date >= log[0].date:
333 if oldlog and oldlog[-1].date >= log[0].date:
333 raise logerror('Log cache overlaps with new log entries, re-run without cache.')
334 raise logerror('Log cache overlaps with new log entries,'
335 ' re-run without cache.')
334
336
335 log = oldlog+log
337 log = oldlog + log
336
338
@@ -377,14 +379,17 b' def createchangeset(ui, log, fuzz=60, me'
377 e.comment == c.comment and
379 e.comment == c.comment and
378 e.author == c.author and
380 e.author == c.author and
379 e.branch == c.branch and
381 e.branch == c.branch and
380 (c.date[0]+c.date[1]) <= (e.date[0]+e.date[1]) <= (c.date[0]+c.date[1])+fuzz and
382 ((c.date[0] + c.date[1]) <=
383 (e.date[0] + e.date[1]) <=
384 (c.date[0] + c.date[1]) + fuzz) and
381 e.file not in files):
385 e.file not in files):
382 c = changeset(comment=e.comment, author=e.author,
386 c = changeset(comment=e.comment, author=e.author,
383 branch=e.branch, date=e.date, entries=[])
387 branch=e.branch, date=e.date, entries=[])
384 changesets.append(c)
388 changesets.append(c)
385 files = {}
389 files = {}
386 if len(changesets)%100 == 0:
390 if len(changesets) % 100 == 0:
387 ui.status(util.ellipsis('%d %s'%(len(changesets), repr(e.comment)[1:-1]), 80)+'\n')
391 t = '%d %s' % (len(changesets), repr(e.comment)[1:-1])
392 ui.status(util.ellipsis(t, 80) + '\n')
388
393
389 e.Changeset = c
394 e.Changeset = c
390 c.entries.append(e)
395 c.entries.append(e)
General Comments 0
You need to be logged in to leave comments. Login now