Ensure keywords are not lost if packages are renamed

Only redo the keywords if the PV changes over the git mv operation.

Author: anthonyryan1

src/pkgdev/mangle.py

@@ -84,7 +84,13 @@ def keywords_remove_stable(kws):
                 kws = sorted(mo.group("keywords").split(), key=keywords_sort_key)
                 # Only remove stable keywords on new ebuild creations
                 # For our purposes, renames are also new ebuild creations
-                if change.status in ("A", "R"):
+                print(change.atom.version)
+                # print(change.atom.revision)
+                if change.status == 'A':
+                    kws = keywords_remove_stable(kws)
+                if change.status == 'R' \
+                    and change.old is not None \
+                    and change.old.version != change.atom.version:
                     kws = keywords_remove_stable(kws)
                 new_kw = " ".join(kws)
                 if not mo.group("quote"):

tests/scripts/test_pkgdev_commit.py

@@ -1070,7 +1070,7 @@ def commit(args):
 
         # Keyword mangling when adding new ebuilds
         ebuild_path = repo.create_ebuild("cat/pkg-1", keywords=("arm64", "x86", "~amd64", "-sparc"))
-        commit(["-a", "-m", "version bump (no removal)"])
+        commit(["-a", "-m", "version bump (type A, without removal)"])
         with open(ebuild_path) as f:
             lines = f.read().splitlines()
             mo = keywords_regex.match(lines[-1])
@@ -1079,12 +1079,29 @@ def commit(args):
         # Keyword mangling when adding and removing ebuilds simultaniously (git interpreted as rename)
         git_repo.remove(ebuild_path, commit=False)
         ebuild_path = repo.create_ebuild("cat/pkg-2", keywords=("arm64", "x86", "~amd64", "-sparc"))
-        commit(["-a", "-m", "version bump (no removal)"])
+        commit(["-a", "-m", "version bump (type R, with removal)"])
         with open(ebuild_path) as f:
             lines = f.read().splitlines()
             mo = keywords_regex.match(lines[-1])
             assert mo.group("keywords") == "~amd64 ~arm64 -sparc ~x86"
 
+        # Keyword mangling when moving a package to another category
+        ebuild_path = repo.create_ebuild("oldcat/oldname-0", keywords=("arm64", "x86", "~amd64", "-sparc"))
+        git_repo.add_all("oldcat/oldname-0")
+        os.mkdir(os.path.join(git_repo.path, 'newcat'))
+        os.mkdir(os.path.join(git_repo.path, 'newcat/newname'))
+        git_repo.move(
+            pjoin(git_repo.path, "oldcat/oldname/oldname-0.ebuild"),
+            pjoin(git_repo.path, "newcat/newname/newname-0.ebuild"),
+            commit=False,
+        )
+        commit(["-a", "-m", "rename package (type R, but no PV change)"])
+        with open(os.path.join(git_repo.path, "newcat/newname/newname-0.ebuild")) as f:
+            lines = f.read().splitlines()
+            mo = keywords_regex.match(lines[-1])
+            assert mo.group("keywords") == "~amd64 arm64 -sparc x86"
+
+
     def test_scan(self, capsys, repo, make_git_repo):
         git_repo = make_git_repo(repo.location)
         repo.create_ebuild("cat/pkg-0")