equal
deleted
inserted
replaced
40 changegroup, |
40 changegroup, |
41 cmdutil, |
41 cmdutil, |
42 color, |
42 color, |
43 context, |
43 context, |
44 dagparser, |
44 dagparser, |
45 dagutil, |
|
46 encoding, |
45 encoding, |
47 error, |
46 error, |
48 exchange, |
47 exchange, |
49 extensions, |
48 extensions, |
50 filemerge, |
49 filemerge, |
789 force=True) |
788 force=True) |
790 common = set(common) |
789 common = set(common) |
791 if not opts.get('nonheads'): |
790 if not opts.get('nonheads'): |
792 ui.write(("unpruned common: %s\n") % |
791 ui.write(("unpruned common: %s\n") % |
793 " ".join(sorted(short(n) for n in common))) |
792 " ".join(sorted(short(n) for n in common))) |
794 cl = repo.changelog |
793 |
795 clnode = cl.node |
794 clnode = repo.changelog.node |
796 dag = dagutil.revlogdag(cl) |
795 common = repo.revs('heads(::%ln)', common) |
797 all = dag.ancestorset(cl.rev(n) for n in common) |
796 common = {clnode(r) for r in common} |
798 common = {clnode(r) for r in dag.headsetofconnecteds(all)} |
|
799 else: |
797 else: |
800 nodes = None |
798 nodes = None |
801 if pushedrevs: |
799 if pushedrevs: |
802 revs = scmutil.revrange(repo, pushedrevs) |
800 revs = scmutil.revrange(repo, pushedrevs) |
803 nodes = [repo[r].node() for r in revs] |
801 nodes = [repo[r].node() for r in revs] |