Add script for doing git bisect using nightly snapshots #1595

tstellar · 2025-08-22T00:24:45Z

This script will perform a bisect between two git commits first using the rpm builds from the nightly snapshots and then builds from source.

tuliom

I have 3 suggestions.
The code LGTM overall.

tuliom · 2025-09-08T21:18:25Z

scripts/bisect-with-snapshots.py

+    # Enable the copr repo that we want to test.
+    # FIXME: There is probably some way to do this via the python API, but I
+    # can't figure it out.
+    subprocess.run(["dnf", "copr", "enable", "-y", copr_fullname])


Try this:

base = dnf.Base() base.read_all_repos() base.fill_sack() repos = base.repos.get_matching('copr:' + copr_project) repos.enable()

This works, but you have to first download the .repo file from COPR.

I see the problem now. Calling dnf copr is a simpler API.

tuliom · 2025-09-08T21:20:15Z

scripts/bisect-with-snapshots.py

+    # Disable project so future installs don't use it.
+    # FIXME: There is probably some way to do this via the python API, but I
+    # can't figure it out.
+    subprocess.run(["dnf", "copr", "disable", "-y", copr_fullname])


Likewise, but use repos.disable() instead.

scripts/bisect-with-snapshots.py

kwk

Hey @tstellar I hope you don't mind that I had a couple of style comments.

kwk · 2025-09-11T08:39:58Z

scripts/bisect-with-snapshots.py

+class CoprProject:
+    UNTESTED = 0
+    GOOD = 1
+    BAD = 2
+
+    def __init__(self, name: str):
+        self.name = name
+        self.index = -1
+        self._status = CoprProject.UNTESTED
+
+    def __lt__(self, other: Self) -> bool:
+        return self.name < other.name
+
+    @property
+    def commit(self) -> str:
+        return self._commit
+
+    @commit.setter
+    def commit(self, commit: str) -> None:
+        self._commit = commit
+
+    @property
+    def status(self) -> int:
+        return self._status
+
+    @status.setter
+    def status(self, status: int) -> None:
+        self._status = status


I wonder if this usage of an IntEnum that is a subclass of int can help here to make the code more "readable". Also, if you make your CoprProject a dataclass you can define defaults and access the members. Usually a name: str = "default" is enough but since you explicitly want to only order by name we have to say which field participates in the comparison operators like le. I hope this makes sense.

Suggested change

class CoprProject:

UNTESTED = 0

GOOD = 1

BAD = 2

def __init__(self, name: str):

self.name = name

self.index = -1

self._status = CoprProject.UNTESTED

def __lt__(self, other: Self) -> bool:

return self.name < other.name

@property

def commit(self) -> str:

return self._commit

@commit.setter

def commit(self, commit: str) -> None:

self._commit = commit

@property

def status(self) -> int:

return self._status

@status.setter

def status(self, status: int) -> None:

self._status = status

import dataclasses

import enum

@enum.unique

class CoprProjectStatus(enum.IntEnum):

UNTESTED = 0

GOOD = 1

BAD = 2

@dataclasses.dataclass(kw_only=True, order=True)

class CoprProject:

name: str = field(compare=True)

index: int = field(compare=False, default=-1)

status: CoprProjectStatus = field(compare=False, default=CoprProjectStatus.UNTESTED)

commit: str | None = field(compare=False, default=None)

kwk · 2025-09-11T08:41:19Z

scripts/bisect-with-snapshots.py

+
+
+def get_snapshot_projects(chroot: str | None = None) -> list[CoprProject]:
+    copr_client = copr.v3.Client.create_from_config_file()


Please, know that we have a function for this here as well.

kwk · 2025-09-11T08:43:00Z

scripts/bisect-with-snapshots.py

+        self._status = status
+
+
+def get_snapshot_projects(chroot: str | None = None) -> list[CoprProject]:


Can you please put a comment here? Does the function get all snapshot projects for a given chroot ordered by name.

kwk · 2025-09-11T08:44:07Z

scripts/bisect-with-snapshots.py

+            continue
+        if chroot and chroot not in list(p.chroot_repos.keys()):
+            continue
+        projects.append(CoprProject(p.name))


If you accept my suggestion on the dataclass above you're gonna have to make use of kw arguments here:

Suggested change

projects.append(CoprProject(p.name))

projects.append(CoprProject(name=p.name))

kwk · 2025-09-11T08:45:46Z

scripts/bisect-with-snapshots.py

+    for idx, p in enumerate(projects):
+        p.index = idx
+    return projects


