Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 3499:ceaa3fefc10c
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 24 Oct 2006 13:46:04 -0500 |
parents | ff06fe0703ef 0e68608bd11d |
children | bd8339976504 |
comparison
equal
deleted
inserted
replaced
3498:ff06fe0703ef | 3499:ceaa3fefc10c |
---|---|
1135 | 1135 |
1136 if r: | 1136 if r: |
1137 reqcnt += 1 | 1137 reqcnt += 1 |
1138 self.ui.debug(_("request %d: %s\n") % | 1138 self.ui.debug(_("request %d: %s\n") % |
1139 (reqcnt, " ".join(map(short, r)))) | 1139 (reqcnt, " ".join(map(short, r)))) |
1140 for p in range(0, len(r), 10): | 1140 for p in xrange(0, len(r), 10): |
1141 for b in remote.branches(r[p:p+10]): | 1141 for b in remote.branches(r[p:p+10]): |
1142 self.ui.debug(_("received %s:%s\n") % | 1142 self.ui.debug(_("received %s:%s\n") % |
1143 (short(b[0]), short(b[1]))) | 1143 (short(b[0]), short(b[1]))) |
1144 unknown.append(b) | 1144 unknown.append(b) |
1145 | 1145 |
1755 | 1755 |
1756 if changesets > 0: | 1756 if changesets > 0: |
1757 self.hook("changegroup", node=hex(self.changelog.node(cor+1)), | 1757 self.hook("changegroup", node=hex(self.changelog.node(cor+1)), |
1758 source=srctype, url=url) | 1758 source=srctype, url=url) |
1759 | 1759 |
1760 for i in range(cor + 1, cnr + 1): | 1760 for i in xrange(cor + 1, cnr + 1): |
1761 self.hook("incoming", node=hex(self.changelog.node(i)), | 1761 self.hook("incoming", node=hex(self.changelog.node(i)), |
1762 source=srctype, url=url) | 1762 source=srctype, url=url) |
1763 | 1763 |
1764 return newheads - oldheads + 1 | 1764 return newheads - oldheads + 1 |
1765 | 1765 |