Mercurial > public > mercurial-scm > hg-stable

diff mercurial/scmutil.py @ 18617:227479f61db9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
outgoing: fix possible filtering crash in outgoing (issue3814) If there is no outgoiing changesets but we have filtered revision in outgoing.excluded We run into a filtering related crash. The excluded revision should not be there in the first place but discovery need cleanup in default, not stable.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sat, 09 Feb 2013 17:54:01 +0000
parents ac0c12123743
children 43ffd0279876
line wrap: on
line diff
--- a/mercurial/scmutil.py	Fri Feb 08 23:13:47 2013 +0000
+++ b/mercurial/scmutil.py	Sat Feb 09 17:54:01 2013 +0000
@@ -18,6 +18,10 @@
     secretlist = []
     if excluded:
         for n in excluded:
+            if n not in repo:
+                # discovery should not have included the filtered revision,
+                # we have to explicitly exclude it until discovery is cleanup.
+                continue
             ctx = repo[n]
             if ctx.phase() >= phases.secret and not ctx.extinct():
                 secretlist.append(n)