Mercurial > hg

changeset 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 41f2fa72fa82
children f7dd8bffe18c
files mercurial/subrepo.py tests/test-subrepo-recursion.t
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Sun Sep 26 22:22:59 2010 +0200
+++ b/mercurial/subrepo.py	Mon Sep 13 10:33:49 2010 -0300
@@ -331,7 +331,7 @@
             ctx2 = self._repo[rev2]
             return self._repo.status(ctx1, ctx2, **opts)
         except error.RepoLookupError, inst:
-            self._repo.ui.warn(_("warning: %s in %s\n")
+            self._repo.ui.warn(_('warning: error "%s" in subrepository "%s"\n')
                                % (inst, relpath(self)))
             return [], [], [], [], [], [], []
 
@@ -347,7 +347,7 @@
                                    prefix=os.path.join(prefix, self._path),
                                    listsubrepos=True, **opts)
         except error.RepoLookupError, inst:
-            self._repo.ui.warn(_("warning: %s in %s\n")
+            self._repo.ui.warn(_('warning: error "%s" in subrepository "%s"\n')
                                % (inst, relpath(self)))
 
     def archive(self, archiver, prefix):
--- a/tests/test-subrepo-recursion.t	Sun Sep 26 22:22:59 2010 +0200
+++ b/tests/test-subrepo-recursion.t	Mon Sep 13 10:33:49 2010 -0300
@@ -350,4 +350,4 @@
 
   $ rm -r foo
   $ hg status
-  warning: unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98' in foo
+  warning: error "unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'" in subrepository "foo"