Permalink
Browse files

Merge remote branch 'manandbytes/move-to-org.eclipse.jgit-0.8.4'

Conflicts:
	nbproject/project.properties
	src/org/nbgit/client/CheckoutBuilder.java
	src/org/nbgit/client/IndexBuilder.java
	src/org/nbgit/util/GitCommand.java
  • Loading branch information...
2 parents 47033e0 + e723609 commit fc0211de26276db805dd67ebff558046e9dcd864 @jonas jonas committed Jun 30, 2010
Showing with 206 additions and 198 deletions.
  1. +5 −4 README.markdown
  2. +14 −22 javahelp/org/nbgit/docs/credits.html
  3. +2 −0 nbproject/project.properties
  4. +23 −6 nbproject/project.xml
  5. +0 −30 release/modules/ext/com-jcraft-jsch.LICENSE.txt
  6. BIN release/modules/ext/com-jcraft-jsch.jar
  7. BIN release/modules/ext/org-spearce-jgit.jar
  8. BIN release/modules/ext/org.eclipse.jgit-0.8.4.jar
  9. +9 −1 release/modules/ext/{org-spearce-jgit.LICENSE.txt → org.eclipse.jgit.LICENSE.txt}
  10. BIN release/modules/ext/org.eclipse.jgit.ui-0.8.4.jar
  11. +3 −2 src/org/nbgit/Git.java
  12. +5 −5 src/org/nbgit/GitModuleConfig.java
  13. +1 −1 src/org/nbgit/GitProgressMonitor.java
  14. +1 −1 src/org/nbgit/GitProgressSupport.java
  15. +0 −1 src/org/nbgit/GitRepository.java
  16. +8 −7 src/org/nbgit/client/CheckoutBuilder.java
  17. +2 −2 src/org/nbgit/client/ClientBuilder.java
  18. +7 −7 src/org/nbgit/client/CommitBuilder.java
  19. +4 −4 src/org/nbgit/client/IndexBuilder.java
  20. +1 −1 src/org/nbgit/client/RevisionEntry.java
  21. +1 −1 src/org/nbgit/ui/browser/BrowserAction.java
  22. +6 −6 src/org/nbgit/ui/browser/BrowserController.java
  23. +5 −5 src/org/nbgit/ui/browser/BrowserModel.java
  24. +1 −1 src/org/nbgit/ui/browser/BrowserTopComponent.form
  25. +3 −1 src/org/nbgit/ui/browser/BrowserTopComponent.java
  26. +16 −16 src/org/nbgit/ui/clone/CloneAction.java
  27. +1 −1 src/org/nbgit/ui/custom/CustomAction.java
  28. +1 −1 src/org/nbgit/ui/custom/CustomActionBuilder.java
  29. +2 −2 src/org/nbgit/ui/custom/CustomMenu.java
  30. +3 −3 src/org/nbgit/ui/init/InitAction.java
  31. +9 −9 src/org/nbgit/ui/log/RepositoryRevision.java
  32. +5 −5 src/org/nbgit/ui/log/SearchExecutor.java
  33. +1 −1 src/org/nbgit/ui/log/SearchHistoryTopComponent.java
  34. +2 −2 src/org/nbgit/ui/properties/GitProperties.java
  35. +2 −2 src/org/nbgit/ui/repository/GitRepositoryUI.java
  36. +3 −3 src/org/nbgit/ui/status/VersioningPanel.java
  37. +1 −1 src/org/nbgit/ui/wizards/CloneDestinationDirectoryWizardPanel.java
  38. +1 −1 src/org/nbgit/ui/wizards/ClonePathsWizardPanel.java
  39. +2 −2 src/org/nbgit/ui/wizards/CloneRepositoryWizardPanel.java
  40. +1 −1 src/org/nbgit/ui/wizards/CloneWizardAction.java
  41. +22 −16 src/org/nbgit/util/GitCommand.java
  42. +1 −1 src/org/nbgit/util/GitUtils.java
  43. +6 −6 src/org/nbgit/util/HtmlFormatter.java
  44. +1 −1 src/org/nbgit/util/exclude/ExcludeCache.java
  45. +1 −1 src/org/nbgit/util/exclude/Excludes.java
  46. +4 −6 test/unit/src/org/nbgit/client/CommitBuilderTest.java
  47. +18 −7 test/unit/src/org/nbgit/junit/RepositoryTestCase.java
  48. +2 −2 test/unit/src/org/nbgit/util/exclude/ExcludeCacheTest.java
