Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 13365:f1c5294e9119
bookmarks: merge suspect addchangegroup into core
This is marked with FIXME because it's not clear that it makes any sense.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 10 Feb 2011 13:46:28 -0600 |
| parents | ddddb76f2da3 |
| children | caa561759538 |
comparison
equal
deleted
inserted
replaced
| 13364:ddddb76f2da3 | 13365:f1c5294e9119 |
|---|---|
| 1888 source=srctype, url=url) | 1888 source=srctype, url=url) |
| 1889 | 1889 |
| 1890 for i in xrange(clstart, clend): | 1890 for i in xrange(clstart, clend): |
| 1891 self.hook("incoming", node=hex(cl.node(i)), | 1891 self.hook("incoming", node=hex(cl.node(i)), |
| 1892 source=srctype, url=url) | 1892 source=srctype, url=url) |
| 1893 | |
| 1894 # FIXME - why does this care about tip? | |
| 1895 if newheads == oldheads: | |
| 1896 bookmarks.update(self, self.dirstate.parents(), self['tip'].node()) | |
| 1893 | 1897 |
| 1894 # never return 0 here: | 1898 # never return 0 here: |
| 1895 if newheads < oldheads: | 1899 if newheads < oldheads: |
| 1896 return newheads - oldheads - 1 | 1900 return newheads - oldheads - 1 |
| 1897 else: | 1901 else: |