# HG changeset patch # User David Douard # Date 1342608041 -7200 # Node ID f2168d0b5700028e657fa233eafdf895a6cdd6da # Parent 381ce7036d6dd6f67335469ca3f6f8ef08806c30 qsync: ignore unexistent nodes diff --git a/hgext/qsync.py b/hgext/qsync.py --- a/hgext/qsync.py +++ b/hgext/qsync.py @@ -86,7 +86,7 @@ obsolete = extensions.find('obsolete') newnodes = obsolete.newerversion(repo, oldnode) if newnodes: - newnodes = [n for n in newnodes if n] # remove killing + newnodes = [n for n in newnodes if n and n[0] in repo] # remove killing if not newnodes: # changeset has been killed (eg. reject) pass @@ -175,7 +175,7 @@ oldnode = bin(oldhex) newnodes = obsolete.newerversion(repo, oldnode) if newnodes: - newnodes = [n for n in newnodes if n] # remove killing + newnodes = [n for n in newnodes if n and n[0] in repo] # remove killing if len(newnodes) > 1: newnodes = [short(nodes[0]) for nodes in newnodes] raise util.Abort('%s have more than one newer version: %s'% (oldname, newnodes))