View
@@ -33,10 +33,11 @@ They can be found in:
- javahelp/org/nbgit/docs/news.html
- javahelp/org/nbgit/docs/issues.html
-To install from source clone the repository and use File > Open Project to
-add it to your project list in Netbeans. Then right click on the new project
-and select "Install/Reload in Development IDE". You are advised to first test
-the plugin by "running" the project.
+To install from source you need to install the "NetBeans Plugin Development"
+plugin from the plugins menu. Afterwards clone the repository and use
+File > Open Project to add it to your project list in Netbeans. Then right
+click on the new project and select "Install/Reload in Development IDE". You
+are advised to first test the plugin by "running" the project.
Getting the Source
------------------
@@ -49,46 +49,38 @@
of inspiration for working with JGit.
</p>
<p>
- JGit is distributed under a BSD-style license.
- The license is available in the source repository as
- <code>release/modules/ext/org-spearce-jgit.LICENSE.txt</code>.
- EGit is distributed under the Eclipse Public License v1.0.
+ Both EGit ad JGit are distributed under the Eclipse Public License
+ v1.0, a new BSD-style license. The license is available in the
+ source repository as
+ <code>release/modules/ext/org.eclipse.jgit.LICENSE.txt</code>.
</p>
<ul>
<li>
More info about JGit/EGit can be found at:<br/>
<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
- <param name="content" value="http://code.google.com/p/egit/"/>
- <param name="text" value="<html><u>http://code.google.com/p/egit/</u></html>"/>
+ <param name="content" value="http://www.eclipse.org/egit/"/>
+ <param name="text" value="<html><u>http://www.eclipse.org/egit/</u></html>"/>
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue"/>
+ </object>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://www.eclipse.org/jgit/"/>
+ <param name="text" value="<html><u>http://www.eclipse.org/jgit/</u></html>"/>
<param name="textFontSize" value="medium">
<param name="textColor" value="blue"/>
</object>
</li>
<li>
The specific license for JGit can be found at:<br/>
<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
- <param name="content" value="http://repo.or.cz/w/jgit.git?a=blob;f=org.spearce.jgit/LICENSE;hb=HEAD"/>
- <param name="text" value="<html><u>http://repo.or.cz/w/jgit.git?a=blob;f=org.spearce.jgit/LICENSE;hb=HEAD</u></html>"/>
+ <param name="content" value="http://www.eclipse.org/org/documents/edl-v10.html"/>
+ <param name="text" value="<html><u>http://www.eclipse.org/org/documents/edl-v10.html</u></html>"/>
<param name="textFontSize" value="medium">
<param name="textColor" value="blue"/>
</object>
</li>
</ul>
- <h3>JSch</h3>
- <p>
- The SSH transport support in JGit uses JSch. To easy
- installation the version distributed with the JGit/EGit
- project is included in this project. However, Netbeans
- seem to include its own JSch jar file so it might be
- possible to remove this dependency in the future.
- </p>
- <p>
- JSch is distributed under a BSD-style license.
- The license is available in the source repository as
- <code>release/modules/ext/com-jcraft-jsch.LICENSE.txt</code>.
- </p>
-
<h3>OpenBSD fnmatch(3)</h3>
<p>
Support for .gitignore and .git/info/exclude files use
@@ -10,6 +10,8 @@ auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.redun
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.redundantForBraces=LEAVE_ALONE
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.redundantIfBraces=LEAVE_ALONE
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.redundantWhileBraces=LEAVE_ALONE
+file.reference.org.eclipse.jgit-0.8.4.jar=release/modules/ext/org.eclipse.jgit-0.8.4.jar
+file.reference.org.eclipse.jgit.ui-0.8.4.jar=release/modules/ext/org.eclipse.jgit.ui-0.8.4.jar
javahelp.base=org/nbgit/docs
javahelp.hs=helpset.xml
javac.source=1.5
View
@@ -25,6 +25,15 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.libs.jsch</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.12.1</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.diff</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -47,8 +56,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <release-version>1</release-version>
- <specification-version>1.29.2.8.2</specification-version>
+ <release-version>2</release-version>
+ <specification-version>2.2.10</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -195,6 +204,14 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.openide.util.lookup</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>8.1</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.openide.windows</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -219,12 +236,12 @@
</test-dependencies>
<public-packages/>
<class-path-extension>
- <runtime-relative-path>ext/org-spearce-jgit.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/org-spearce-jgit.jar</binary-origin>
+ <runtime-relative-path>ext/org.eclipse.jgit-0.8.4.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/org.eclipse.jgit-0.8.4.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/com-jcraft-jsch.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/com-jcraft-jsch.jar</binary-origin>
+ <runtime-relative-path>ext/org.eclipse.jgit.ui-0.8.4.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/org.eclipse.jgit.ui-0.8.4.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
@@ -1,30 +0,0 @@
-JSch 0.0.* was released under the GNU LGPL license. Later, we have switched
-over to a BSD-style license.
-
-------------------------------------------------------------------------------
-Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Atsuhiko Yamanaka, JCraft,Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. 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.
-
- 3. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE 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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,4 +1,11 @@
/*
+ * 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
@@ -13,7 +20,7 @@
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
- * - Neither the name of the Git Development Community nor the
+ * - 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.
@@ -32,3 +39,4 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
Binary file not shown.
View
@@ -56,7 +56,8 @@
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.RequestProcessor;
-import org.spearce.jgit.lib.Repository;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.Repository;
/**
* Main entry point for Git functionality, use getInstance() to get the Git object.
@@ -100,7 +101,7 @@ public Repository getRepository(File root) {
Repository repo = repos.get(root);
if (repo == null) {
- final File gitDir = new File(root, GitRepository.GIT_DIR);
+ final File gitDir = new File(root, Constants.DOT_GIT);
try {
repo = new Repository(gitDir);
repos.put(root, repo);
@@ -53,11 +53,11 @@
import org.netbeans.modules.versioning.util.Utils;
import org.openide.util.NbPreferences;
import org.openide.util.Utilities;
-import org.spearce.jgit.lib.FileBasedConfig;
-import org.spearce.jgit.lib.Repository;
-import org.spearce.jgit.lib.RepositoryConfig;
-import org.spearce.jgit.lib.UserConfig;
-import org.spearce.jgit.util.SystemReader;
+import org.eclipse.jgit.lib.FileBasedConfig;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.RepositoryConfig;
+import org.eclipse.jgit.lib.UserConfig;
+import org.eclipse.jgit.util.SystemReader;
/**
* Stores Git module configuration.
@@ -38,7 +38,7 @@
import org.netbeans.api.progress.aggregate.AggregateProgressFactory;
import org.netbeans.api.progress.aggregate.AggregateProgressHandle;
import org.netbeans.api.progress.aggregate.ProgressContributor;
-import org.spearce.jgit.lib.ProgressMonitor;
+import org.eclipse.jgit.lib.ProgressMonitor;
/**
*
@@ -51,7 +51,7 @@
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import org.openide.util.TaskListener;
-import org.spearce.jgit.transport.URIish;
+import org.eclipse.jgit.transport.URIish;
/**
*
@@ -4,5 +4,4 @@
public static final String REVISION_BASE = "BASE"; // NOI18N
public static final String REVISION_CURRENT = "LOCAL"; // NOI18N
public static final String REVISION_HEAD = "HEAD"; // NOI18N
- public static final String GIT_DIR = ".git"; // NOI18N
}
@@ -44,13 +44,14 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.spearce.jgit.dircache.DirCache;
-import org.spearce.jgit.dircache.DirCacheEntry;
-import org.spearce.jgit.lib.FileMode;
-import org.spearce.jgit.lib.ObjectId;
-import org.spearce.jgit.lib.Repository;
-import org.spearce.jgit.lib.Tree;
-import org.spearce.jgit.lib.TreeEntry;
+import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.dircache.DirCacheEntry;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.GitIndex;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.Tree;
+import org.eclipse.jgit.lib.TreeEntry;
/**
* Build a checkout of files from a revision.
@@ -38,8 +38,8 @@
import java.io.File;
import org.nbgit.Git;
import org.nbgit.OutputLogger;
-import org.spearce.jgit.lib.Repository;
-import org.spearce.jgit.util.FS;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.util.FS;
public class ClientBuilder {
@@ -39,13 +39,13 @@
import java.io.IOException;
import java.util.Collection;
import org.nbgit.OutputLogger;
-import org.spearce.jgit.lib.Commit;
-import org.spearce.jgit.lib.Constants;
-import org.spearce.jgit.lib.ObjectId;
-import org.spearce.jgit.lib.ObjectWriter;
-import org.spearce.jgit.lib.PersonIdent;
-import org.spearce.jgit.lib.RefUpdate;
-import org.spearce.jgit.lib.Repository;
+import org.eclipse.jgit.lib.Commit;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectWriter;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.lib.Repository;
/**
* Build a commit and write it to a repository.
@@ -39,10 +39,10 @@
import java.io.IOException;
import java.util.Collection;
import org.nbgit.OutputLogger;
-import org.spearce.jgit.lib.GitIndex;
-import org.spearce.jgit.lib.GitIndex.Entry;
-import org.spearce.jgit.lib.ObjectId;
-import org.spearce.jgit.lib.Repository;
+import org.eclipse.jgit.lib.GitIndex.Entry;
+import org.eclipse.jgit.lib.GitIndex;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
/**
* Wrapper for JGit's index API.
@@ -35,7 +35,7 @@
*/
package org.nbgit.client;
-import org.spearce.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectId;
public class RevisionEntry {
@@ -41,7 +41,7 @@
import org.netbeans.modules.versioning.spi.VCSContext;
import org.netbeans.modules.versioning.util.Utils;
import org.openide.util.NbBundle;
-import org.spearce.jgit.lib.Constants;
+import org.eclipse.jgit.lib.Constants;
/**
* Open the repository browser.
@@ -41,12 +41,12 @@
import java.text.SimpleDateFormat;
import javax.swing.SwingUtilities;
import org.openide.util.NbBundle;
-import org.spearce.jgit.lib.Ref;
-import org.spearce.jgit.lib.PersonIdent;
-import org.spearce.jgit.revplot.PlotWalk;
-import org.spearce.jgit.revwalk.RevCommit;
-import org.spearce.jgit.revwalk.RevObject;
-import org.spearce.jgit.revwalk.RevSort;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.revplot.PlotWalk;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
+import org.eclipse.jgit.revwalk.RevSort;
/**
* Control behavior of a repository browser.
@@ -43,11 +43,11 @@
import javax.swing.text.PlainDocument;
import javax.swing.text.SimpleAttributeSet;
import org.nbgit.Git;
-import org.spearce.jgit.lib.Ref;
-import org.spearce.jgit.lib.Repository;
-import org.spearce.jgit.revwalk.RevCommitList;
-import org.spearce.jgit.treewalk.filter.PathFilterGroup;
-import org.spearce.jgit.treewalk.filter.TreeFilter;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommitList;
+import org.eclipse.jgit.treewalk.filter.PathFilterGroup;
+import org.eclipse.jgit.treewalk.filter.TreeFilter;
public class BrowserModel {
@@ -50,7 +50,7 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
- <Component class="org.spearce.jgit.awtui.CommitGraphPane" name="commitGraphPane">
+ <Component class="org.eclipse.jgit.awtui.CommitGraphPane" name="commitGraphPane">
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="18"/>
</AuxValues>
Oops, something went wrong.

0 comments on commit fc0211d

Please sign in to comment.