equal
deleted
inserted
replaced
1316 self.ui.debug(_("branch already found\n")) |
1316 self.ui.debug(_("branch already found\n")) |
1317 continue |
1317 continue |
1318 elif n[1] and n[1] in m: # do we know the base? |
1318 elif n[1] and n[1] in m: # do we know the base? |
1319 self.ui.debug(_("found incomplete branch %s:%s\n") |
1319 self.ui.debug(_("found incomplete branch %s:%s\n") |
1320 % (short(n[0]), short(n[1]))) |
1320 % (short(n[0]), short(n[1]))) |
1321 search.append(n) # schedule branch range for scanning |
1321 search.append(n[0:2]) # schedule branch range for scanning |
1322 seenbranch[n] = 1 |
1322 seenbranch[n] = 1 |
1323 else: |
1323 else: |
1324 if n[1] not in seen and n[1] not in fetch: |
1324 if n[1] not in seen and n[1] not in fetch: |
1325 if n[2] in m and n[3] in m: |
1325 if n[2] in m and n[3] in m: |
1326 self.ui.debug(_("found new changeset %s\n") % |
1326 self.ui.debug(_("found new changeset %s\n") % |
1345 self.ui.debug(_("received %s:%s\n") % |
1345 self.ui.debug(_("received %s:%s\n") % |
1346 (short(b[0]), short(b[1]))) |
1346 (short(b[0]), short(b[1]))) |
1347 unknown.append(b) |
1347 unknown.append(b) |
1348 |
1348 |
1349 # do binary search on the branches we found |
1349 # do binary search on the branches we found |
1350 search = [(t, b) for (t, b, p1, p2) in search] |
|
1351 while search: |
1350 while search: |
1352 newsearch = [] |
1351 newsearch = [] |
1353 reqcnt += 1 |
1352 reqcnt += 1 |
1354 for n, l in zip(search, remote.between(search)): |
1353 for n, l in zip(search, remote.between(search)): |
1355 l.append(n[1]) |
1354 l.append(n[1]) |