]> source.dussan.org Git - jgit.git/commitdiff
Add PushConfig class with PushRecurseSubmodulesMode 76/103676/11
authorDavid Pursehouse <david.pursehouse@gmail.com>
Fri, 25 Aug 2017 06:55:44 +0000 (15:55 +0900)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 9 Sep 2017 17:58:09 +0000 (13:58 -0400)
This will be used later when adding for support for recursing
submodules on push.

Change-Id: Ie2a183e5404a32046de9f6524e6ceeec37919671
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConfigTest.java [new file with mode: 0644]
org.eclipse.jgit/src/org/eclipse/jgit/transport/PushConfig.java [new file with mode: 0644]

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConfigTest.java
new file mode 100644 (file)
index 0000000..9610fbd
--- /dev/null
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2017, David Pursehouse <david.pursehouse@gmail.com>
+ * 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.transport;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.jgit.transport.PushConfig.PushRecurseSubmodulesMode;
+import org.junit.Test;
+
+public class PushConfigTest {
+       @Test
+       public void pushRecurseSubmoduleMatch() throws Exception {
+               assertTrue(PushRecurseSubmodulesMode.CHECK.matchConfigValue("check"));
+               assertTrue(PushRecurseSubmodulesMode.CHECK.matchConfigValue("CHECK"));
+
+               assertTrue(PushRecurseSubmodulesMode.ON_DEMAND
+                               .matchConfigValue("on-demand"));
+               assertTrue(PushRecurseSubmodulesMode.ON_DEMAND
+                               .matchConfigValue("ON-DEMAND"));
+               assertTrue(PushRecurseSubmodulesMode.ON_DEMAND
+                               .matchConfigValue("on_demand"));
+               assertTrue(PushRecurseSubmodulesMode.ON_DEMAND
+                               .matchConfigValue("ON_DEMAND"));
+
+               assertTrue(PushRecurseSubmodulesMode.NO.matchConfigValue("no"));
+               assertTrue(PushRecurseSubmodulesMode.NO.matchConfigValue("NO"));
+               assertTrue(PushRecurseSubmodulesMode.NO.matchConfigValue("false"));
+               assertTrue(PushRecurseSubmodulesMode.NO.matchConfigValue("FALSE"));
+       }
+
+       @Test
+       public void pushRecurseSubmoduleNoMatch() throws Exception {
+               assertFalse(PushRecurseSubmodulesMode.NO.matchConfigValue("N"));
+               assertFalse(PushRecurseSubmodulesMode.ON_DEMAND
+                               .matchConfigValue("ONDEMAND"));
+       }
+
+       @Test
+       public void pushRecurseSubmoduleToConfigValue() {
+               assertEquals("on-demand",
+                               PushRecurseSubmodulesMode.ON_DEMAND.toConfigValue());
+               assertEquals("check", PushRecurseSubmodulesMode.CHECK.toConfigValue());
+               assertEquals("false", PushRecurseSubmodulesMode.NO.toConfigValue());
+       }
+}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushConfig.java
new file mode 100644 (file)
index 0000000..bff9c71
--- /dev/null
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2017, David Pursehouse <david.pursehouse@gmail.com>
+ * 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.transport;
+
+import org.eclipse.jgit.lib.Config;
+import org.eclipse.jgit.util.StringUtils;
+
+/**
+ * Push section of a Git configuration file.
+ *
+ * @since 4.9
+ */
+public class PushConfig {
+       /**
+        * Config values for push.recurseSubmodules.
+        */
+       public enum PushRecurseSubmodulesMode implements Config.ConfigEnum {
+               /**
+                * Verify that all submodule commits that changed in the revisions to be
+                * pushed are available on at least one remote of the submodule.
+                */
+               CHECK("check"), //$NON-NLS-1$
+
+               /**
+                * All submodules that changed in the revisions to be pushed will be
+                * pushed.
+                */
+               ON_DEMAND("on-demand"), //$NON-NLS-1$
+
+               /** Default behavior of ignoring submodules when pushing is retained. */
+               NO("false"); //$NON-NLS-1$
+
+               private final String configValue;
+
+               private PushRecurseSubmodulesMode(String configValue) {
+                       this.configValue = configValue;
+               }
+
+               @Override
+               public String toConfigValue() {
+                       return configValue;
+               }
+
+               @Override
+               public boolean matchConfigValue(String s) {
+                       if (StringUtils.isEmptyOrNull(s)) {
+                               return false;
+                       }
+                       s = s.replace('-', '_');
+                       return name().equalsIgnoreCase(s)
+                                       || configValue.equalsIgnoreCase(s);
+               }
+       }
+}