From 0ae4bf932c0808123d9e8149f5c7fedd10f6c2b7 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 9 Mar 2020 13:24:37 -0700 Subject: don't look up namespace if project already exists Signed-off-by: Sean Whitton --- Changes | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Changes') diff --git a/Changes b/Changes index 5f6e9bf..a51c982 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for API::GitForge {{$NEXT}} + - API::GitForge::GitLab::_ensure_repo(): avoid an unnecessary API + call. 0.002 2020-03-09 12:17:47-07:00 America/Phoenix - Implement API::GitForge::GitLab::_ensure_repo(). -- cgit v1.2.3 From 68c29d68184b93fda6fa8ca2741114859693aa0e Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 10 Mar 2020 09:05:43 -0700 Subject: try to unprotect fork branches before deleting them Signed-off-by: Sean Whitton --- Changes | 3 +++ lib/API/GitForge/GitLab.pm | 8 ++++++++ lib/API/GitForge/Role/GitForge.pm | 9 ++++----- 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'Changes') diff --git a/Changes b/Changes index a51c982..ee813bf 100644 --- a/Changes +++ b/Changes @@ -3,6 +3,9 @@ Revision history for API::GitForge {{$NEXT}} - API::GitForge::GitLab::_ensure_repo(): avoid an unnecessary API call. + - API::GitForge::Role::GitForge::clean_repo(): try to unprotect + fork branches before deleting them, if GitForge API library + supports doing this. 0.002 2020-03-09 12:17:47-07:00 America/Phoenix - Implement API::GitForge::GitLab::_ensure_repo(). diff --git a/lib/API/GitForge/GitLab.pm b/lib/API/GitForge/GitLab.pm index 2091cfc..1e620d8 100644 --- a/lib/API/GitForge/GitLab.pm +++ b/lib/API/GitForge/GitLab.pm @@ -128,6 +128,14 @@ sub _nuke_fork { $self->{_api}->delete_project("$user/$repo"); } +sub _ensure_fork_branch_unprotected { + my ($self, $upstream, $branch) = @_; + my (undef, $repo) = _extract_project_id($upstream); + my $user = $self->{_api}->current_user->{username}; + return unless $self->{_api}->protected_branch("$user/$repo", $branch); + $self->{_api}->unprotect_branch("$user/$repo", $branch); +} + sub _extract_project_id { my $project = shift; $project =~ s#(?:\.git)?/?$##; diff --git a/lib/API/GitForge/Role/GitForge.pm b/lib/API/GitForge/Role/GitForge.pm index 78d3498..c3459bf 100644 --- a/lib/API/GitForge/Role/GitForge.pm +++ b/lib/API/GitForge/Role/GitForge.pm @@ -126,13 +126,12 @@ sub clean_fork { $self->_clean_config_fork($_[0]); - # TODO use API to unprotect all branches in the fork. we still - # want to use git-push(1) to delete the branches, rather than - # using the API for that, because that's maximally compatible - # assume that if we had to create the gitforge branch, we just # created the fork, so can go ahead and nuke all branches there. - # may fail if some branches are protected; that's okay. + if ($self->can("_ensure_fork_branch_unprotected")) { + $self->_ensure_fork_branch_unprotected($_[0], $_) for @fork_branches; + } + # may fail if we couldn't unprotect; that's okay eval { $git->push($fork_uri, "--delete", @fork_branches) }; return $fork_uri; -- cgit v1.2.3 From 16b5e5d0592ff442716bc5702fde94d2c02a4971 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 10 Mar 2020 09:13:57 -0700 Subject: push the gitforge branch using Git::Wrapper again. Signed-off-by: Sean Whitton --- Changes | 4 ++++ lib/API/GitForge/Role/GitForge.pm | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'Changes') diff --git a/Changes b/Changes index ee813bf..d5d3c2a 100644 --- a/Changes +++ b/Changes @@ -6,6 +6,10 @@ Revision history for API::GitForge - API::GitForge::Role::GitForge::clean_repo(): try to unprotect fork branches before deleting them, if GitForge API library supports doing this. + - API::GitForge::Role::GitForge::clean_repo(): push the gitforge + branch using Git::Wrapper again. + During early testing, this seemed to hang after pushing to + GitLab installations, but it seems to work well now. 0.002 2020-03-09 12:17:47-07:00 America/Phoenix - Implement API::GitForge::GitLab::_ensure_repo(). diff --git a/lib/API/GitForge/Role/GitForge.pm b/lib/API/GitForge/Role/GitForge.pm index c3459bf..3742553 100644 --- a/lib/API/GitForge/Role/GitForge.pm +++ b/lib/API/GitForge/Role/GitForge.pm @@ -120,10 +120,7 @@ sub clean_fork { $git->add("README.md"); $git->commit({ message => "Temporary fork for pull request(s)" }); - # TODO why does Git::Wrapper hang after pushing the branch to - # GitLab? for now, just use system() to do the push ourselves - system "git", "-C", $git->dir, "push", $fork_uri, "master:gitforge"; - + $git->push($fork_uri, "master:gitforge"); $self->_clean_config_fork($_[0]); # assume that if we had to create the gitforge branch, we just -- cgit v1.2.3 From ca1af5ff75521b8f2071642335858f464a7f221d Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 10 Mar 2020 09:21:35 -0700 Subject: v0.003 - API::GitForge::GitLab::_ensure_repo(): avoid an unnecessary API call. - API::GitForge::Role::GitForge::clean_repo(): try to unprotect fork branches before deleting them, if GitForge API library supports doing this. - API::GitForge::Role::GitForge::clean_repo(): push the gitforge branch using Git::Wrapper again. During early testing, this seemed to hang after pushing to GitLab installations, but it seems to work well now. Signed-off-by: Sean Whitton --- Changes | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Changes') diff --git a/Changes b/Changes index d5d3c2a..cc506c8 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for API::GitForge {{$NEXT}} + +0.003 2020-03-10 09:21:28-07:00 America/Phoenix - API::GitForge::GitLab::_ensure_repo(): avoid an unnecessary API call. - API::GitForge::Role::GitForge::clean_repo(): try to unprotect -- cgit v1.2.3