comparison mercurial/scmutil.py @ 16791:977c80123835

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 30 May 2012 14:21:58 -0500
parents 525fdb738975 2a0efa1112ac
children 572d5e254f20
comparison
equal deleted inserted replaced
16788:7e72c1609862 16791:977c80123835
523 return repo.dirstate.p1(), None 523 return repo.dirstate.p1(), None
524 524
525 l = revrange(repo, revs) 525 l = revrange(repo, revs)
526 526
527 if len(l) == 0: 527 if len(l) == 0:
528 if revs:
529 raise util.Abort(_('empty revision range'))
528 return repo.dirstate.p1(), None 530 return repo.dirstate.p1(), None
529 531
530 if len(l) == 1: 532 if len(l) == 1 and len(revs) == 1 and _revrangesep not in revs[0]:
531 return repo.lookup(l[0]), None 533 return repo.lookup(l[0]), None
532 534
533 return repo.lookup(l[0]), repo.lookup(l[-1]) 535 return repo.lookup(l[0]), repo.lookup(l[-1])
534 536
535 _revrangesep = ':' 537 _revrangesep = ':'