Quellcode durchsuchen

Rename merge_base to graph, update NEWS.

Jelmer Vernooij vor 4 Jahren
Ursprung
Commit
25a6718003
4 geänderte Dateien mit 5 neuen und 3 gelöschten Zeilen
  1. 2 0
      NEWS
  2. 0 0
      dulwich/graph.py
  3. 1 1
      dulwich/tests/__init__.py
  4. 2 2
      dulwich/tests/test_graph.py

+ 2 - 0
NEWS

@@ -7,6 +7,8 @@
    already have those objects. Thanks to Martijn Pieters for
    the detailed bug report. (Jelmer Vernooij, #781)
 
+ * Add functionality for finding the merge base. (Kevin Hendricks)
+
 0.20.3	2020-06-14
 
  * Add support for remembering remote refs after push/pull.

+ 0 - 0
dulwich/merge_base.py → dulwich/graph.py


+ 1 - 1
dulwich/tests/__init__.py

@@ -108,6 +108,7 @@ def self_test_suite():
         'fastexport',
         'file',
         'grafts',
+        'graph',
         'greenthreads',
         'hooks',
         'ignore',
@@ -116,7 +117,6 @@ def self_test_suite():
         'line_ending',
         'lru_cache',
         'mailmap',
-        'merge_base',
         'objects',
         'objectspec',
         'object_store',

+ 2 - 2
dulwich/tests/test_merge_base.py → dulwich/tests/test_graph.py

@@ -19,11 +19,11 @@
 # and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
 # License, Version 2.0.
 
-"""Tests for merge_base."""
+"""Tests for dulwich.graph."""
 
 from dulwich.tests import TestCase
 
-from dulwich.merge_base import _find_lcas
+from dulwich.graph import _find_lcas
 
 
 class FindMergeBaseTests(TestCase):