From 1d85449b0b35044da7a53530ea334c983897475c Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 20 Jun 2019 14:34:14 -0500
Subject: [PATCH] gitrange(): always check negatives first

Also, always add the parents as negatives.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 git-remote-hg | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/git-remote-hg b/git-remote-hg
index 26c225c..4d15fa4 100755
--- a/git-remote-hg
+++ b/git-remote-hg
@@ -487,19 +487,17 @@ def gitrange(repo, a, b):
 
         parents = [p for p in pfunc(cur) if p >= 0]
 
-        if cur in pending:
+        if cur in negative:
+            negative.remove(cur)
+            for p in parents:
+                negative.add(p)
+                pending.discard(p)
+        elif cur in pending:
             positive.append(cur)
             pending.remove(cur)
             for p in parents:
                 if p not in negative:
                     pending.add(p)
-        elif cur in negative:
-            negative.remove(cur)
-            for p in parents:
-                if p not in pending:
-                    negative.add(p)
-                else:
-                    pending.discard(p)
 
     positive.reverse()
     return positive