MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-344874 git: do not apply refs/tags push spec to refs/heads

Browse Source 
GitOrigin-RevId: 1f15b6c3b1f7aba2b4beb59dfcfad2e9c39c49ca
This commit is contained in:
Aleksey Pivovarov
2024-02-01 15:41:48 +01:00
committed by intellij-monorepo-bot
parent c5afd3cb87
commit 0432f5399a
3 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/git4idea/src/git4idea/push/GitPushSpecParser.java
View File

@@ -3,6 +3,7 @@ package git4idea.push;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.text.StringUtil;
import git4idea.GitBranch;
import git4idea.GitUtil;
import git4idea.branch.GitBranchUtil;
import git4idea.repo.GitRepository;
@@ -33,23 +34,29 @@ final class GitPushSpecParser {
if (parts.length != 2) {
return null;
}
String source = parts[0].trim();
String target = parts[1].trim();
source = StringUtil.trimStart(source, "+");
String specSource = parts[0].trim();
String specTarget = parts[1].trim();
specSource = StringUtil.trimStart(specSource, "+");
if (!isStarPositionValid(source, target)) {
if (!isStarPositionValid(specSource, specTarget)) {
return null;
}
source = GitBranchUtil.stripRefsPrefix(source);
sourceBranch = GitBranchUtil.stripRefsPrefix(sourceBranch);
if (source.equals(GitUtil.HEAD) || source.equals(sourceBranch)) return target;
String strippedSpecSource = GitBranchUtil.stripRefsPrefix(specSource);
String strippedSourceBranch = GitBranchUtil.stripRefsPrefix(sourceBranch);
sourceBranch = GitBranch.REFS_HEADS_PREFIX + strippedSourceBranch;
if (source.endsWith("*")) {
String sourceWoStar = source.substring(0, source.length() - 1);
if (strippedSpecSource.equals(GitUtil.HEAD) ||
specSource.equals(sourceBranch) ||
specSource.equals(strippedSourceBranch)) {
return specTarget;
}
if (specSource.endsWith("*")) {
String sourceWoStar = specSource.substring(0, specSource.length() - 1);
if (sourceBranch.startsWith(sourceWoStar)) {
String starMeaning = sourceBranch.substring(sourceWoStar.length());
return target.replace("*", starMeaning);
return specTarget.replace("*", starMeaning);
}
}
return null;

7
plugins/git4idea/src/git4idea/push/GitPushTarget.java
View File

@@ -20,6 +20,7 @@ import java.text.ParseException;
import java.util.Collection;
import java.util.List;
import static git4idea.GitBranch.REFS_HEADS_PREFIX;
import static git4idea.GitBranch.REFS_REMOTES_PREFIX;
import static git4idea.GitUtil.findRemoteBranch;
import static git4idea.GitUtil.getDefaultOrFirstRemote;
@@ -105,6 +106,12 @@ public class GitPushTarget implements PushTarget {
if (targetRef == null) return null;
String remotePrefix = REFS_REMOTES_PREFIX + remote.getName() + "/";
if (targetRef.startsWith(REFS_HEADS_PREFIX)) {
targetRef = targetRef.substring(REFS_HEADS_PREFIX.length());
GitRemoteBranch remoteBranch = GitUtil.findOrCreateRemoteBranch(repository, remote, targetRef);
boolean existingBranch = repository.getBranches().getRemoteBranches().contains(remoteBranch);
return new GitPushTarget(remoteBranch, !existingBranch, false);
}
if (targetRef.startsWith(remotePrefix)) {
targetRef = targetRef.substring(remotePrefix.length());
GitRemoteBranch remoteBranch = GitUtil.findOrCreateRemoteBranch(repository, remote, targetRef);

18
plugins/git4idea/tests/git4idea/push/GitPushSpecParserTest.java
View File

@@ -62,6 +62,24 @@ public class GitPushSpecParserTest {
assertNull(getTargetRef("feature", specs));
}
@Test
public void test_tag_specs_ignored() {
List<String> specs = Arrays.asList("+refs/heads/master:refs/remotes/origin/master",
"refs/tags/*:refs/tags/*");
assertNull(getTargetRef("qa/ticket1", specs));
assertEquals("refs/remotes/origin/master", getTargetRef("master", specs));
assertNull(getTargetRef("feature", specs));
}
@Test
public void test_refs_heads_matches() {
List<String> specs = Arrays.asList("refs/heads/master:refs/heads/qa/master",
"refs/tags/*:refs/tags/*",
"refs/heads/*:refs/heads/pr/*");
assertEquals("refs/heads/pr/qa/ticket1", getTargetRef("qa/ticket1", specs));
assertEquals("refs/heads/qa/master", getTargetRef("master", specs));
}
@Nullable
private static String getTargetRef(@NotNull String sourceBranch, @NotNull List<String> specs) {
GitRepository myRepo = Mockito.mock(GitRepository.class);