|
|
|
@@ -16,11 +16,13 @@ logger = logging.getLogger(__name__)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class GitClone(AbstractStep[str]):
|
|
|
|
|
def __init__(self, url: str, repo_path: str | None = None,
|
|
|
|
|
def __init__(self, url: str | List[str], repo_path: str | None = None,
|
|
|
|
|
branchNamePrefix: str = "", credEnvPrefix: str = "GIT",
|
|
|
|
|
**kwargs: Any):
|
|
|
|
|
super().__init__(**kwargs)
|
|
|
|
|
self.url = url
|
|
|
|
|
self.urls = [url] if isinstance(url, str) else url
|
|
|
|
|
if len(self.urls) == 0:
|
|
|
|
|
raise ValueError("At least one repository URL is required")
|
|
|
|
|
self.repo_path = repo_path
|
|
|
|
|
self.branchNamePrefix = branchNamePrefix
|
|
|
|
|
self.credEnvPrefix = credEnvPrefix
|
|
|
|
@@ -36,33 +38,37 @@ class GitClone(AbstractStep[str]):
|
|
|
|
|
return url
|
|
|
|
|
|
|
|
|
|
def progress(self) -> str:
|
|
|
|
|
repo_url = self.url
|
|
|
|
|
repo_url = self.urls[0]
|
|
|
|
|
|
|
|
|
|
self.repo_path = self.repo_path or os.path.join(tempfile.gettempdir(),
|
|
|
|
|
f"{self.env.id}_{hashlib.sha1(repo_url.encode()).hexdigest()[:5]}")
|
|
|
|
|
logger.info(f"Cloning repository {repo_url} to {self.repo_path}")
|
|
|
|
|
f"{self.env.id}_{hashlib.sha1('|'.join(self.urls).encode()).hexdigest()[:5]}")
|
|
|
|
|
logger.info(f"Cloning repositories {self.urls} to {self.repo_path}")
|
|
|
|
|
os.makedirs(self.repo_path, exist_ok=True)
|
|
|
|
|
try:
|
|
|
|
|
if os.path.exists(os.path.join(self.repo_path, ".git")):
|
|
|
|
|
logger.info(f"Repository already cloned at {self.repo_path}, fetching updates.")
|
|
|
|
|
repo = git.Repo(self.repo_path)
|
|
|
|
|
if 'origin' not in repo.remotes or repo.remotes.origin.url != self._get_auth_git_url(repo_url):
|
|
|
|
|
repo.create_remote('origin', self._get_auth_git_url(repo_url))
|
|
|
|
|
result = repo.remotes.origin.fetch(prune=True)
|
|
|
|
|
if not result or any(fetch_info.flags & fetch_info.ERROR for fetch_info in result):
|
|
|
|
|
raise BaseException(f"Failed to fetch updates for {repo_url}")
|
|
|
|
|
else:
|
|
|
|
|
repo = git.Repo.init(self.repo_path)
|
|
|
|
|
repo.remotes.append(repo.create_remote(
|
|
|
|
|
'origin',
|
|
|
|
|
self._get_auth_git_url(repo_url)
|
|
|
|
|
))
|
|
|
|
|
if self.branchNamePrefix != "":
|
|
|
|
|
repo.config_writer().set_value('remote "origin"', "fetch",
|
|
|
|
|
f"+refs/heads/{self.branchNamePrefix}/*:refs/remotes/origin/{self.branchNamePrefix}/*").release()
|
|
|
|
|
repo.remotes.origin.fetch(prune=True)
|
|
|
|
|
if not os.path.exists(os.path.join(self.repo_path, ".git")):
|
|
|
|
|
raise BaseException(f"Failed to clone repository {repo_url} to {self.repo_path}")
|
|
|
|
|
|
|
|
|
|
for index, repository_url in enumerate(self.urls):
|
|
|
|
|
remote_name = "origin" if index == 0 else f"repo{index}"
|
|
|
|
|
auth_url = self._get_auth_git_url(repository_url)
|
|
|
|
|
if remote_name in repo.remotes:
|
|
|
|
|
remote = repo.remotes[remote_name]
|
|
|
|
|
if remote.url != auth_url:
|
|
|
|
|
remote.set_url(auth_url)
|
|
|
|
|
else:
|
|
|
|
|
remote = repo.create_remote(remote_name, auth_url)
|
|
|
|
|
if remote_name == "origin" and self.branchNamePrefix != "":
|
|
|
|
|
with repo.config_writer() as config:
|
|
|
|
|
config.set_value('remote "origin"', "fetch",
|
|
|
|
|
f"+refs/heads/{self.branchNamePrefix}/*:refs/remotes/origin/{self.branchNamePrefix}/*")
|
|
|
|
|
result = remote.fetch(prune=True)
|
|
|
|
|
if not result or any(fetch_info.flags & fetch_info.ERROR for fetch_info in result):
|
|
|
|
|
raise BaseException(f"Failed to fetch updates for {repository_url}")
|
|
|
|
|
if not os.path.exists(os.path.join(self.repo_path, ".git")):
|
|
|
|
|
raise BaseException(f"Failed to clone repositories {self.urls} to {self.repo_path}")
|
|
|
|
|
except BaseException as e:
|
|
|
|
|
logger.error(f"Error during git clone/fetch, removing directory {self.repo_path}: {str(e)}")
|
|
|
|
|
shutil.rmtree(self.repo_path)
|
|
|
|
@@ -73,21 +79,24 @@ class GitClone(AbstractStep[str]):
|
|
|
|
|
repo = git.Repo(self.repo_path)
|
|
|
|
|
result: Dict[str, List[Any]] = {}
|
|
|
|
|
for ref in repo.refs:
|
|
|
|
|
if ref.name.startswith('origin/') and not ref.name.startswith('origin/HEAD'):
|
|
|
|
|
branch_name = ref.name[len('origin/'):]
|
|
|
|
|
if not branch_name.startswith('auto/'): # Skip auto branches
|
|
|
|
|
result[branch_name] = []
|
|
|
|
|
cmt = [ref.commit]
|
|
|
|
|
for _ in range(10):
|
|
|
|
|
for commit in cmt:
|
|
|
|
|
result[branch_name].append({
|
|
|
|
|
'hexsha': commit.hexsha,
|
|
|
|
|
'author': commit.author.name,
|
|
|
|
|
'date': commit.committed_datetime.isoformat(),
|
|
|
|
|
'message': commit.message.strip()
|
|
|
|
|
})
|
|
|
|
|
if not ref.is_remote() or ref.name.endswith('/HEAD'):
|
|
|
|
|
continue
|
|
|
|
|
remote_name, branch_name = ref.name.split('/', 1)
|
|
|
|
|
if branch_name.startswith('auto/'): # Skip auto branches
|
|
|
|
|
continue
|
|
|
|
|
branch_key = branch_name if remote_name == 'origin' else ref.name
|
|
|
|
|
result[branch_key] = []
|
|
|
|
|
cmt = [ref.commit]
|
|
|
|
|
for _ in range(10):
|
|
|
|
|
for commit in cmt:
|
|
|
|
|
result[branch_key].append({
|
|
|
|
|
'hexsha': commit.hexsha,
|
|
|
|
|
'author': commit.author.name,
|
|
|
|
|
'date': commit.committed_datetime.isoformat(),
|
|
|
|
|
'message': commit.message.strip()
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
cmt = [p for c in cmt for p in c.parents]
|
|
|
|
|
cmt = [p for c in cmt for p in c.parents]
|
|
|
|
|
return result
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -150,7 +159,10 @@ class CheckoutMerged(AbstractStep[CheckoutAndMergeResult]):
|
|
|
|
|
try:
|
|
|
|
|
branch_name, desired_commit = branch_pair
|
|
|
|
|
if desired_commit == 'HEAD':
|
|
|
|
|
commit = repo.commit(f'origin/{branch_name}')
|
|
|
|
|
remote_name, remote_branch = branch_name.split('/', 1) if '/' in branch_name else ('origin', branch_name)
|
|
|
|
|
if remote_name not in repo.remotes:
|
|
|
|
|
remote_name, remote_branch = 'origin', branch_name
|
|
|
|
|
commit = repo.commit(f'{remote_name}/{remote_branch}')
|
|
|
|
|
else:
|
|
|
|
|
commit = repo.commit(desired_commit)
|
|
|
|
|
commit_ids[commit] = branch_name
|
|
|
|
@@ -229,9 +241,10 @@ class CheckoutMerged(AbstractStep[CheckoutAndMergeResult]):
|
|
|
|
|
version = '-'.join([x.hexsha[0:8] for x in sorted_commits])
|
|
|
|
|
|
|
|
|
|
for ref in repo.refs:
|
|
|
|
|
if ref.is_remote() and ref.commit == repo.head.commit and ref.name != 'origin/HEAD':
|
|
|
|
|
if ref.is_remote() and ref.commit == repo.head.commit and not ref.name.endswith('/HEAD'):
|
|
|
|
|
logger.info(f"Merge commit {ref.commit} corresponds to branch {ref}")
|
|
|
|
|
remote_branch_name = ref.name[len('origin/'):]
|
|
|
|
|
remote_name, branch_name = ref.name.split('/', 1)
|
|
|
|
|
remote_branch_name = branch_name if remote_name == 'origin' else ref.name
|
|
|
|
|
break
|
|
|
|
|
if self.push and remote_branch_name is None:
|
|
|
|
|
auto_branch_hash = hashlib.sha1(''.join([x.hexsha for x in sorted_commits]).encode()).hexdigest()
|
|
|
|
@@ -292,10 +305,9 @@ class GitUnmerge(AbstractStep[GitUnmergeResult]):
|
|
|
|
|
commits: List[Tuple[str, str]] = []
|
|
|
|
|
for v in version_parts:
|
|
|
|
|
commit = repo.commit(v)
|
|
|
|
|
# branches = [head.name for head in repo.heads if head.commit.hexsha == commit.hexsha]
|
|
|
|
|
branches = [ref.name for ref in repo.remotes.origin.refs if ref.commit.hexsha == commit.hexsha]
|
|
|
|
|
branches = [b[len('origin/'):] for b in branches if
|
|
|
|
|
b.startswith('origin/') and not b.startswith('origin/HEAD')]
|
|
|
|
|
branches = [ref.name for ref in repo.refs
|
|
|
|
|
if ref.is_remote() and not ref.name.endswith('/HEAD') and ref.commit.hexsha == commit.hexsha]
|
|
|
|
|
branches = [b[len('origin/'):] if b.startswith('origin/') else b for b in branches]
|
|
|
|
|
|
|
|
|
|
if len(branches) == 0 or branches[0].startswith('auto/'):
|
|
|
|
|
if childs is None:
|
|
|
|
@@ -304,10 +316,9 @@ class GitUnmerge(AbstractStep[GitUnmergeResult]):
|
|
|
|
|
while len(commitsSet) > 0:
|
|
|
|
|
current = commitsSet.pop()
|
|
|
|
|
for child in childs.get(current, []):
|
|
|
|
|
branches = [ref.name for ref in repo.remotes.origin.refs if
|
|
|
|
|
ref.commit.hexsha == child.hexsha]
|
|
|
|
|
branches = [b[len('origin/'):] for b in branches if
|
|
|
|
|
b.startswith('origin/') and not b.startswith('origin/HEAD')]
|
|
|
|
|
branches = [ref.name for ref in repo.refs
|
|
|
|
|
if ref.is_remote() and not ref.name.endswith('/HEAD') and ref.commit.hexsha == child.hexsha]
|
|
|
|
|
branches = [b[len('origin/'):] if b.startswith('origin/') else b for b in branches]
|
|
|
|
|
|
|
|
|
|
if len(branches) > 0:
|
|
|
|
|
commitsSet = set()
|
|
|
|
|