u_boot_pylib: Move gitutil into the library

Move this file into U-Boot's Python library, so that it is no-longer
part of patman.

This makes a start on:

https://source.denx.de/u-boot/custodians/u-boot-dm/-/issues/35

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
index cbf1345281bfba64cf489b287331d708b08301b4..2568e4e842343ff6a337648a9abdb15b73e348db 100644 (file)
--- a/tools/buildman/builder.py
+++ b/tools/buildman/builder.py
@@ -19,8 +19,8 @@ import time
 
 from buildman import builderthread
 from buildman import toolchain
-from patman import gitutil
 from u_boot_pylib import command
+from u_boot_pylib import gitutil
 from u_boot_pylib import terminal
 from u_boot_pylib import tools
 from u_boot_pylib.terminal import tprint

diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py
index 29e6cf32af153c7c97c7a3d821aff5d2858a1de1..78c95a67095c84fd90b1d6f99209f2d272ad1765 100644 (file)
--- a/tools/buildman/builderthread.py
+++ b/tools/buildman/builderthread.py
@@ -17,8 +17,8 @@ import sys
 import threading
 
 from buildman import cfgutil
-from patman import gitutil
 from u_boot_pylib import command
+from u_boot_pylib import gitutil
 from u_boot_pylib import tools
 
 RETURN_CODE_RETRY = -1

diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 55d4d770c5cbc8951944efe2c65f3bce3af51a33..5109b1cd5ce64d89469a3828188014c5619a46b8 100644 (file)
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -20,9 +20,9 @@ from buildman import bsettings
 from buildman import cfgutil
 from buildman import toolchain
 from buildman.builder import Builder
-from patman import gitutil
 from patman import patchstream
 from u_boot_pylib import command
+from u_boot_pylib import gitutil
 from u_boot_pylib import terminal
 from u_boot_pylib import tools
 from u_boot_pylib.terminal import print_clear, tprint

diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py
index 4e12c671a3db7f2b4454456286b786cc65a84b1f..c7c4f506a656680d4b5ac388e0612131897d542c 100644 (file)
--- a/tools/buildman/func_test.py
+++ b/tools/buildman/func_test.py
@@ -18,8 +18,8 @@ from buildman import bsettings
 from buildman import cmdline
 from buildman import control
 from buildman import toolchain
-from patman import gitutil
 from u_boot_pylib import command
+from u_boot_pylib import gitutil
 from u_boot_pylib import terminal
 from u_boot_pylib import test_util
 from u_boot_pylib import tools

diff --git a/tools/buildman/main.py b/tools/buildman/main.py
index a948f36d9c0e7f04c30718ae58c6649339465734..72571b226d9af29b3fd230898eeebbb6cf919d36 100755 (executable)
--- a/tools/buildman/main.py
+++ b/tools/buildman/main.py
@@ -50,8 +50,7 @@ def run_tests(skip_net_tests, debug, verbose, args):
     # 'entry' module.
     result = test_util.run_test_suites(
         'buildman', debug, verbose, False, args.threads, test_name, [],
-        [test.TestBuild, func_test.TestFunctional,
-         'buildman.toolchain', 'patman.gitutil'])
+        [test.TestBuild, func_test.TestFunctional, 'buildman.toolchain'])
 
     return (0 if result.wasSuccessful() else 1)
 

diff --git a/tools/patman/__init__.py b/tools/patman/__init__.py
index 08eeffdf6d2c7500593f204254f23e0504087253..6de0e9fba103be96473050b7f0c890142deecfa4 100644 (file)
--- a/tools/patman/__init__.py
+++ b/tools/patman/__init__.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0+
 
 __all__ = ['checkpatch', 'commit', 'control', 'func_test', 'get_maintainer',
-           'gitutil', '__main__', 'patchstream', 'project', 'series',
-           'settings','setup', 'status', 'test_checkpatch', 'test_settings']
+           '__main__', 'patchstream', 'project', 'series',
+           'settings', 'setup', 'status', 'test_checkpatch', 'test_settings']

diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py
index f645b38b6470542ea7b31a54167861eecc943b40..36f1c08507c7da0b66ca72f97832a33fc73b96b2 100755 (executable)
--- a/tools/patman/__main__.py
+++ b/tools/patman/__main__.py
@@ -49,7 +49,7 @@ def run_patman():
         result = test_util.run_test_suites(
             'patman', False, False, False, None, None, None,
             [test_checkpatch.TestPatch, func_test.TestFunctional,
-             'gitutil', 'settings'])
+             'settings'])
 
         sys.exit(0 if result.wasSuccessful() else 1)
 

diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py
index e03cac115e4f8c9aeea3b7017f64146e88f996b8..2975881705c92961b35219174b6ec7e66f5d2e2a 100644 (file)
--- a/tools/patman/checkpatch.py
+++ b/tools/patman/checkpatch.py
@@ -8,8 +8,8 @@ import os
 import re
 import sys
 
-from patman import gitutil
 from u_boot_pylib import command
+from u_boot_pylib import gitutil
 from u_boot_pylib import terminal
 
 EMACS_PREFIX = r'(?:[0-9]{4}.*\.patch:[0-9]+: )?'

diff --git a/tools/patman/cmdline.py b/tools/patman/cmdline.py
index d6496c0cb7802947f6bf1ae753efc613b49164e2..562bc823f60ebb1d55b81a2dddd8f7de893bad60 100644 (file)
--- a/tools/patman/cmdline.py
+++ b/tools/patman/cmdline.py
@@ -13,8 +13,8 @@ import os
 import pathlib
 import sys
 
-from patman import gitutil
 from patman import project
+from u_boot_pylib import gitutil
 from patman import settings
 
 PATMAN_DIR = pathlib.Path(__file__).parent

