96 lines
5.2 KiB
Python
96 lines
5.2 KiB
Python
import pathlib
|
|
import subprocess
|
|
import sys
|
|
import tempfile
|
|
import unittest
|
|
|
|
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parents[1]))
|
|
|
|
from failure import Failure
|
|
from git_cli import git_repo
|
|
from git_cli.epic_branch import levelled
|
|
|
|
|
|
def sh(cwd: pathlib.Path, *args: str) -> str:
|
|
return subprocess.run(["git", "-c", "user.name=T", "-c", "user.email=t@example.com", *args], cwd=cwd, check=True, capture_output=True, text=True).stdout.strip()
|
|
|
|
|
|
class Levelled(unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
folder = tempfile.TemporaryDirectory()
|
|
self.addCleanup(folder.cleanup)
|
|
self.origin, self.clone = pathlib.Path(folder.name) / "origin.git", pathlib.Path(folder.name) / "clone"
|
|
sh(pathlib.Path(folder.name), "init", "--quiet", "--bare", "--initial-branch=main", str(self.origin))
|
|
sh(pathlib.Path(folder.name), "clone", "--quiet", str(self.origin), str(self.clone))
|
|
sh(self.clone, "config", "user.name", "T")
|
|
sh(self.clone, "config", "user.email", "t@example.com")
|
|
self.commit("main", "a.txt", "one\n")
|
|
|
|
def commit(self, branch: str, file: str, text: str) -> None:
|
|
"""Commits text as file on origin's branch, made off origin/main where origin has none."""
|
|
sh(self.clone, "fetch", "--quiet", "origin")
|
|
known = subprocess.run(["git", "rev-parse", "--quiet", "--verify", f"refs/remotes/origin/{branch}"], cwd=self.clone, capture_output=True).returncode == 0
|
|
sh(self.clone, "checkout", "--quiet", "-B", "scratch", *([f"origin/{branch}"] if known else []))
|
|
(self.clone / file).write_text(text)
|
|
sh(self.clone, "add", file)
|
|
sh(self.clone, "commit", "--quiet", "-m", f"{file} on {branch}")
|
|
sh(self.clone, "push", "--quiet", "origin", f"HEAD:refs/heads/{branch}")
|
|
sh(self.clone, "fetch", "--quiet", "origin")
|
|
|
|
def test_makes_the_branch_off_the_default_branch_where_origin_has_none(self) -> None:
|
|
self.assertEqual(levelled("ABC-1", "origin/main", cwd=str(self.clone)), "Made origin/ABC-1 off origin/main.")
|
|
self.assertEqual(sh(self.origin, "rev-parse", "ABC-1"), sh(self.origin, "rev-parse", "main"))
|
|
self.assertEqual(sh(self.clone, "rev-parse", "origin/ABC-1"), sh(self.origin, "rev-parse", "main"), "fetched, so a worktree can branch off it")
|
|
|
|
def test_leaves_a_branch_that_holds_the_default_branch(self) -> None:
|
|
self.commit("ABC-1", "b.txt", "epic\n")
|
|
before = sh(self.origin, "rev-parse", "ABC-1")
|
|
self.assertEqual(levelled("ABC-1", "origin/main", cwd=str(self.clone)), "origin/ABC-1 already holds origin/main.")
|
|
self.assertEqual(sh(self.origin, "rev-parse", "ABC-1"), before)
|
|
|
|
def test_merges_a_moved_default_branch_in_with_a_merge_commit_and_no_checkout(self) -> None:
|
|
self.commit("ABC-1", "b.txt", "epic\n")
|
|
epic = sh(self.origin, "rev-parse", "ABC-1")
|
|
self.commit("main", "c.txt", "main\n")
|
|
checked_out = sh(self.clone, "rev-parse", "HEAD")
|
|
self.assertEqual(levelled("ABC-1", "origin/main", cwd=str(self.clone)), "Merged origin/main into origin/ABC-1.")
|
|
self.assertEqual(sh(self.origin, "rev-list", "--parents", "-n", "1", "ABC-1").split()[1:], [epic, sh(self.origin, "rev-parse", "main")])
|
|
self.assertEqual(sh(self.origin, "ls-tree", "--name-only", "ABC-1").split(), ["a.txt", "b.txt", "c.txt"])
|
|
self.assertEqual(sh(self.origin, "log", "-1", "--format=%s", "ABC-1"), "Merge remote-tracking branch 'origin/main' into ABC-1")
|
|
self.assertEqual(sh(self.clone, "rev-parse", "origin/ABC-1"), sh(self.origin, "rev-parse", "ABC-1"))
|
|
self.assertEqual(sh(self.clone, "rev-parse", "HEAD"), checked_out)
|
|
|
|
def test_a_conflict_fails_for_a_person_and_leaves_the_branch(self) -> None:
|
|
self.commit("ABC-1", "a.txt", "epic\n")
|
|
before = sh(self.origin, "rev-parse", "ABC-1")
|
|
self.commit("main", "a.txt", "main\n")
|
|
done = levelled("ABC-1", "origin/main", cwd=str(self.clone))
|
|
assert isinstance(done, Failure), done
|
|
self.assertEqual(done.reason, "origin/main doesn't merge into origin/ABC-1 cleanly, so a person merges it: check ABC-1 out, run `git merge origin/main`, resolve the conflicts and push")
|
|
self.assertEqual(sh(self.origin, "rev-parse", "ABC-1"), before)
|
|
|
|
|
|
class ChunkBase(unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
folder = tempfile.TemporaryDirectory()
|
|
self.addCleanup(folder.cleanup)
|
|
self.clone = pathlib.Path(folder.name)
|
|
sh(self.clone, "init", "--quiet", "--initial-branch=main")
|
|
sh(self.clone, "remote", "add", "origin", "https://example.com/acme.git")
|
|
sh(self.clone, "symbolic-ref", "refs/remotes/origin/HEAD", "refs/remotes/origin/main")
|
|
|
|
def test_a_branch_with_a_recorded_base_measures_against_it_and_any_other_against_the_default_branch(self) -> None:
|
|
self.assertIsNone(git_repo.record_chunk_base("ABC-2", "ABC-1", cwd=str(self.clone)))
|
|
self.assertEqual(git_repo.default_ref(cwd=str(self.clone)), "origin/main", "main has no recorded base")
|
|
sh(self.clone, "checkout", "--quiet", "-b", "ABC-2")
|
|
self.assertEqual(git_repo.chunk_base(cwd=str(self.clone)), "ABC-1")
|
|
self.assertEqual(git_repo.default_ref(cwd=str(self.clone)), "origin/ABC-1")
|
|
self.assertEqual(git_repo.default_ref(cwd=str(self.clone), guarded=True), "origin/ABC-1")
|
|
sh(self.clone, "checkout", "--quiet", "-b", "ABC-3")
|
|
self.assertIsNone(git_repo.chunk_base(cwd=str(self.clone)))
|
|
self.assertEqual(git_repo.default_ref(cwd=str(self.clone)), "origin/main")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|