From da2da59f2bd78c7b7432474f3d5a962c70ceb063 Mon Sep 17 00:00:00 2001
From: Jake Weinstein <jake@aospa.co>
Date: Tue, 30 Aug 2022 00:59:13 +0900
Subject: [PATCH] scripts: Update merge script for CodeLinaro

Change-Id: I38b854cef537fcacf09720ab0dbb2f33f5aea218
---
 build/envsetup.sh                          |  6 +++---
 build/tools/{merge-caf.py => merge-clo.py} | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename build/tools/{merge-caf.py => merge-clo.py} (95%)
 mode change 100644 => 100755

diff --git a/build/envsetup.sh b/build/envsetup.sh
index 139de187..147df6cf 100755
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -1,17 +1,17 @@
 function __print_aospa_functions_help() {
 cat <<EOF
 Additional Paranoid Android functions:
-- cafmerge:        Utility to merge CAF tags.
+- clomerge:        Utility to merge CLO tags.
 - repopick:        Utility to fetch changes from Gerrit.
 EOF
 }
 
-function cafmerge()
+function clomerge()
 {
     target_branch=$1
     set_stuff_for_environment
     T=$(gettop)
-    python3 $T/vendor/aospa/build/tools/merge-caf.py $target_branch
+    python3 $T/vendor/aospa/build/tools/merge-clo.py $target_branch
 }
 
 function repopick()
diff --git a/build/tools/merge-caf.py b/build/tools/merge-clo.py
old mode 100644
new mode 100755
similarity index 95%
rename from build/tools/merge-caf.py
rename to build/tools/merge-clo.py
index ab39b268..d96b7ef4
--- a/build/tools/merge-caf.py
+++ b/build/tools/merge-clo.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
 #
-# Copyright (C) 2021 Paranoid Android
+# Copyright (C) 2022 Paranoid Android
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ import xml.etree.ElementTree as Et
 import git
 from git.exc import GitCommandError
 
-BASE_URL = "https://source.codeaurora.org/quic/la/"
+BASE_URL = "https://git.codelinaro.org/clo/la/"
 WORKING_DIR = "{0}/../../../..".format(os.path.dirname(os.path.realpath(__file__)))
 MANIFEST_NAME = "aospa.xml"
 REPOS_TO_MERGE = {}
@@ -154,7 +154,7 @@ def merge(repo_lst, branch):
 
 
 def merge_manifest(is_system, branch):
-    """ Updates CAF revision in .repo/manifests """
+    """ Updates CLO revision in .repo/manifests """
     with open("{0}/.repo/manifests/default.xml".format(WORKING_DIR)) as manifestxml:
         tree = Et.parse(manifestxml)
         root = tree.getroot()
@@ -164,7 +164,7 @@ def merge_manifest(is_system, branch):
             lst = root.findall("remote")
             remote = None
             for elem in lst:
-                if elem.attrib["name"] == "caf_vendor":
+                if elem.attrib["name"] == "clo_vendor":
                     remote = elem
                     break
             remote.set("revision", branch)
@@ -223,15 +223,15 @@ def print_results(branch):
 
 
 def main():
-    """Gathers and merges all repos from CAF and
+    """Gathers and merges all repos from CLO and
     reports all repos that need to be fixed manually"""
 
-    parser = argparse.ArgumentParser(description="Merge a CAF revision.")
+    parser = argparse.ArgumentParser(description="Merge a CLO revision.")
     parser.add_argument(
         "branch_to_merge",
         metavar="branch",
         type=str,
-        help="a tag to merge from source.codeaurora.org",
+        help="a tag to merge from git.codelinaro.org",
     )
     parser.add_argument(
         "--repos",