Show More
@@ -310,6 +310,28 b' def reposetup(ui, repo):' | |||||
310 |
|
310 | |||
311 | return result |
|
311 | return result | |
312 |
|
312 | |||
|
313 | def push(self, remote, force=False, revs=None, newbranch=False): | |||
|
314 | result = super(bookmark_repo, self).push(remote, force, revs, | |||
|
315 | newbranch) | |||
|
316 | ||||
|
317 | self.ui.debug("checking for updated bookmarks\n") | |||
|
318 | rb = remote.listkeys('bookmarks') | |||
|
319 | for k in rb.keys(): | |||
|
320 | if k in self._bookmarks: | |||
|
321 | nr, nl = rb[k], self._bookmarks[k] | |||
|
322 | if nr in self: | |||
|
323 | cr = self[nr] | |||
|
324 | cl = self[nl] | |||
|
325 | if cl in cr.descendants(): | |||
|
326 | r = remote.pushkey('bookmarks', k, nr, nl) | |||
|
327 | if r: | |||
|
328 | self.ui.status(_("updating bookmark %s\n") % k) | |||
|
329 | else: | |||
|
330 | self.ui.warn(_("failed to update bookmark" | |||
|
331 | " %s!\n") % k) | |||
|
332 | ||||
|
333 | return result | |||
|
334 | ||||
313 | def addchangegroup(self, source, srctype, url, emptyok=False): |
|
335 | def addchangegroup(self, source, srctype, url, emptyok=False): | |
314 | parents = self.dirstate.parents() |
|
336 | parents = self.dirstate.parents() | |
315 |
|
337 |
General Comments 0
You need to be logged in to leave comments.
Login now