Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/localrepo.py @ 20314:b396032e1bb8 stable
phase: properly compute ancestors of --rev on push (issue3786)
Now that discovery is working on unfiltered changeset, I had a good occasion to
look at that bug again. This let me realise that a trivial node vs rev
comparision was the cause of this two years old bugs?
Happy second birthday phases!
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Mon, 28 Jan 2013 15:16:49 +0100 |
| parents | 654dd8284ead |
| children | a959f7167077 |
comparison
equal
deleted
inserted
replaced
| 20313:dcd65ce87260 | 20314:b396032e1bb8 |
|---|---|
| 1897 # missing = ((commonheads::missingheads) - commonheads) | 1897 # missing = ((commonheads::missingheads) - commonheads) |
| 1898 # | 1898 # |
| 1899 # We can pick: | 1899 # We can pick: |
| 1900 # * missingheads part of common (::commonheads) | 1900 # * missingheads part of common (::commonheads) |
| 1901 common = set(outgoing.common) | 1901 common = set(outgoing.common) |
| 1902 cheads = [node for node in revs if node in common] | 1902 nm = self.changelog.nodemap |
| 1903 cheads = [node for node in revs if nm[node] in common] | |
| 1903 # and | 1904 # and |
| 1904 # * commonheads parents on missing | 1905 # * commonheads parents on missing |
| 1905 revset = unfi.set('%ln and parents(roots(%ln))', | 1906 revset = unfi.set('%ln and parents(roots(%ln))', |
| 1906 outgoing.commonheads, | 1907 outgoing.commonheads, |
| 1907 outgoing.missing) | 1908 outgoing.missing) |