changeset 20317:d6939f29b3b3 stable

subrepo: do not try to get hidden revisions If a subrepo revision is hidden (because it was amended, for example) it does not make sense to try to "get" it from the remote subrepository. Note that in order to avoid making the change look bigger than it is, this adds an unnecessary else clause. This will be removed on a follow up patch.
author Angel Ezquerra <angel.ezquerra@gmail.com>
date Sun, 24 Nov 2013 02:10:14 +0100
parents 40f08c31844c
children c5aef7a66607
files mercurial/subrepo.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Thu Jan 23 19:08:26 2014 +0100
+++ b/mercurial/subrepo.py	Sun Nov 24 02:10:14 2013 +0100
@@ -701,7 +701,9 @@
 
     def _get(self, state):
         source, revision, kind = state
-        if revision not in self._repo:
+        if revision in self._repo.unfiltered():
+            return
+        else:
             self._repo._subsource = source
             srcurl = _abssource(self._repo)
             other = hg.peer(self._repo, {}, srcurl)