Rename "Same" to "Flush"

Proper type hack for sentinel object for mypy

Author: kaste

core/commands/log_graph.py

@@ -243,11 +243,19 @@ def augment_color_scheme(view):
 
 
 MAX_LOOK_AHEAD = 10000
-Same = object()
+if MYPY:
+    from enum import Enum
+
+    class FlushT(Enum):
+        token = 0
+    Flush = FlushT.token
+
+else:
+    Flush = object()
 
 
 def diff(a, b):
-    # type: (Sequence[str], Iterable[str]) -> Iterator[Union[Ins, Del]]
+    # type: (Sequence[str], Iterable[str]) -> Iterator[Union[Ins, Del, FlushT]]
     a_index = 0
     b_index = -1  # init in case b is empty
     len_a = len(a)
@@ -268,7 +276,7 @@ def diff(a, b):
         else:
             if i == 0:
                 a_index += 1
-                yield Same
+                yield Flush
             else:
                 len_a -= i
                 a_index += i + 1
@@ -279,10 +287,10 @@ def diff(a, b):
 
 
 def simplify(diff, max_size):
-    # type: (Iterable[Union[Ins, Del]], int) -> Iterator[Union[Ins, Del, Replace]]
+    # type: (Iterable[Union[Ins, Del, FlushT]], int) -> Iterator[Union[Ins, Del, Replace]]
     previous = None  # type: Union[Ins, Del, Replace, None]
     for token in diff:
-        if token is Same:
+        if token is Flush:
             if previous is not None:
                 yield previous
                 previous = None

tests/test_graph_diff.py

@@ -4,7 +4,7 @@
 
 
 from GitSavvy.core.commands.log_graph import (
-    diff, simplify, normalize_tokens, apply_diff, Ins, Del, Replace, Same
+    diff, simplify, normalize_tokens, apply_diff, Ins, Del, Replace, Flush
 )
 
 
@@ -26,7 +26,7 @@ def tx(tokens):
 
 
 def filter_same(it):
-    return filter(lambda t: t is not Same, it)
+    return filter(lambda t: t is not Flush, it)
 
 
 class TestGraphDiff(DeferrableTestCase):