Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 16683:525fdb738975

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: eradicate long lines
author Brodie Rao <brodie@sf.io>
date Sat, 12 May 2012 15:54:54 +0200
parents 95ca6c8b38da
children 2e3513e7348a
comparison
equal deleted inserted replaced
16676:654b9e1966f7 16683:525fdb738975
198 if dirty: 198 if dirty:
199 msg = (_(' subrepository sources for %s differ\n' 199 msg = (_(' subrepository sources for %s differ\n'
200 'use (l)ocal source (%s) or (r)emote source (%s)?\n') 200 'use (l)ocal source (%s) or (r)emote source (%s)?\n')
201 % (subrelpath(sub), local, remote)) 201 % (subrelpath(sub), local, remote))
202 else: 202 else:
203 msg = (_(' subrepository sources for %s differ (in checked out version)\n' 203 msg = (_(' subrepository sources for %s differ (in checked out '
204 'version)\n'
204 'use (l)ocal source (%s) or (r)emote source (%s)?\n') 205 'use (l)ocal source (%s) or (r)emote source (%s)?\n')
205 % (subrelpath(sub), local, remote)) 206 % (subrelpath(sub), local, remote))
206 return ui.promptchoice(msg, (_('&Local'), _('&Remote')), 0) 207 return ui.promptchoice(msg, (_('&Local'), _('&Remote')), 0)
207 208
208 def reporelpath(repo): 209 def reporelpath(repo):
496 if len(self._repo) == 0: 497 if len(self._repo) == 0:
497 self._repo.ui.status(_('cloning subrepo %s from %s\n') 498 self._repo.ui.status(_('cloning subrepo %s from %s\n')
498 % (subrelpath(self), srcurl)) 499 % (subrelpath(self), srcurl))
499 parentrepo = self._repo._subparent 500 parentrepo = self._repo._subparent
500 shutil.rmtree(self._repo.path) 501 shutil.rmtree(self._repo.path)
501 other, self._repo = hg.clone(self._repo._subparent.ui, {}, other, 502 other, self._repo = hg.clone(self._repo._subparent.ui, {},
502 self._repo.root, update=False) 503 other, self._repo.root,
504 update=False)
503 self._initrepo(parentrepo, source, create=True) 505 self._initrepo(parentrepo, source, create=True)
504 else: 506 else:
505 self._repo.ui.status(_('pulling subrepo %s from %s\n') 507 self._repo.ui.status(_('pulling subrepo %s from %s\n')
506 % (subrelpath(self), srcurl)) 508 % (subrelpath(self), srcurl))
507 self._repo.pull(other) 509 self._repo.pull(other)