Mercurial > hg
comparison mercurial/subrepo.py @ 15828:4bc715f2a356
subrepo: avoid syncing bookmarks twice on clone (issue3191)
Clone internally handles bookmark synchronization.
(Fix spotted by Eric Blood)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 10 Jan 2012 13:48:42 -0600 |
| parents | 5b384b7f48d5 |
| children | c654eac03452 |
comparison
equal
deleted
inserted
replaced
| 15827:1dacf7672556 | 15828:4bc715f2a356 |
|---|---|
| 482 self._initrepo(parentrepo, source, create=True) | 482 self._initrepo(parentrepo, source, create=True) |
| 483 else: | 483 else: |
| 484 self._repo.ui.status(_('pulling subrepo %s from %s\n') | 484 self._repo.ui.status(_('pulling subrepo %s from %s\n') |
| 485 % (subrelpath(self), srcurl)) | 485 % (subrelpath(self), srcurl)) |
| 486 self._repo.pull(other) | 486 self._repo.pull(other) |
| 487 bookmarks.updatefromremote(self._repo.ui, self._repo, other, | 487 bookmarks.updatefromremote(self._repo.ui, self._repo, other, |
| 488 srcurl) | 488 srcurl) |
| 489 | 489 |
| 490 def get(self, state, overwrite=False): | 490 def get(self, state, overwrite=False): |
| 491 self._get(state) | 491 self._get(state) |
| 492 source, revision, kind = state | 492 source, revision, kind = state |
| 493 self._repo.ui.debug("getting subrepo %s\n" % self._path) | 493 self._repo.ui.debug("getting subrepo %s\n" % self._path) |