[PATCH 2 of 2 STABLE V2] bookmark: prevent crashing when a successor is unknown locally (issue3680)

[Thomas Arendsen Hein]

* Pierre-Yves David <pierre-yves.david at ens-lyon.org> [20121025 23:51]:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at logilab.fr>
> # Date 1351201432 -7200
> # Branch stable
> # Node ID f13b8ee57d1e541a0e7bfcf7a938005dd7641a64
> # Parent  6a780ab5ede790067187aee1483f914731e7c360
> bookmark: prevent crashing when a successor is unknown locally (issue3680)

I pushed both patches with this followup patch to crew-stable:

# HG changeset patch
# User Thomas Arendsen Hein <thomas at intevation.de>
# Date 1351236590 -7200
# Branch stable
# Node ID 75b43843eb4d4302f4584034e2e629e1edafe1a9
# Parent  daf32ebfde6bd2f45c28f7e26e33f83e64c2f24e
bookmark: simplify nodemap check introduced in the previous changeset

diff -r daf32ebfde6b -r 75b43843eb4d mercurial/bookmarks.py
--- a/mercurial/bookmarks.py	Thu Oct 25 23:43:52 2012 +0200
+++ b/mercurial/bookmarks.py	Fri Oct 26 09:29:50 2012 +0200
@@ -268,7 +268,7 @@
                     # obsolescence marker does not apply to public changeset
                     succs.update(obsolete.allsuccessors(repo.obsstore,
                                                         [c.node()]))
-            known = (n for n in succs if nm.get(n) is not None)
+            known = (n for n in succs if n in nm)
             validdests = set(repo.set('%ln::', known))
         validdests.remove(old)
         return new in validdests


Regards,
Thomas

-- 
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Neuer Graben 17, 49074 Osnabrueck - AG Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner