mercurial/subrepo.py
changeset 22657 f4e39ceb064a
parent 22619 f6cf96804d27
child 22695 15a70ca40b22
equal deleted inserted replaced
22656:c9276945eba3 22657:f4e39ceb064a
     7 
     7 
     8 import errno, os, re, shutil, posixpath, sys
     8 import errno, os, re, shutil, posixpath, sys
     9 import xml.dom.minidom
     9 import xml.dom.minidom
    10 import stat, subprocess, tarfile
    10 import stat, subprocess, tarfile
    11 from i18n import _
    11 from i18n import _
    12 import config, util, node, error, cmdutil, bookmarks, match as matchmod
    12 import config, util, node, error, cmdutil, match as matchmod
    13 import phases
    13 import phases
    14 import pathutil
    14 import pathutil
    15 import exchange
    15 import exchange
    16 hg = None
    16 hg = None
    17 propertycache = util.propertycache
    17 propertycache = util.propertycache
   741             self._cachestorehash(srcurl)
   741             self._cachestorehash(srcurl)
   742         else:
   742         else:
   743             self._repo.ui.status(_('pulling subrepo %s from %s\n')
   743             self._repo.ui.status(_('pulling subrepo %s from %s\n')
   744                                  % (subrelpath(self), srcurl))
   744                                  % (subrelpath(self), srcurl))
   745             cleansub = self.storeclean(srcurl)
   745             cleansub = self.storeclean(srcurl)
   746             remotebookmarks = other.listkeys('bookmarks')
       
   747             self._repo.pull(other)
   746             self._repo.pull(other)
   748             bookmarks.updatefromremote(self._repo.ui, self._repo,
       
   749                                        remotebookmarks, srcurl)
       
   750             if cleansub:
   747             if cleansub:
   751                 # keep the repo clean after pull
   748                 # keep the repo clean after pull
   752                 self._cachestorehash(srcurl)
   749                 self._cachestorehash(srcurl)
   753         return False
   750         return False
   754 
   751