Why do you need an explicit index here?

Ah, I found it https://github.com/fedora-llvm-team/llvm-snapshots/pull/1595/files#diff-a16d84f32cd9adf56feca3fbb4ad04086c6e25523714e29ce783ad4b0ea4c7eeR234

kwk · 2025-09-11T08:48:18Z

scripts/bisect-with-snapshots.py

+            m = regex.search(b["source_package"]["url"])
+            if m:
+                return m.group(1)
+    raise Exception(f"Could not find commit for {project_name}, {chroot}")


Suggested change

raise Exception(f"Could not find commit for {project_name}, {chroot}")

raise Exception(f"Could not find commit for {project.name}, {chroot}")

kwk · 2025-09-11T08:58:02Z

scripts/bisect-with-snapshots.py

+    projects = get_snapshot_projects()
+    good_project = None
+    bad_project = None
+


I suggest you create this helper function to eliminate the need to repeat all non-changing arguments. You only change the good/bad commit parts, right?

Suggested change

def git_bisect_helper(good_commit:str, bad_commit=str):

return git_bisect(

repo,

good_commit,

bad_commit,

args.configure_command,

args.build_command,

args.test_command,

)

kwk · 2025-09-11T08:58:40Z

scripts/bisect-with-snapshots.py

+            return git_bisect(
+                repo,
+                args.good_commit,
+                p.commit,
+                args.configure_command,
+                args.build_command,
+                args.test_command,
+            )


Suggested change

return git_bisect(

repo,

args.good_commit,

p.commit,

args.configure_command,

args.build_command,

args.test_command,

)

return git_bisect_helper(good_commit=args.good_commit, bad_commit=p.commit)

kwk · 2025-09-11T09:02:24Z

scripts/bisect-with-snapshots.py

+            return git_bisect(
+                repo,
+                p.commit,
+                args.bad_commit,
+                args.configure_command,
+                args.build_command,
+                args.test_command,
+            )


Suggested change

return git_bisect(

repo,

p.commit,

args.bad_commit,

args.configure_command,

args.build_command,

args.test_command,

)

return git_bisect_helper(good_commit=p.commit, bad_commit=args.bad_commit)

kwk · 2025-09-11T09:03:16Z

scripts/bisect-with-snapshots.py

+    return git_bisect(
+        repo,
+        args.good_commit,
+        args.bad_commit,
+        args.configure_command,
+        args.build_command,
+        args.test_command,
+    )


Suggested change

return git_bisect(

repo,

args.good_commit,

args.bad_commit,

args.configure_command,

args.build_command,

args.test_command,

)

return git_bisect_helper(good_commit=args.good_commit, bad_commit=args.bad_commit)

tstellar added 16 commits August 22, 2025 00:20

Add script for doing git bisect using nightly snapshots

8d1ce9f

This script will perform a bisect between two git commits first using the rpm builds from the nightly snapshots and then builds from source.

Fix formatting

a857937

Fix formatting

544728f

Fix formatting

cf71594

Fix types

42e620b

Some more format fixes

afbad0a

More fixes

45ec6f4

More fixes

18bb297

Fix more

6de7bcd

Fix types

f06a2e6

Fix types

9dd1185

Fix types

5c36f95

Fix divisioin

e517519

Fix formatting

cca63b7

Update dependencies

8d2ba49

Merge remote-tracking branch 'origin/main' into HEAD

95dd336

tstellar requested review from kwk, nikic, tbaederr and tuliom September 7, 2025 01:48

tuliom requested changes Sep 8, 2025

View reviewed changes

tstellar added 2 commits September 10, 2025 20:06

Fix duplicate code

8fc2a62

Fix typo

feb2f11

kwk reviewed Sep 11, 2025

View reviewed changes



		def get_snapshot_projects(chroot: str \| None = None) -> list[CoprProject]:
		copr_client = copr.v3.Client.create_from_config_file()

		self._status = status


		def get_snapshot_projects(chroot: str \| None = None) -> list[CoprProject]:

	projects.append(CoprProject(p.name))
	projects.append(CoprProject(name=p.name))

	raise Exception(f"Could not find commit for {project_name}, {chroot}")
	raise Exception(f"Could not find commit for {project.name}, {chroot}")

Add script for doing git bisect using nightly snapshots #1595

Are you sure you want to change the base?

Add script for doing git bisect using nightly snapshots #1595

Uh oh!

Conversation

tstellar commented Aug 22, 2025

Uh oh!

tuliom left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kwk left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants