github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Copy all branch configuration values when renaming 

Previously only certain values were copied over which caused
divergence in behavior between the JGit command and corresponding
CGit command.

Bug: 372051
Change-Id: I72a83215a679a713138da31f5ab838f14388d4bd
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
stable-2.0
Kevin Sawicki 13 years ago committed by Chris Aniszczyk
parent
04ab2dac37
commit
fd0c468b7a
2 changed files with 209 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 172
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RenameBranchCommandTest.java
  2. 68
      org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java

172
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RenameBranchCommandTest.java
Unescape View File

@ -0,0 +1,172 @@
/*
* Copyright (C) 2012, GitHub Inc.
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
* under the terms of the Eclipse Distribution License v1.0 which
* accompanies this distribution, is reproduced below, and is
* available at http://www.eclipse.org/org/documents/edl-v10.php
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* - Neither the name of the Eclipse Foundation, Inc. nor the
* names of its contributors may be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.eclipse.jgit.api;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.RepositoryTestCase;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.Before;
import org.junit.Test;
/**
* Unit tests of {@link RenameBranchCommand}
*/
public class RenameBranchCommandTest extends RepositoryTestCase {
private static final String PATH = "file.txt";
private RevCommit head;
private Git git;
@Before
public void setUp() throws Exception {
super.setUp();
git = Git.wrap(db);
writeTrashFile(PATH, "content");
git.add().addFilepattern(PATH).call();
head = git.commit().setMessage("add file").call();
assertNotNull(head);
}
@Test
public void renameBranchNoConfigValues() throws Exception {
StoredConfig config = git.getRepository().getConfig();
config.unsetSection(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER);
config.save();
String branch = "b1";
assertTrue(config.getNames(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER).isEmpty());
assertNotNull(git.branchRename().setNewName(branch).call());
config = git.getRepository().getConfig();
assertTrue(config.getNames(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER).isEmpty());
assertTrue(config.getNames(ConfigConstants.CONFIG_BRANCH_SECTION,
branch).isEmpty());
}
@Test
public void renameBranchSingleConfigValue() throws Exception {
StoredConfig config = git.getRepository().getConfig();
config.setBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, true);
config.save();
String branch = "b1";
assertTrue(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, true));
assertFalse(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
branch, ConfigConstants.CONFIG_KEY_REBASE, false));
assertNotNull(git.branchRename().setNewName(branch).call());
config = git.getRepository().getConfig();
assertFalse(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, false));
assertTrue(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
branch, ConfigConstants.CONFIG_KEY_REBASE, false));
}
@Test
public void renameBranchExistingSection() throws Exception {
String branch = "b1";
StoredConfig config = git.getRepository().getConfig();
config.setBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, true);
config.setString(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, "a", "a");
config.setString(ConfigConstants.CONFIG_BRANCH_SECTION, branch, "a",
"b");
config.save();
assertNotNull(git.branchRename().setNewName(branch).call());
config = git.getRepository().getConfig();
assertArrayEquals(new String[] { "b", "a" }, config.getStringList(
ConfigConstants.CONFIG_BRANCH_SECTION, branch, "a"));
}
@Test
public void renameBranchMultipleConfigValues() throws Exception {
StoredConfig config = git.getRepository().getConfig();
config.setBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, true);
config.setBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, ConfigConstants.CONFIG_KEY_MERGE, true);
config.save();
String branch = "b1";
assertTrue(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, true));
assertFalse(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
branch, ConfigConstants.CONFIG_KEY_REBASE, false));
assertTrue(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, ConfigConstants.CONFIG_KEY_MERGE, true));
assertFalse(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
branch, ConfigConstants.CONFIG_KEY_MERGE, false));
assertNotNull(git.branchRename().setNewName(branch).call());
config = git.getRepository().getConfig();
assertFalse(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, false));
assertTrue(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
branch, ConfigConstants.CONFIG_KEY_REBASE, false));
assertFalse(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
Constants.MASTER, ConfigConstants.CONFIG_KEY_MERGE, false));
assertTrue(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION,
branch, ConfigConstants.CONFIG_KEY_MERGE, false));
}
}

68
org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java
Unescape View File

@ -45,6 +45,7 @@ package org.eclipse.jgit.api;
import java.io.IOException; import java.io.IOException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Arrays;
import org.eclipse.jgit.api.errors.DetachedHeadException; import org.eclipse.jgit.api.errors.DetachedHeadException;
import org.eclipse.jgit.api.errors.InvalidRefNameException; import org.eclipse.jgit.api.errors.InvalidRefNameException;
@ -138,41 +139,46 @@ public class RenameBranchCommand extends GitCommand<Ref> {
setCallable(false); setCallable(false);
boolean ok = Result.RENAMED == renameResult; if (Result.RENAMED != renameResult)
throw new JGitInternalException(MessageFormat.format(JGitText
.get().renameBranchUnexpectedResult, renameResult
.name()));
if (ok) { if (fullNewName.startsWith(Constants.R_HEADS)) {
if (fullNewName.startsWith(Constants.R_HEADS)) { String shortOldName = fullOldName.substring(Constants.R_HEADS
// move the upstream configuration over to the new branch .length());
String shortOldName = fullOldName final StoredConfig repoConfig = repo.getConfig();
.substring(Constants.R_HEADS.length()); // Copy all configuration values over to the new branch
final StoredConfig repoConfig = repo.getConfig(); for (String name : repoConfig.getNames(
String oldRemote = repoConfig.getString( ConfigConstants.CONFIG_BRANCH_SECTION, shortOldName)) {
String[] values = repoConfig.getStringList(
ConfigConstants.CONFIG_BRANCH_SECTION, ConfigConstants.CONFIG_BRANCH_SECTION,
shortOldName, ConfigConstants.CONFIG_KEY_REMOTE); shortOldName, name);
if (oldRemote != null) { if (values.length == 0)
repoConfig.setString( continue;
ConfigConstants.CONFIG_BRANCH_SECTION, newName, // Keep any existing values already configured for the
ConfigConstants.CONFIG_KEY_REMOTE, oldRemote); // new branch name
String[] existing = repoConfig.getStringList(
ConfigConstants.CONFIG_BRANCH_SECTION, newName,
name);
if (existing.length > 0) {
String[] newValues = new String[values.length
+ existing.length];
System.arraycopy(existing, 0, newValues, 0,
existing.length);
System.arraycopy(values, 0, newValues, existing.length,
values.length);
values = newValues;
} }
String oldMerge = repoConfig.getString(
ConfigConstants.CONFIG_BRANCH_SECTION,
shortOldName, ConfigConstants.CONFIG_KEY_MERGE);
if (oldMerge != null) {
repoConfig.setString(
ConfigConstants.CONFIG_BRANCH_SECTION, newName,
ConfigConstants.CONFIG_KEY_MERGE, oldMerge);
}
repoConfig
.unsetSection(
ConfigConstants.CONFIG_BRANCH_SECTION,
shortOldName);
repoConfig.save();
}
} else repoConfig.setStringList(
throw new JGitInternalException(MessageFormat.format(JGitText ConfigConstants.CONFIG_BRANCH_SECTION, newName,
.get().renameBranchUnexpectedResult, renameResult name, Arrays.asList(values));
.name())); }
repoConfig.unsetSection(ConfigConstants.CONFIG_BRANCH_SECTION,
shortOldName);
repoConfig.save();
}
Ref resultRef = repo.getRef(newName); Ref resultRef = repo.getRef(newName);
if (resultRef == null) if (resultRef == null)

Write Preview
Loading…
Cancel
Save