Mercurial > hg > mercurial-crew-with-dirclash
comparison hgext/mq.py @ 4068:5b1f663ef86d
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 06 Feb 2007 16:12:22 -0600 |
parents | 5d6b3fa62736 8ee983e3d461 |
children | 165abe554c80 |
comparison
equal
deleted
inserted
replaced
4062:516f883e3d79 | 4068:5b1f663ef86d |
---|---|
676 h = heads.pop() | 676 h = heads.pop() |
677 n = h | 677 n = h |
678 while True: | 678 while True: |
679 seen[n] = 1 | 679 seen[n] = 1 |
680 pp = chlog.parents(n) | 680 pp = chlog.parents(n) |
681 if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum: | 681 if pp[1] != revlog.nullid: |
682 if pp[1] not in seen: | 682 for p in pp: |
683 heads.append(pp[1]) | 683 if chlog.rev(p) > revnum and p not in seen: |
684 heads.append(p) | |
684 if pp[0] == revlog.nullid: | 685 if pp[0] == revlog.nullid: |
685 break | 686 break |
686 if chlog.rev(pp[0]) < revnum: | 687 if chlog.rev(pp[0]) < revnum: |
687 break | 688 break |
688 n = pp[0] | 689 n = pp[0] |