From: Kevin Sawicki Date: Tue, 20 Mar 2012 01:03:20 +0000 (-0700) Subject: Copy all branch configuration values when renaming X-Git-Tag: v2.0.0.201205301645-rc2~57 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fd0c468b7a181062eee910c655ec843950a7b51c;p=jgit.git 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 --- diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RenameBranchCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RenameBranchCommandTest.java new file mode 100644 index 0000000000..2309a7cce0 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RenameBranchCommandTest.java @@ -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)); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java index 99dc785b8a..f5dfa2b111 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java @@ -45,6 +45,7 @@ package org.eclipse.jgit.api; import java.io.IOException; import java.text.MessageFormat; +import java.util.Arrays; import org.eclipse.jgit.api.errors.DetachedHeadException; import org.eclipse.jgit.api.errors.InvalidRefNameException; @@ -138,41 +139,46 @@ public class RenameBranchCommand extends GitCommand { 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)) { - // move the upstream configuration over to the new branch - String shortOldName = fullOldName - .substring(Constants.R_HEADS.length()); - final StoredConfig repoConfig = repo.getConfig(); - String oldRemote = repoConfig.getString( + if (fullNewName.startsWith(Constants.R_HEADS)) { + String shortOldName = fullOldName.substring(Constants.R_HEADS + .length()); + final StoredConfig repoConfig = repo.getConfig(); + // Copy all configuration values over to the new branch + for (String name : repoConfig.getNames( + ConfigConstants.CONFIG_BRANCH_SECTION, shortOldName)) { + String[] values = repoConfig.getStringList( ConfigConstants.CONFIG_BRANCH_SECTION, - shortOldName, ConfigConstants.CONFIG_KEY_REMOTE); - if (oldRemote != null) { - repoConfig.setString( - ConfigConstants.CONFIG_BRANCH_SECTION, newName, - ConfigConstants.CONFIG_KEY_REMOTE, oldRemote); + shortOldName, name); + if (values.length == 0) + continue; + // Keep any existing values already configured for the + // 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 - throw new JGitInternalException(MessageFormat.format(JGitText - .get().renameBranchUnexpectedResult, renameResult - .name())); + repoConfig.setStringList( + ConfigConstants.CONFIG_BRANCH_SECTION, newName, + name, Arrays.asList(values)); + } + repoConfig.unsetSection(ConfigConstants.CONFIG_BRANCH_SECTION, + shortOldName); + repoConfig.save(); + } Ref resultRef = repo.getRef(newName); if (resultRef == null)