Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 12503:b4711585a455

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: improve lookup error messages
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 13 Sep 2010 10:33:49 -0300
parents f00953d9533c
children e7d45e41338c
comparison
equal deleted inserted replaced
12502:41f2fa72fa82 12503:b4711585a455
329 rev1 = self._state[1] 329 rev1 = self._state[1]
330 ctx1 = self._repo[rev1] 330 ctx1 = self._repo[rev1]
331 ctx2 = self._repo[rev2] 331 ctx2 = self._repo[rev2]
332 return self._repo.status(ctx1, ctx2, **opts) 332 return self._repo.status(ctx1, ctx2, **opts)
333 except error.RepoLookupError, inst: 333 except error.RepoLookupError, inst:
334 self._repo.ui.warn(_("warning: %s in %s\n") 334 self._repo.ui.warn(_('warning: error "%s" in subrepository "%s"\n')
335 % (inst, relpath(self))) 335 % (inst, relpath(self)))
336 return [], [], [], [], [], [], [] 336 return [], [], [], [], [], [], []
337 337
338 def diff(self, diffopts, node2, match, prefix, **opts): 338 def diff(self, diffopts, node2, match, prefix, **opts):
339 try: 339 try:
345 cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts, 345 cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts,
346 node1, node2, match, 346 node1, node2, match,
347 prefix=os.path.join(prefix, self._path), 347 prefix=os.path.join(prefix, self._path),
348 listsubrepos=True, **opts) 348 listsubrepos=True, **opts)
349 except error.RepoLookupError, inst: 349 except error.RepoLookupError, inst:
350 self._repo.ui.warn(_("warning: %s in %s\n") 350 self._repo.ui.warn(_('warning: error "%s" in subrepository "%s"\n')
351 % (inst, relpath(self))) 351 % (inst, relpath(self)))
352 352
353 def archive(self, archiver, prefix): 353 def archive(self, archiver, prefix):
354 abstractsubrepo.archive(self, archiver, prefix) 354 abstractsubrepo.archive(self, archiver, prefix)
355 355