diff --git a/tools/patman/control.py b/tools/patman/control.py
index b292da9dc27622010c236d68825a650c375037d3..fb5a4246ced133930931eec29ed5c7391fbfed9d 100644 (file)
--- a/tools/patman/control.py
+++ b/tools/patman/control.py
@@ -12,8 +12,8 @@ import os
 import sys
 
 from patman import checkpatch
-from patman import gitutil
 from patman import patchstream
+from u_boot_pylib import gitutil
 from u_boot_pylib import terminal
 
 

diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py
index af6c025a44101109a55abe94ac7838b198c570a8..bf333dc557bb4da5e225d91ea81ecdf6707d8a04 100644 (file)
--- a/tools/patman/func_test.py
+++ b/tools/patman/func_test.py
@@ -18,11 +18,11 @@ import unittest
 
 from patman.commit import Commit
 from patman import control
-from patman import gitutil
 from patman import patchstream
 from patman.patchstream import PatchStream
 from patman.series import Series
 from patman import settings
+from u_boot_pylib import gitutil
 from u_boot_pylib import terminal
 from u_boot_pylib import tools
 from u_boot_pylib.test_util import capture_sys_output

diff --git a/tools/patman/get_maintainer.py b/tools/patman/get_maintainer.py
index 8df3d124bace07e13f87faa8d3698f0aa359d972..200ee96551d9d328800249f0173065a84345d918 100644 (file)
--- a/tools/patman/get_maintainer.py
+++ b/tools/patman/get_maintainer.py
@@ -7,8 +7,8 @@ import os
 import shlex
 import shutil
 
-from patman import gitutil
 from u_boot_pylib import command
+from u_boot_pylib import gitutil
 
 
 def find_get_maintainer(script_file_name):

diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index 4955f6aaab995a7560e5546dedb8a85c431eb437..08795c4a0a8b3555077cc757e89280d1b217b364 100644 (file)
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -15,9 +15,9 @@ import shutil
 import tempfile
 
 from patman import commit
-from patman import gitutil
 from patman.series import Series
 from u_boot_pylib import command
+from u_boot_pylib import gitutil
 
 # Tags that we detect and remove
 RE_REMOVE = re.compile(r'^BUG=|^TEST=|^BRANCH=|^Review URL:'

diff --git a/tools/patman/project.py b/tools/patman/project.py
index 4459042b5d4e9e4477e265ab9ed9e678fbcd46b2..d6143a670661e2f85dff34ba31352540726998b8 100644 (file)
--- a/tools/patman/project.py
+++ b/tools/patman/project.py
@@ -4,7 +4,7 @@
 
 import os.path
 
-from patman import gitutil
+from u_boot_pylib import gitutil
 
 def detect_project():
     """Autodetect the name of the current project.

diff --git a/tools/patman/series.py b/tools/patman/series.py
index 6866e1dbd0898864a18cc4ca51e1e69c07c9c396..d7f2f010f5da4f143ffbc4af4f6876eeabc51ea0 100644 (file)
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -12,8 +12,8 @@ import sys
 import time
 
 from patman import get_maintainer
-from patman import gitutil
 from patman import settings
+from u_boot_pylib import gitutil
 from u_boot_pylib import terminal
 from u_boot_pylib import tools
 

diff --git a/tools/patman/settings.py b/tools/patman/settings.py
index 68c93e313b3ab18c05bd4e4eecb2546a705df902..d66b22be1df8744ba9ec34c132eb3388cee84796 100644 (file)
--- a/tools/patman/settings.py
+++ b/tools/patman/settings.py
@@ -12,7 +12,7 @@ import argparse
 import os
 import re
 
-from patman import gitutil
+from u_boot_pylib import gitutil
 
 """Default settings per-project.
 

diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py
index db7860f551d0ac001b1a2e9c657791451224bfbe..11d003bc4e71bca12b8661632800518e0e3e0a44 100644 (file)
--- a/tools/patman/test_checkpatch.py
+++ b/tools/patman/test_checkpatch.py
@@ -11,10 +11,10 @@ import tempfile
 import unittest
 
 from patman import checkpatch
-from patman import gitutil
 from patman import patchstream
 from patman import series
 from patman import commit
+from u_boot_pylib import gitutil
 
 
 class Line:

diff --git a/tools/u_boot_pylib/__init__.py b/tools/u_boot_pylib/__init__.py
index 63c88e85ec093ef935e9b9acb6e2c87d92d5bcd7..807a62e074337667089dace4e89215cbd1bb0212 100644 (file)
--- a/tools/u_boot_pylib/__init__.py
+++ b/tools/u_boot_pylib/__init__.py
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0+
 
-__all__ = ['command', 'cros_subprocess','terminal', 'test_util', 'tools',
-          'tout']
+__all__ = ['command', 'cros_subprocess', 'gitutil', 'terminal', 'test_util',
+           'tools', 'tout']

diff --git a/tools/u_boot_pylib/__main__.py b/tools/u_boot_pylib/__main__.py
index 8f98d7bd9f86ee77427dbd9034049a124b777b16..c0762bca733957e9a299e0541fd4849bc7083c79 100755 (executable)
--- a/tools/u_boot_pylib/__main__.py
+++ b/tools/u_boot_pylib/__main__.py
@@ -13,7 +13,6 @@ if __name__ == "__main__":
     sys.path.append(os.path.join(our_path, '..'))
 
     # Run tests
-    from u_boot_pylib import terminal
     from u_boot_pylib import test_util
 
     result = test_util.run_test_suites(

diff --git a/tools/patman/gitutil.py b/tools/u_boot_pylib/gitutil.py
similarity index 100%
rename from tools/patman/gitutil.py
rename to tools/u_boot_pylib/gitutil.py