equal
deleted
inserted
replaced
1344 result = self.addchangegroup(cg, 'pull', remote.url(), |
1344 result = self.addchangegroup(cg, 'pull', remote.url(), |
1345 lock=lock) |
1345 lock=lock) |
1346 finally: |
1346 finally: |
1347 lock.release() |
1347 lock.release() |
1348 |
1348 |
1349 self.ui.debug("checking for updated bookmarks\n") |
|
1350 rb = remote.listkeys('bookmarks') |
|
1351 changed = False |
|
1352 for k in rb.keys(): |
|
1353 if k in self._bookmarks: |
|
1354 nr, nl = rb[k], self._bookmarks[k] |
|
1355 if nr in self: |
|
1356 cr = self[nr] |
|
1357 cl = self[nl] |
|
1358 if cl.rev() >= cr.rev(): |
|
1359 continue |
|
1360 if cr in cl.descendants(): |
|
1361 self._bookmarks[k] = cr.node() |
|
1362 changed = True |
|
1363 self.ui.status(_("updating bookmark %s\n") % k) |
|
1364 else: |
|
1365 self.ui.warn(_("not updating divergent" |
|
1366 " bookmark %s\n") % k) |
|
1367 if changed: |
|
1368 bookmarks.write(self) |
|
1369 |
|
1370 return result |
1349 return result |
1371 |
1350 |
1372 def checkpush(self, force, revs): |
1351 def checkpush(self, force, revs): |
1373 """Extensions can override this function if additional checks have |
1352 """Extensions can override this function if additional checks have |
1374 to be performed before pushing, or call it if they override push |
1353 to be performed before pushing, or call it if they override push |