545 self._repo = cloned.local() |
545 self._repo = cloned.local() |
546 self._initrepo(parentrepo, source, create=True) |
546 self._initrepo(parentrepo, source, create=True) |
547 else: |
547 else: |
548 self._repo.ui.status(_('pulling subrepo %s from %s\n') |
548 self._repo.ui.status(_('pulling subrepo %s from %s\n') |
549 % (subrelpath(self), srcurl)) |
549 % (subrelpath(self), srcurl)) |
|
550 remotebookmarks = other.listkeys('bookmarks') |
550 self._repo.pull(other) |
551 self._repo.pull(other) |
551 bookmarks.updatefromremote(self._repo.ui, self._repo, other, |
552 bookmarks.updatefromremote(self._repo.ui, self._repo, |
552 srcurl) |
553 remotebookmarks, srcurl) |
553 |
554 |
554 @annotatesubrepoerror |
555 @annotatesubrepoerror |
555 def get(self, state, overwrite=False): |
556 def get(self, state, overwrite=False): |
556 self._get(state) |
557 self._get(state) |
557 source, revision, kind = state |
558 source, revision, kind = state |