Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 15614:260a6449d83a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
author Matt Mackall <mpm@selenic.com>
date Wed, 07 Dec 2011 16:19:39 -0600
parents 80ec63090a7a
children 309e49491253
comparison
equal deleted inserted replaced
15613:2fad18f15409 15614:260a6449d83a
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 489
489 def get(self, state, overwrite=False): 490 def get(self, state, overwrite=False):
490 self._get(state) 491 self._get(state)
491 source, revision, kind = state 492 source, revision, kind = state
492 self._repo.ui.debug("getting subrepo %s\n" % self._path) 493 self._repo.ui.debug("getting subrepo %s\n" % self._path)