comparison mercurial/hgweb/hgwebdir_mod.py @ 25399:724d7982b790

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 02 Jun 2015 13:24:39 -0500
parents ef36536abea3 78e8890cfb4b
children d0c7ffc4c8bc
comparison
equal deleted inserted replaced
25398:633d07045494 25399:724d7982b790
353 except OSError: 353 except OSError:
354 continue 354 continue
355 355
356 contact = get_contact(get) 356 contact = get_contact(get)
357 description = get("web", "description", "") 357 description = get("web", "description", "")
358 seenrepos.add(name)
358 name = get("web", "name", name) 359 name = get("web", "name", name)
359 row = {'contact': contact or "unknown", 360 row = {'contact': contact or "unknown",
360 'contact_sort': contact.upper() or "unknown", 361 'contact_sort': contact.upper() or "unknown",
361 'name': name, 362 'name': name,
362 'name_sort': name, 363 'name_sort': name,
367 'lastchange_sort': d[1]-d[0], 368 'lastchange_sort': d[1]-d[0],
368 'archives': archivelist(u, "tip", url), 369 'archives': archivelist(u, "tip", url),
369 'isdirectory': None, 370 'isdirectory': None,
370 } 371 }
371 372
372 seenrepos.add(name)
373 yield row 373 yield row
374 374
375 sortdefault = None, False 375 sortdefault = None, False
376 def entries(sortcolumn="", descending=False, subdir="", **map): 376 def entries(sortcolumn="", descending=False, subdir="", **map):
377 rows = rawentries(subdir=subdir, **map) 377 rows = rawentries(subdir=subdir, **map)