Upload original JAVA语言程序设计 course files (part 2)
Browse filesThis view is limited to 50 files because it contains too many changes. See raw diff
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/286/0/.cp/icons/full/wizban/run_wiz.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/310/0/.cp/icons/full/etool16/fastview_restore.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/311/0/.cp/icons/full/elcl16/view_menu.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/311/0/.cp/icons/full/ovr16/pinned_ovr.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/312/0/.cp/images/dragHandle-rotated.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/312/0/.cp/images/dragHandle.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/327/0/.cp/icons/full/dlcl16/runcoverage.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/327/0/.cp/icons/full/elcl16/relaunch.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/327/0/.cp/icons/full/elcl16/runcoverage.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/327/0/.cp/icons/full/etool16/java_launch.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/327/0/.cp/icons/full/eview16/coverage.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/about.html +36 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/cheatsheets/clone.xml +60 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/cheatsheets/push.xml +70 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/contexts.xml +29 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/contexts/GpgConfiguration.html +98 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Automated-Developer-Setup.html +124 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Bugs.html +293 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Builds.html +442 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Contributing-Patches.html +603 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Contributor-Guide.html +89 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Development-IDE-Configuration.html +152 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Documentation.html +121 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html +171 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Manual-Developer-Setup.html +174 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Obtaining-Sources.html +120 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Running-EGit-from-Eclipse.html +73 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Tests.html +109 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Updating-This-Document.html +55 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Website.html +100 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/1-GerritHub-first-login.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/3-Redirect-to-Gerrithub.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/5-Gerrithub-Github-Scope.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/7-login-to-github.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/EGit-Target-Platforms.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-01-advanced-mode.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-02-proxy-product-selection.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-03-project-egit.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-04-installer-progress.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-05-eclipse-progress.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-06-ide.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph_-01a-proxy-settings.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Start-swtbot-test.png +0 -0
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html +523 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Git_For_Eclipse_Users/Updating-This-Document.html +55 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/New_and_Noteworthy/6.8/6.8.html +71 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/New_and_Noteworthy/6.8/Contributors.html +64 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/New_and_Noteworthy/6.8/See-Also.html +61 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/New_and_Noteworthy/6.8/Updating-This-Document.html +55 -3
- Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/User_Guide/Concepts.html +165 -3
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/286/0/.cp/icons/full/wizban/run_wiz.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/310/0/.cp/icons/full/etool16/fastview_restore.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/311/0/.cp/icons/full/elcl16/view_menu.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/311/0/.cp/icons/full/ovr16/pinned_ovr.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/312/0/.cp/images/dragHandle-rotated.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/312/0/.cp/images/dragHandle.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/327/0/.cp/icons/full/dlcl16/runcoverage.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/327/0/.cp/icons/full/elcl16/relaunch.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/327/0/.cp/icons/full/elcl16/runcoverage.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/327/0/.cp/icons/full/etool16/java_launch.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/327/0/.cp/icons/full/eview16/coverage.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/about.html
CHANGED
|
@@ -1,3 +1,36 @@
|
|
| 1 |
-
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
| 2 |
+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
| 3 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 4 |
+
<head>
|
| 5 |
+
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
|
| 6 |
+
<title>About</title>
|
| 7 |
+
</head>
|
| 8 |
+
<body lang="EN-US">
|
| 9 |
+
<h2>About This Content</h2>
|
| 10 |
+
|
| 11 |
+
<p>November 30, 2017</p>
|
| 12 |
+
<h3>License</h3>
|
| 13 |
+
|
| 14 |
+
<p>
|
| 15 |
+
The Eclipse Foundation makes available all content in this plug-in
|
| 16 |
+
("Content"). Unless otherwise indicated below, the Content
|
| 17 |
+
is provided to you under the terms and conditions of the Eclipse
|
| 18 |
+
Public License Version 2.0 ("EPL"). A copy of the EPL is
|
| 19 |
+
available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
|
| 20 |
+
For purposes of the EPL, "Program" will mean the Content.
|
| 21 |
+
</p>
|
| 22 |
+
|
| 23 |
+
<p>
|
| 24 |
+
If you did not receive this Content directly from the Eclipse
|
| 25 |
+
Foundation, the Content is being redistributed by another party
|
| 26 |
+
("Redistributor") and different terms and conditions may
|
| 27 |
+
apply to your use of any object code in the Content. Check the
|
| 28 |
+
Redistributor's license that was provided with the Content. If no such
|
| 29 |
+
license exists, contact the Redistributor. Unless otherwise indicated
|
| 30 |
+
below, the terms and conditions of the EPL still apply to any source
|
| 31 |
+
code in the Content and such source code may be obtained at <a
|
| 32 |
+
href="https://www.eclipse.org/">https://www.eclipse.org</a>.
|
| 33 |
+
</p>
|
| 34 |
+
|
| 35 |
+
</body>
|
| 36 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/cheatsheets/clone.xml
CHANGED
|
@@ -1,3 +1,60 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version="1.0" encoding="UTF-8"?>
|
| 2 |
+
<!--
|
| 3 |
+
Copyright (C) 2010, Philipp Thun <philipp.thun@sap.com>
|
| 4 |
+
|
| 5 |
+
All rights reserved. This program and the accompanying materials
|
| 6 |
+
are made available under the terms of the Eclipse Public License 2.0
|
| 7 |
+
which accompanies this distribution, and is available at
|
| 8 |
+
https://www.eclipse.org/legal/epl-2.0/
|
| 9 |
+
|
| 10 |
+
SPDX-License-Identifier: EPL-2.0
|
| 11 |
+
-->
|
| 12 |
+
<cheatsheet title="Cloning a Git Repository">
|
| 13 |
+
<intro>
|
| 14 |
+
<description>
|
| 15 |
+
With the Git Clone Wizard you can clone repositories using different transport protocols.
|
| 16 |
+
</description>
|
| 17 |
+
</intro>
|
| 18 |
+
<item title="Start Clone Wizard" dialog="true">
|
| 19 |
+
<description>
|
| 20 |
+
The clone wizard can be started by clicking "Click to perform" below.<br /><br />
|
| 21 |
+
Alternatively you can launch this wizard from the "Import Projects from Git" wizard using "Import... > Git > Projects from Git > Next > Clone..." or from the "Git Repositories View" using the "Clone a Git Repository" toolbar button.<br /><br />
|
| 22 |
+
<b>To start this cheat sheet from a separately opened wizard, click the help icon and then select "Cloning a Git Repository".</b>
|
| 23 |
+
</description>
|
| 24 |
+
<command required="false" serialization="org.eclipse.egit.ui.RepositoriesViewClone" />
|
| 25 |
+
</item>
|
| 26 |
+
<item title="Repository Source (Optional)" dialog="true" skip="true">
|
| 27 |
+
<description>
|
| 28 |
+
Depending on which additional plug-ins have been installed, you may need to choose between different sources for cloning the repository.<br /><br />
|
| 29 |
+
If you are not sure, choose "Clone URI" from the list of available sources.<br /><br />
|
| 30 |
+
If the wizard is already asking your for repository details like a URI, then you can skip to the next item in the cheat sheet.
|
| 31 |
+
</description>
|
| 32 |
+
</item>
|
| 33 |
+
<item
|
| 34 |
+
href="/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html#Repository_Selection"
|
| 35 |
+
title="Repository Selection" dialog="true">
|
| 36 |
+
<description>
|
| 37 |
+
<b>Enter the repository location.</b><br /><br />
|
| 38 |
+
If you already have a <b>repository URI</b> in your clipboard, i.e. copied from a gitweb, github, wiki or any other page, it will be automatically entered into the URI field. The other fields (i.e. Host, Repository path, Protocol, Port) will then be automatically filled.<br /><br />
|
| 39 |
+
In case cloning requires <b>authentication</b> (which is not the case for many repositories), enter your credentials into the User and Password fields.<br /><br />
|
| 40 |
+
For a complete description of all fields as well as the supported protocols, see the referenced <b>documentation</b> (click on help icon on top of this section).<br /><br />
|
| 41 |
+
<b>Click Next</b>
|
| 42 |
+
</description>
|
| 43 |
+
</item>
|
| 44 |
+
<item title="Branch Selection" dialog="true">
|
| 45 |
+
<description>
|
| 46 |
+
<b>Choose branches to be cloned from the repository.</b><br /><br />
|
| 47 |
+
By default all available branches are checked.<br /><br />
|
| 48 |
+
<b>Click Next</b>
|
| 49 |
+
</description>
|
| 50 |
+
</item>
|
| 51 |
+
<item title="Local Destination" dialog="true">
|
| 52 |
+
<description>
|
| 53 |
+
<b>Define local storage settings.</b><br /><br />
|
| 54 |
+
Specify the <b>destination directory</b> of the cloned repository. If this directory does not yet exist, it will be created by the wizard.<br /><br />
|
| 55 |
+
Optionally, you can change the <b>initial branch</b> that will be created and checked out locally. The default <b>remote name</b> is 'origin'. This can also be changed if necessary.<br /><br />
|
| 56 |
+
<b>Click Finish to end the wizard.</b>
|
| 57 |
+
</description>
|
| 58 |
+
<onCompletion>You have now successfully cloned a Git repository.</onCompletion>
|
| 59 |
+
</item>
|
| 60 |
+
</cheatsheet>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/cheatsheets/push.xml
CHANGED
|
@@ -1,3 +1,70 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version="1.0" encoding="UTF-8"?>
|
| 2 |
+
<!--
|
| 3 |
+
Copyright (C) 2010, Philipp Thun <philipp.thun@sap.com>
|
| 4 |
+
|
| 5 |
+
All rights reserved. This program and the accompanying materials
|
| 6 |
+
are made available under the terms of the Eclipse Public License 2.0
|
| 7 |
+
which accompanies this distribution, and is available at
|
| 8 |
+
https://www.eclipse.org/legal/epl-2.0/
|
| 9 |
+
|
| 10 |
+
SPDX-License-Identifier: EPL-2.0
|
| 11 |
+
-->
|
| 12 |
+
<cheatsheet title="Pushing to another Git Repository">
|
| 13 |
+
<intro>
|
| 14 |
+
<description>
|
| 15 |
+
With the Git Push Wizard you can push commits to another repository using different transport protocols.
|
| 16 |
+
</description>
|
| 17 |
+
</intro>
|
| 18 |
+
<item title="Start Push Wizard" dialog="true">
|
| 19 |
+
<description>
|
| 20 |
+
The push wizard can be started from the context menu on a repository or project by "Push..." or "Team > Push...".<br /><br />
|
| 21 |
+
<b>To start this cheat sheet from within the opened wizard, click the help icon and then select "Pushing to another Git Repository".</b>
|
| 22 |
+
</description>
|
| 23 |
+
</item>
|
| 24 |
+
<item
|
| 25 |
+
href="/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html#Push_URI"
|
| 26 |
+
title="Destination Git Repository" dialog="true">
|
| 27 |
+
<description>
|
| 28 |
+
<b>Select a push specification or enter the repository location.</b><br /><br />
|
| 29 |
+
If you already configured a <b>push specification</b>, you can select it from the "Configured remote repository" drop-down list. Otherwise you have to specify the URI of a repository you want to push to as follows:<br /><br />
|
| 30 |
+
If you have a <b>repository URI</b> in your clipboard, i.e. copied from a gitweb, github, wiki or any other page, it will be automatically entered into the URI field. The other fields (i.e. Host, Repository path, Protocol, Port) will then be automatically filled.<br /><br />
|
| 31 |
+
In case pushing requires <b>authentication</b> (which is the most likely case), enter your credentials into the User and Password fields.
|
| 32 |
+
</description>
|
| 33 |
+
</item>
|
| 34 |
+
<item
|
| 35 |
+
href="/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html#Eclipse_SSH_Configuration"
|
| 36 |
+
title="Using SSH" skip="true" dialog="true">
|
| 37 |
+
<description>
|
| 38 |
+
If you connect to the repository via SSH for the first time, you have to accept the <b>host key</b> of the repository before proceeding.<br /><br />
|
| 39 |
+
In case your SSH key is protected by a <b>passphrase</b>, you have to enter it in a dialog that opens automatically.
|
| 40 |
+
</description>
|
| 41 |
+
</item>
|
| 42 |
+
<item
|
| 43 |
+
href="/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html#Push_Ref_Specifications"
|
| 44 |
+
title="Push Ref Specifications" dialog="true">
|
| 45 |
+
<description>
|
| 46 |
+
<b>Specify reference mappings</b><br /><br />
|
| 47 |
+
To map your local branch names to the same branch names that are available in the destination repository click "Add all branches spec".<br /><br />
|
| 48 |
+
If you want to declare different mappings, either enter reference names into the "Source ref" and "Destination ref" fields or select an existing entry from the drop-down lists. Afterwards click "Add Spec" to transfer the mapping into the "Specifications for push" list.<br /><br />
|
| 49 |
+
A typical mapping is 'HEAD' as source reference and 'refs/heads/master' as destination reference. This means that the current HEAD (which points to the currently checked out branch) is mapped to the destination master branch.<br /><br />
|
| 50 |
+
When pushing to a <b>Gerrit code review</b> system enter 'refs/for/master' as destination reference. This pushes the change to the review queue for the master branch.
|
| 51 |
+
</description>
|
| 52 |
+
</item>
|
| 53 |
+
<item
|
| 54 |
+
href="/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html#Push_Confirmation"
|
| 55 |
+
title="Push Confirmation" dialog="true">
|
| 56 |
+
<description>
|
| 57 |
+
<b>Confirm the push configuration</b><br /><br />
|
| 58 |
+
A preview of all changes pushed to the destination repository is shown. The "Status" column contains '[new branch]' for references that will be newly created in the destination repository. For reference updates, the range of commits will be shown, i.e. the SHA1 of the first and the last commit to be pushed.<br /><br />
|
| 59 |
+
<b>Click Finish.</b>
|
| 60 |
+
</description>
|
| 61 |
+
</item>
|
| 62 |
+
<item title="Push Results" dialog="true">
|
| 63 |
+
<description>
|
| 64 |
+
The results page shows a list similar to the previous page and a confirmation message from the destination repository.<br /><br />
|
| 65 |
+
In case of errors the error message from the destination repository is displayed as well.<br /><br />
|
| 66 |
+
<b>Click Ok to end the wizard.</b>
|
| 67 |
+
</description>
|
| 68 |
+
<onCompletion>You have now successfully pushed to another Git repository.</onCompletion>
|
| 69 |
+
</item>
|
| 70 |
+
</cheatsheet>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/contexts.xml
CHANGED
|
@@ -1,3 +1,29 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version="1.0" encoding="UTF-8"?>
|
| 2 |
+
<!--
|
| 3 |
+
Copyright (C) 2010, 2021 Philipp Thun <philipp.thun@sap.com> and others.
|
| 4 |
+
|
| 5 |
+
All rights reserved. This program and the accompanying materials
|
| 6 |
+
are made available under the terms of the Eclipse Public License 2.0
|
| 7 |
+
which accompanies this distribution, and is available at
|
| 8 |
+
https://www.eclipse.org/legal/epl-2.0/
|
| 9 |
+
|
| 10 |
+
SPDX-License-Identifier: EPL-2.0
|
| 11 |
+
-->
|
| 12 |
+
<?eclipse version="3.4"?>
|
| 13 |
+
<contexts>
|
| 14 |
+
<context id="GitCloneWizard" title="Clone Git Repository">
|
| 15 |
+
<description>To be guided through this wizard start the cheat sheet 'Cloning a Git Repository' below.</description>
|
| 16 |
+
<command
|
| 17 |
+
serialization="org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=org.eclipse.egit.cheatsheets.clone)"
|
| 18 |
+
label="Cloning a Git Repository" />
|
| 19 |
+
</context>
|
| 20 |
+
<context id="PushWizard" title="Push To Another Repository">
|
| 21 |
+
<description>To be guided through this wizard start the cheat sheet 'Pushing to another Git Repository' below.</description>
|
| 22 |
+
<command
|
| 23 |
+
serialization="org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=org.eclipse.egit.cheatsheets.push)"
|
| 24 |
+
label="Pushing to another Git Repository" />
|
| 25 |
+
</context>
|
| 26 |
+
<context id="gpgSigning" title="Configuring GPG">
|
| 27 |
+
<topic href="contexts/GpgConfiguration.html" label="GPG Configuration" />
|
| 28 |
+
</context>
|
| 29 |
+
</contexts>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/contexts/GpgConfiguration.html
CHANGED
|
@@ -1,3 +1,98 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?>
|
| 2 |
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 3 |
+
<!--
|
| 4 |
+
Copyright (C) 2021 Thomas Wolf <thomas.wolf@paranor.ch> and others.
|
| 5 |
+
|
| 6 |
+
All rights reserved. This program and the accompanying materials
|
| 7 |
+
are made available under the terms of the Eclipse Public License 2.0
|
| 8 |
+
which accompanies this distribution, and is available at
|
| 9 |
+
https://www.eclipse.org/legal/epl-2.0/
|
| 10 |
+
|
| 11 |
+
SPDX-License-Identifier: EPL-2.0
|
| 12 |
+
-->
|
| 13 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 14 |
+
<head>
|
| 15 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 16 |
+
<title>Configuring GPG for use with Eclipse</title>
|
| 17 |
+
<link type="text/css" rel="stylesheet" href="../help/book.css"/>
|
| 18 |
+
</head>
|
| 19 |
+
<body>
|
| 20 |
+
<h1>Configuring GPG for use with Eclipse</h1>
|
| 21 |
+
<p>
|
| 22 |
+
For using an external GPG program with Eclipse, GPG must be configured to use a GUI
|
| 23 |
+
pop-up dialog for user interaction, for instance when asking for key passphrases or
|
| 24 |
+
smartcard PINs.
|
| 25 |
+
</p>
|
| 26 |
+
<p>
|
| 27 |
+
Standard installations of GPG such as the distributions available from
|
| 28 |
+
<a href="https://gnupg.org/download/index.html#sec-1-2">GnuPG</a> are normally
|
| 29 |
+
set up correctly out of the box. But in some cases, GPG on a system may be configured
|
| 30 |
+
to ask the user for passphrases and such always via a terminal (a command window).
|
| 31 |
+
In that case, GPG cannot be used by Eclipse.
|
| 32 |
+
</p>
|
| 33 |
+
<h2>Getting a Passphrase Dialog</h2>
|
| 34 |
+
<p>
|
| 35 |
+
In GPG, it is not the <code>gpg</code> program itself that asks for passphrases.
|
| 36 |
+
Instead, GPG uses a "hidden" system program <code>gpg-agent</code> to manage keys,
|
| 37 |
+
and that <code>gpg-agent</code> program in turn uses yet another program called
|
| 38 |
+
<em>pinentry</em> for actually asking the user for input. When <code>gpg</code>
|
| 39 |
+
is invoked to sign something, it starts <code>gpg-agent</code> if that isn't
|
| 40 |
+
running already. Once started, <code>gpg-agent</code> will continue running in
|
| 41 |
+
the background, and will be re-used by future <code>gpg</code> operations.
|
| 42 |
+
</p>
|
| 43 |
+
<p>
|
| 44 |
+
How GPG asks the user for passphrases is thus determined by how the <code>gpg-agent</code>
|
| 45 |
+
is configured. There are several possible reasons why <code>gpg-agent</code> might
|
| 46 |
+
use a terminal input instead of a GUI dialog:
|
| 47 |
+
</p>
|
| 48 |
+
<dl>
|
| 49 |
+
<dt>Environment variable <b><tt>GPG_TTY</tt></b></dt>
|
| 50 |
+
<dd>
|
| 51 |
+
<p>
|
| 52 |
+
The <code>gpg-agent</code> might have been started with environment variable
|
| 53 |
+
<tt><b>GPG_TTY</b></tt> being set. In that case, it may be sufficient to terminate
|
| 54 |
+
("kill") the currently running <code>gpg-agent</code> process. When called from
|
| 55 |
+
Eclipse, <tt><b>GPG_TTY</b></tt> is <em>not</em> set, so if the Eclipse invokes
|
| 56 |
+
GPG the next time, the <code>gpg-agent</code> should start normally and use a GUI
|
| 57 |
+
dialog.
|
| 58 |
+
</p>
|
| 59 |
+
<p>If that works, figure out where in your system <tt>GPG_TTY</tt> is set and do
|
| 60 |
+
<em>not</em> set it to prevent the problem from re-occurring.
|
| 61 |
+
</p>
|
| 62 |
+
</dd>
|
| 63 |
+
<dt>Fixed <em>pinentry</em> configuration</dt>
|
| 64 |
+
<dd>
|
| 65 |
+
<p>
|
| 66 |
+
The <code>gpg-agent</code> may be configured to use a particular <em>pinentry</em>
|
| 67 |
+
program. This configuration is in a file <tt><b>gpg-agent.conf</b></tt> in the user's
|
| 68 |
+
GPG directory, on Unix at <tt><b>~/.gnupg/gpg-agent.conf</b></tt>, on Windows at
|
| 69 |
+
<tt><b>%APP_DATA%/gnupg/gpg-agent.conf</b></tt>. This file may contain a configuration
|
| 70 |
+
for <code>pinentry-program</code>, which may be set to <code>pinentry-tty</code> or
|
| 71 |
+
<code>pinentry-curses</code>. In this case, remove the line or configure a GUI
|
| 72 |
+
pinentry explicitly, and terminate the currently running <code>gpg-agent</code> process
|
| 73 |
+
and optionally restart it. (Otherwise it will be restarted on the next GPG operation
|
| 74 |
+
automatically.)
|
| 75 |
+
</p>
|
| 76 |
+
</dd>
|
| 77 |
+
<dt>Missing GUI <em>pinentry</em> program</dt>
|
| 78 |
+
<dd>
|
| 79 |
+
<p>
|
| 80 |
+
Your system may not have a <em>pinentry</em> for a GUI dialog installed. This should
|
| 81 |
+
rarely happen, and if so, only with third-party packages of GPG. Install the missing
|
| 82 |
+
pinentry programs on your system using the system's package installation tool.
|
| 83 |
+
</p>
|
| 84 |
+
</dd>
|
| 85 |
+
<dt>Custom <em>pinentry</em> script</dt>
|
| 86 |
+
<dd>
|
| 87 |
+
<p>
|
| 88 |
+
For advanced users: some people reconfigure the GPG pinentry via <tt>gpg-agent.conf</tt>
|
| 89 |
+
by setting <code>pinentry-program</code> to a custom script that decides based on the
|
| 90 |
+
value of environment variable <tt><b>PINENTRY_USER_DATA</b></tt> whether to prompt via
|
| 91 |
+
a GUI dialog or via a terminal. If you have such a setup, make sure the script uses a
|
| 92 |
+
GUI dialog pinentry when the variable is not set. When called via Eclipse,
|
| 93 |
+
<tt><b>PINENTRY_USER_DATA</b></tt> is <em>not</em> set.
|
| 94 |
+
</p>
|
| 95 |
+
</dd>
|
| 96 |
+
</dl>
|
| 97 |
+
</body>
|
| 98 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Automated-Developer-Setup.html
CHANGED
|
@@ -1,3 +1,124 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Automated Developer Setup</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Automated Developer Setup</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Manual-Developer-Setup.html" title="Manual Developer Setup">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">EGit Contributor Guide</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Manual Developer Setup</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Automated_Developer_Setup">Automated Developer Setup</h1>
|
| 33 |
+
<p>The fastest developer setup for contributing to JGit/EGit is to use the Eclipse Installer and the
|
| 34 |
+
EGit project setup to prepare an Eclipse IDE for JGit/EGit:</p>
|
| 35 |
+
<ul>
|
| 36 |
+
<li>download and unpack the
|
| 37 |
+
<a href="https://www.eclipse.org/downloads/eclipse-packages/" target="egit_external">Eclipse Installer</a>
|
| 38 |
+
</li>
|
| 39 |
+
<li>start the Eclipse Installer</li>
|
| 40 |
+
<li>select the advanced mode</li>
|
| 41 |
+
</ul>
|
| 42 |
+
<p>
|
| 43 |
+
<img border="0" src="images/Oomph-01-advanced-mode.png"/>
|
| 44 |
+
</p>
|
| 45 |
+
<ul>
|
| 46 |
+
<li>if the right most icon in the bottom toolbar of the installer rotates, there is an update available for the installer, which should be installed before continuing</li>
|
| 47 |
+
<li>if you are behind a proxy, change the proxy settings from the toolbar at the bottom</li>
|
| 48 |
+
</ul>
|
| 49 |
+
<p>
|
| 50 |
+
<img border="0" src="images/Oomph_-01a-proxy-settings.png"/>
|
| 51 |
+
</p>
|
| 52 |
+
<ul>
|
| 53 |
+
<li>on the product page select "Eclipse IDE for Eclipse Committers" and click "Next"</li>
|
| 54 |
+
</ul>
|
| 55 |
+
<p>
|
| 56 |
+
<img border="0" src="images/Oomph-02-proxy-product-selection.png"/>
|
| 57 |
+
</p>
|
| 58 |
+
<ul>
|
| 59 |
+
<li>on the project page select project "EGit" and click "Next"</li>
|
| 60 |
+
</ul>
|
| 61 |
+
<p>
|
| 62 |
+
<img border="0" src="images/Oomph-03-project-egit.png"/>
|
| 63 |
+
</p>
|
| 64 |
+
<ul>
|
| 65 |
+
<li>on Variables page accept default target platform, to fine tune variables click "Show all variables", click "Next"</li>
|
| 66 |
+
<li>on the Confirmation page click "Finish"</li>
|
| 67 |
+
</ul>
|
| 68 |
+
<p>
|
| 69 |
+
<img border="0" src="images/Oomph-04-installer-progress.png"/>
|
| 70 |
+
</p>
|
| 71 |
+
<ul>
|
| 72 |
+
<li>the installer installs the chosen IDE and starts it, as soon as the installer says "Press Finish to close the dialog" you can close the installer window</li>
|
| 73 |
+
<li>the newly installed IDE will automatically clone the JGit and EGit repositories and configure the workbench for JGit/EGit development. You can observe the setup progress in the toolbar, if necessary you can reopen the setup wizard by clicking its icon in the status bar</li>
|
| 74 |
+
</ul>
|
| 75 |
+
<p>
|
| 76 |
+
<img border="0" src="images/Oomph-05-eclipse-progress.png"/>
|
| 77 |
+
</p>
|
| 78 |
+
<ul>
|
| 79 |
+
<li>when the setup finished the IDE should looks similar to this</li>
|
| 80 |
+
</ul>
|
| 81 |
+
<p>
|
| 82 |
+
<img border="0" src="images/Oomph-06-ide.png"/>
|
| 83 |
+
</p>
|
| 84 |
+
<p>If you want to improve the EGit project setup, check the setup file in tools\oomph\EGit.setup (in your newly cloned egit repository). You can find more information about Oomph at</p>
|
| 85 |
+
<ul>
|
| 86 |
+
<li>
|
| 87 |
+
<a href="https://help.eclipse.org/" target="egit_external">https://help.eclipse.org/</a>
|
| 88 |
+
</li>
|
| 89 |
+
<li>
|
| 90 |
+
<a href="https://projects.eclipse.org/projects/tools.oomph" target="egit_external">https://projects.eclipse.org/projects/tools.oomph</a>
|
| 91 |
+
</li>
|
| 92 |
+
<li>
|
| 93 |
+
<a href="https://wiki.eclipse.org/Eclipse_Installer" target="egit_external">https://wiki.eclipse.org/Eclipse_Installer</a>
|
| 94 |
+
</li>
|
| 95 |
+
<li>
|
| 96 |
+
<a href="https://wiki.eclipse.org/Eclipse_Oomph_Authoring" target="egit_external">https://wiki.eclipse.org/Eclipse_Oomph_Authoring</a>
|
| 97 |
+
</li>
|
| 98 |
+
</ul><hr class="navigation-separator"/>
|
| 99 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 100 |
+
<tr>
|
| 101 |
+
<td style="width: 20%" align="left">
|
| 102 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 103 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 104 |
+
</a>
|
| 105 |
+
</td>
|
| 106 |
+
<td style="width: 60%" align="center">
|
| 107 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 108 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 109 |
+
</a>
|
| 110 |
+
</td>
|
| 111 |
+
<td style="width: 20%" align="right">
|
| 112 |
+
<a href="Manual-Developer-Setup.html" title="Manual Developer Setup">
|
| 113 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 114 |
+
</a>
|
| 115 |
+
</td>
|
| 116 |
+
</tr>
|
| 117 |
+
<tr>
|
| 118 |
+
<td style="width: 20%" align="left" valign="top">EGit Contributor Guide</td>
|
| 119 |
+
<td style="width: 60%" align="center"></td>
|
| 120 |
+
<td style="width: 20%" align="right" valign="top">Manual Developer Setup</td>
|
| 121 |
+
</tr>
|
| 122 |
+
</table>
|
| 123 |
+
</body>
|
| 124 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Bugs.html
CHANGED
|
@@ -1,3 +1,293 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Bugs</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Bugs</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Tests.html" title="Tests">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Website.html" title="Website">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Tests</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Website</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Bugs">Bugs</h1>
|
| 33 |
+
<p>If you are looking for bugs/enhancements to start contributing, they have the keyword "helpwanted" or "bugday":</p>
|
| 34 |
+
<p>
|
| 35 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?keywords=helpwanted%2C%20bugday%2C%20&keywords_type=anywords&list_id=7364111&resolution=---&query_format=advanced&product=EGit" target="egit_external">EGit bugs with helpwanted or bugday</a>
|
| 36 |
+
</p>
|
| 37 |
+
<p>
|
| 38 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?keywords=helpwanted%2C%20bugday%2C%20&keywords_type=anywords&list_id=8951656&product=JGit&query_format=advanced&resolution=---" target="egit_external">JGit bugs with helpwanted or bugday</a>
|
| 39 |
+
</p>
|
| 40 |
+
<h2 id="Links">Links</h2>
|
| 41 |
+
<h3 id="Filing_Bugs">Filing Bugs</h3>
|
| 42 |
+
<h4 id="How_to_file_bugs">How to file bugs</h4>
|
| 43 |
+
<ul>
|
| 44 |
+
<li>
|
| 45 |
+
<a href="https://wiki.eclipse.org/FAQ_How_do_I_report_a_bug_in_Eclipse%3F" title="FAQ_How_do_I_report_a_bug_in_Eclipse%3F" target="egit_external">How do I report a bug in Eclipse?</a>
|
| 46 |
+
</li>
|
| 47 |
+
<li>
|
| 48 |
+
<a href="https://bugs.eclipse.org/bugs/page.cgi?id=bug-writing.html" target="egit_external">Bug Writing Guidelines</a>
|
| 49 |
+
</li>
|
| 50 |
+
<li>
|
| 51 |
+
<a href="https://www.chiark.greenend.org.uk/~sgtatham/bugs.html" target="egit_external">How to Report Bugs Effectively</a> by Simon Tatham
|
| 52 |
+
</li>
|
| 53 |
+
</ul>
|
| 54 |
+
<h4 id="File_a_bug">File a bug</h4>
|
| 55 |
+
<ul>
|
| 56 |
+
<li>
|
| 57 |
+
<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit&rep_platform=All&op_sys=All" target="egit_external">File a bug for EGit</a>
|
| 58 |
+
</li>
|
| 59 |
+
<li>
|
| 60 |
+
<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit&rep_platform=All&op_sys=All" target="egit_external">File a bug for JGit</a>
|
| 61 |
+
</li>
|
| 62 |
+
</ul>
|
| 63 |
+
<h4 id="File_a_bug_for_a_vulnerability">File a bug for a vulnerability</h4>
|
| 64 |
+
<p>If you discovered a vulnerability you want to report </p>
|
| 65 |
+
<ul>
|
| 66 |
+
<li>create a bug in Bugzilla here
|
| 67 |
+
<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit" target="egit_external">https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit</a>
|
| 68 |
+
</li>
|
| 69 |
+
<li>click "Show Advanced Fields" </li>
|
| 70 |
+
<li>and check the option "Committer-only group for handling security advisories in a closed fashion."</li>
|
| 71 |
+
<li>describe the vulnerability</li>
|
| 72 |
+
</ul>
|
| 73 |
+
<p>this will ensure that the discussion on the vulnerability is kept private between the reporter and the committer group
|
| 74 |
+
until the project prepared a release fixing the vulnerability</p>
|
| 75 |
+
<h3 id="Bug_Reports_and_Links">Bug Reports and Links</h3>
|
| 76 |
+
<table border="1" cellpadding="3" cellspacing="0">
|
| 77 |
+
<tr>
|
| 78 |
+
<th>Trends (bugs and enhancements)</th>
|
| 79 |
+
<th>EGit </th>
|
| 80 |
+
<th>JGit</th>
|
| 81 |
+
</tr>
|
| 82 |
+
<tr>
|
| 83 |
+
<td>Open by component (date range editable)</td>
|
| 84 |
+
<td>
|
| 85 |
+
<a href="https://bugs.eclipse.org/bugs/chart.cgi?category=EGit&datefrom=2011-01-01&dateto=&gt=1&label0=EGit%20Core%20Open&label1=EGit%20UI%20Open&labelgt=Grand%20Total&line0=1480&line1=1478&name=1478&subcategory=UI&action=wrap&width=1000&height=500" target="egit_external">Open</a>
|
| 86 |
+
</td>
|
| 87 |
+
<td>
|
| 88 |
+
<a href="https://bugs.eclipse.org/bugs/chart.cgi?category=JGit&datefrom=2011-01-01&dateto=&label0=JGit%20Open&line0=1592&name=1592&subcategory=JGit&action=wrap&width=1000&height=500" target="egit_external">Open</a>
|
| 89 |
+
</td>
|
| 90 |
+
</tr>
|
| 91 |
+
<tr>
|
| 92 |
+
<td>Open by status </td>
|
| 93 |
+
<td>
|
| 94 |
+
<a href="https://bugs.eclipse.org/bugs/reports.cgi?product=EGit&datasets=NEW&datasets=REOPENED&datasets=UNCONFIRMED&datasets=ASSIGNED" target="egit_external">Open</a>
|
| 95 |
+
</td>
|
| 96 |
+
<td>
|
| 97 |
+
<a href="https://bugs.eclipse.org/bugs/reports.cgi?product=JGit&datasets=NEW&datasets=REOPENED&datasets=UNCONFIRMED&datasets=ASSIGNED" target="egit_external">Open</a>
|
| 98 |
+
</td>
|
| 99 |
+
</tr>
|
| 100 |
+
<tr>
|
| 101 |
+
<td>Assigned </td>
|
| 102 |
+
<td>
|
| 103 |
+
<a href="https://bugs.eclipse.org/bugs/reports.cgi?product=EGit&datasets=ASSIGNED" target="egit_external">Assigned</a>
|
| 104 |
+
</td>
|
| 105 |
+
<td>
|
| 106 |
+
<a href="https://bugs.eclipse.org/bugs/reports.cgi?product=JGit&datasets=ASSIGNED" target="egit_external">Assigned</a>
|
| 107 |
+
</td>
|
| 108 |
+
</tr>
|
| 109 |
+
<tr>
|
| 110 |
+
<td>Open and closed by status </td>
|
| 111 |
+
<td>
|
| 112 |
+
<a href="https://bugs.eclipse.org/bugs/reports.cgi?product=EGit&datasets=NEW&datasets=REOPENED&datasets=UNCONFIRMED&datasets=VERIFIED&datasets=CLOSED&datasets=RESOLVED" target="egit_external">All</a>
|
| 113 |
+
</td>
|
| 114 |
+
<td>
|
| 115 |
+
<a href="https://bugs.eclipse.org/bugs/reports.cgi?product=JGit&datasets=NEW&datasets=REOPENED&datasets=UNCONFIRMED&datasets=VERIFIED&datasets=CLOSED&datasets=RESOLVED" target="egit_external">All</a>
|
| 116 |
+
</td>
|
| 117 |
+
</tr>
|
| 118 |
+
<tr>
|
| 119 |
+
<th>Lists</th>
|
| 120 |
+
<th>EGit</th>
|
| 121 |
+
<th>JGit</th>
|
| 122 |
+
</tr>
|
| 123 |
+
<tr>
|
| 124 |
+
<td><span style="color:red">Unresolved for passed target milestones</span> </td>
|
| 125 |
+
<td>
|
| 126 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?f1=OP&list_id=7727637&f0=OP&classification=Technology&f4=CP&query_format=advanced&j1=OR&f3=CP&f2=everconfirmed&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=EGit&target_milestone=0.10.0&target_milestone=0.10.0-M1&target_milestone=0.10.0-M2&target_milestone=0.10.0-M3&target_milestone=0.11&target_milestone=0.11-M1&target_milestone=0.11-M2&target_milestone=0.12&target_milestone=0.12-M1&target_milestone=0.12-M2&target_milestone=0.6.0-M1&target_milestone=0.6.0-M2&target_milestone=0.6.0-M3&target_milestone=0.7.0&target_milestone=0.8.0&target_milestone=0.9.0&target_milestone=0.9.0-M1&target_milestone=0.9.0-M2&target_milestone=0.9.0-M3&target_milestone=1.0.0&target_milestone=1.1&target_milestone=1.1-M1&target_milestone=1.1-M2&target_milestone=1.1-M3&target_milestone=1.2&target_milestone=1.2-M1&target_milestone=1.2-M2&target_milestone=1.3&target_milestone=1.3-M1&target_milestone=2.0&target_milestone=2.0-M1&target_milestone=2.0-M2&target_milestone=2.1&target_milestone=2.1-M1&target_milestone=2.2&target_milestone=2.2-M1&target_milestone=2.2-M2&target_milestone=2.3&target_milestone=2.4&target_milestone=3.0&target_milestone=3.0.1&target_milestone=3.0.2&target_milestone=3.1&target_milestone=3.2" target="egit_external">Open</a>
|
| 127 |
+
</td>
|
| 128 |
+
<td>
|
| 129 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?f1=OP&list_id=7727591&f0=OP&classification=Technology&f4=CP&query_format=advanced&j1=OR&f3=CP&f2=everconfirmed&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=JGit&target_milestone=0.10.0&target_milestone=0.10.0-M1&target_milestone=0.10.0-M2&target_milestone=0.10.0-M3&target_milestone=0.11&target_milestone=0.11-M1&target_milestone=0.11-M2&target_milestone=0.12&target_milestone=0.12-M1&target_milestone=0.12-M2&target_milestone=0.6.0&target_milestone=0.7.0&target_milestone=0.8.0&target_milestone=0.9.0&target_milestone=0.9.0-M1&target_milestone=0.9.0-M2&target_milestone=0.9.0-M3&target_milestone=1.0.0&target_milestone=1.1&target_milestone=1.1-M1&target_milestone=1.1-M2&target_milestone=1.1-M3&target_milestone=1.2&target_milestone=1.2-M1&target_milestone=1.2-M2&target_milestone=1.3&target_milestone=1.3-M1&target_milestone=2.0&target_milestone=2.0-M1&target_milestone=2.0-M2&target_milestone=2.1&target_milestone=2.1-M1&target_milestone=2.2&target_milestone=2.2-M1&target_milestone=2.2-M2&target_milestone=2.3&target_milestone=2.4&target_milestone=3.0&target_milestone=3.0.2&target_milestone=3.1&target_milestone=3.2" target="egit_external">Open</a>
|
| 130 |
+
</td>
|
| 131 |
+
</tr>
|
| 132 |
+
<tr>
|
| 133 |
+
<td>Open bugs</td>
|
| 134 |
+
<td>
|
| 135 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=EGit&bug_status=NEW&bug_status=REOPENED&bug_status=UNCONFIRMED&bug_status=ASSIGNED&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&order=bug_severity" target="egit_external">Open</a>
|
| 136 |
+
</td>
|
| 137 |
+
<td>
|
| 138 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=JGit&bug_status=NEW&bug_status=REOPENED&bug_status=UNCONFIRMED&bug_status=ASSIGNED&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&order=bug_severity" target="egit_external">Open</a>
|
| 139 |
+
</td>
|
| 140 |
+
</tr>
|
| 141 |
+
<tr>
|
| 142 |
+
<td>Open enhancements</td>
|
| 143 |
+
<td>
|
| 144 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=EGit&bug_status=NEW&bug_status=REOPENED&bug_status=UNCONFIRMED&bug_status=ASSIGNED&bug_severity=enhancement&order=bug_severity" target="egit_external">Open</a>
|
| 145 |
+
</td>
|
| 146 |
+
<td>
|
| 147 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=JGit&bug_status=NEW&bug_status=REOPENED&bug_status=UNCONFIRMED&bug_status=ASSIGNED&bug_severity=enhancement&order=bug_severity" target="egit_external">Open</a>
|
| 148 |
+
</td>
|
| 149 |
+
</tr>
|
| 150 |
+
<tr>
|
| 151 |
+
<td>Bugs with votes</td>
|
| 152 |
+
<td>
|
| 153 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?f1=votes&list_id=2849777&columnlist=votes%2Cproduct%2Ccomponent%2Cassigned_to%2Cbug_status%2Cresolution%2Cshort_desc%2Cchangeddate&o1=greaterthan&resolution=---&v1=1&classification=Technology&query_format=advanced&product=EGit" target="egit_external">With Votes</a>
|
| 154 |
+
</td>
|
| 155 |
+
<td>
|
| 156 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?f1=votes&list_id=2849777&columnlist=votes%2Cproduct%2Ccomponent%2Cassigned_to%2Cbug_status%2Cresolution%2Cshort_desc%2Cchangeddate&o1=greaterthan&resolution=---&v1=1&classification=Technology&query_format=advanced&product=JGit" target="egit_external">With Votes</a>
|
| 157 |
+
</td>
|
| 158 |
+
</tr>
|
| 159 |
+
<tr>
|
| 160 |
+
<td>Assigned bugs and enhancements </td>
|
| 161 |
+
<td>
|
| 162 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=EGit&bug_status=ASSIGNED&order=bug_severity" target="egit_external">Assigned</a>
|
| 163 |
+
</td>
|
| 164 |
+
<td>
|
| 165 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?product=JGit&bug_status=ASSIGNED&order=bug_severity" target="egit_external">Assigned</a>
|
| 166 |
+
</td>
|
| 167 |
+
</tr>
|
| 168 |
+
<tr>
|
| 169 |
+
<th>Reports</th>
|
| 170 |
+
<th>EGit and JGit</th>
|
| 171 |
+
</tr>
|
| 172 |
+
<tr>
|
| 173 |
+
<td>Open EGit and JGit bugs</td>
|
| 174 |
+
<td>
|
| 175 |
+
<a href="https://bugs.eclipse.org/bugs/report.cgi?y_axis_field=bug_status&cumulate=1&format=bar&x_axis_field=product&query_format=report-graph&short_desc_type=allwordssubstr&product=EGit&product=JGit&longdesc_type=allwordssubstr&bug_file_loc_type=allwordssubstr&status_whiteboard_type=allwordssubstr&keywords_type=allwords&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=REOPENED&bug_status=ASSIGNED&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&emailtype2=substring&bug_id_type=anyexact&chfieldto=Now&action=wrap&field0-0-0=noop&type0-0-0=noop" target="egit_external">Open</a>
|
| 176 |
+
</td>
|
| 177 |
+
</tr>
|
| 178 |
+
<tr>
|
| 179 |
+
<td>Assigned EGit and JGit bugs</td>
|
| 180 |
+
<td>
|
| 181 |
+
<a href="https://bugs.eclipse.org/bugs/report.cgi?y_axis_field=bug_status&cumulate=1&format=bar&x_axis_field=product&query_format=report-graph&short_desc_type=allwordssubstr&product=EGit&product=JGit&longdesc_type=allwordssubstr&bug_file_loc_type=allwordssubstr&status_whiteboard_type=allwordssubstr&keywords_type=allwords&bug_status=ASSIGNED&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&emailtype2=substring&bug_id_type=anyexact&chfieldto=Now&action=wrap&field0-0-0=noop&type0-0-0=noop" target="egit_external">Assigned</a>
|
| 182 |
+
</td>
|
| 183 |
+
</tr>
|
| 184 |
+
<tr>
|
| 185 |
+
<td>New bugs opened</td>
|
| 186 |
+
<td>
|
| 187 |
+
<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&y_axis_field=product&z_axis_field=&query_format=report-table&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=EGit&product=JGit&longdesc_type=allwordssubstr&longdesc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bug_id_type=anyexact&bug_id=&votes=&chfieldfrom=-1d&chfieldto=Now&chfield=%5BBug+creation%5D&chfieldvalue=&format=table&action=wrap&field0-0-0=noop&type0-0-0=noop&value0-0-0=" target="egit_external">Last day</a>
|
| 188 |
+
</td>
|
| 189 |
+
<td>
|
| 190 |
+
<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&y_axis_field=product&z_axis_field=&query_format=report-table&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=EGit&product=JGit&longdesc_type=allwordssubstr&longdesc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bug_id_type=anyexact&bug_id=&votes=&chfieldfrom=-1w&chfieldto=Now&chfield=%5BBug+creation%5D&chfieldvalue=&format=table&action=wrap&field0-0-0=noop&type0-0-0=noop&value0-0-0=" target="egit_external">Last week</a>
|
| 191 |
+
</td>
|
| 192 |
+
<td>
|
| 193 |
+
<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&y_axis_field=product&z_axis_field=&query_format=report-table&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=EGit&product=JGit&longdesc_type=allwordssubstr&longdesc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bug_id_type=anyexact&bug_id=&votes=&chfieldfrom=-1m&chfieldto=Now&chfield=%5BBug+creation%5D&chfieldvalue=&format=table&action=wrap&field0-0-0=noop&type0-0-0=noop&value0-0-0=" target="egit_external">Last month</a>
|
| 194 |
+
</td>
|
| 195 |
+
<td>
|
| 196 |
+
<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&y_axis_field=product&z_axis_field=&query_format=report-table&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=EGit&product=JGit&longdesc_type=allwordssubstr&longdesc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bug_id_type=anyexact&bug_id=&votes=&chfieldfrom=-1y&chfieldto=Now&chfield=%5BBug+creation%5D&chfieldvalue=&format=table&action=wrap&field0-0-0=noop&type0-0-0=noop&value0-0-0=" target="egit_external">Last year</a>
|
| 197 |
+
</td>
|
| 198 |
+
</tr>
|
| 199 |
+
<tr>
|
| 200 |
+
<td>Bugs closed</td>
|
| 201 |
+
<td>
|
| 202 |
+
<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&y_axis_field=product&z_axis_field=&query_format=report-table&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=EGit&product=JGit&longdesc_type=allwordssubstr&longdesc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bug_id_type=anyexact&bug_id=&votes=&chfieldfrom=-1d&chfieldto=Now&chfield=bug_status&chfieldvalue=&format=table&action=wrap&field0-0-0=noop&type0-0-0=noop&value0-0-0=" target="egit_external">Last day</a>
|
| 203 |
+
</td>
|
| 204 |
+
<td>
|
| 205 |
+
<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&y_axis_field=product&z_axis_field=&query_format=report-table&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=EGit&product=JGit&longdesc_type=allwordssubstr&longdesc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bug_id_type=anyexact&bug_id=&votes=&chfieldfrom=-1w&chfieldto=Now&chfield=bug_status&chfieldvalue=&format=table&action=wrap&field0-0-0=noop&type0-0-0=noop&value0-0-0=" target="egit_external">Last week</a>
|
| 206 |
+
</td>
|
| 207 |
+
<td>
|
| 208 |
+
<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&y_axis_field=product&z_axis_field=&query_format=report-table&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=EGit&product=JGit&longdesc_type=allwordssubstr&longdesc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bug_id_type=anyexact&bug_id=&votes=&chfieldfrom=-1m&chfieldto=Now&chfield=bug_status&chfieldvalue=&format=table&action=wrap&field0-0-0=noop&type0-0-0=noop&value0-0-0=" target="egit_external">Last month</a>
|
| 209 |
+
</td>
|
| 210 |
+
<td>
|
| 211 |
+
<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_status&y_axis_field=product&z_axis_field=&query_format=report-table&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=EGit&product=JGit&longdesc_type=allwordssubstr&longdesc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial&emailtype1=substring&email1=&emailtype2=substring&email2=&bug_id_type=anyexact&bug_id=&votes=&chfieldfrom=-1y&chfieldto=Now&chfield=bug_status&chfieldvalue=&format=table&action=wrap&field0-0-0=noop&type0-0-0=noop&value0-0-0=" target="egit_external">Last year</a>
|
| 212 |
+
</td>
|
| 213 |
+
</tr>
|
| 214 |
+
</table>
|
| 215 |
+
<p>
|
| 216 |
+
<br/>
|
| 217 |
+
</p>
|
| 218 |
+
<p>To get notified of bugs, go to your e-mail preferences and add <product>.<component>-inbox@eclipse.org to your watch list. For example to get notified of EGit UI bugs, add
|
| 219 |
+
<i>egit.ui-inbox@eclipse.org</i>.
|
| 220 |
+
</p>
|
| 221 |
+
<h2 id="Keywords">Keywords</h2>
|
| 222 |
+
<p>To simplify bug management we started to tag EGit bugs with additional pseudo keywords (not normal Bugzilla keywords). The tags are prepended to the bug's summary field. Since we use these tags for internal bug management reporters of a bug should not add any pseudo keywords when filing the bug. The owner of the component bucket is responsible to add the keywords.</p>
|
| 223 |
+
<p>Keywords are used to group bugs without assigning them to a developer. So with the introduction of the keywords it is easy to search for all bugs belonging to a specific sub component. For example to get an overview of all open refactoring issues search for new, assigned or reopened bugs containing the word [refactoring] in the summary field.</p>
|
| 224 |
+
<p>Be aware that not all bugs are tagged with keywords, only bugs that belong to a certain sub group may have a tag attached. The following lists some of the currently used tags.</p>
|
| 225 |
+
<table border="1" cellpadding="3" cellspacing="0">
|
| 226 |
+
<tr>
|
| 227 |
+
<th>Tag</th>
|
| 228 |
+
<th>Description</th>
|
| 229 |
+
<th>Link</th>
|
| 230 |
+
</tr>
|
| 231 |
+
<tr>
|
| 232 |
+
<td>[sync]</td>
|
| 233 |
+
<td>everything related to Synchronize / Synchronize View</td>
|
| 234 |
+
<td>
|
| 235 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?short_desc=%5Bsync%5D;query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;short_desc_type=allwordssubstr;product=EGit" target="egit_external">View bugs</a>
|
| 236 |
+
</td>
|
| 237 |
+
</tr>
|
| 238 |
+
<tr>
|
| 239 |
+
<td>[repoView]</td>
|
| 240 |
+
<td>everything related to the Git Repository View</td>
|
| 241 |
+
<td>
|
| 242 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?short_desc=%5BrepoView%5D;query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;short_desc_type=allwordssubstr;product=EGit" target="egit_external">View bugs</a>
|
| 243 |
+
</td>
|
| 244 |
+
</tr>
|
| 245 |
+
<tr>
|
| 246 |
+
<td>[releng]</td>
|
| 247 |
+
<td>everything related to release engineering and build</td>
|
| 248 |
+
<td>
|
| 249 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?short_desc=%5Breleng%5D;query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;short_desc_type=allwordssubstr;product=EGit" target="egit_external">View bugs</a>
|
| 250 |
+
</td>
|
| 251 |
+
</tr>
|
| 252 |
+
<tr>
|
| 253 |
+
<td>[historyView]</td>
|
| 254 |
+
<td>everything related to the Git History View</td>
|
| 255 |
+
<td>
|
| 256 |
+
<a href="https://bugs.eclipse.org/bugs/buglist.cgi?short_desc=%5BhistoryView%5D;query_format=advanced;bug_status=UNCONFIRMED;bug_status=NEW;bug_status=ASSIGNED;bug_status=REOPENED;short_desc_type=allwordssubstr;product=EGit" target="egit_external">View bugs</a>
|
| 257 |
+
</td>
|
| 258 |
+
</tr>
|
| 259 |
+
</table>
|
| 260 |
+
<p>
|
| 261 |
+
<br/>
|
| 262 |
+
</p>
|
| 263 |
+
<h2 id="Spam_Bugs">Spam Bugs</h2>
|
| 264 |
+
<p>If you come across spam bugs you can request webmaster to delete them by marking them as duplicate of bug 442999.</p>
|
| 265 |
+
<p>Also see
|
| 266 |
+
<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=502814" target="egit_external">bug 502814</a>
|
| 267 |
+
</p><hr class="navigation-separator"/>
|
| 268 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 269 |
+
<tr>
|
| 270 |
+
<td style="width: 20%" align="left">
|
| 271 |
+
<a href="Tests.html" title="Tests">
|
| 272 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 273 |
+
</a>
|
| 274 |
+
</td>
|
| 275 |
+
<td style="width: 60%" align="center">
|
| 276 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 277 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 278 |
+
</a>
|
| 279 |
+
</td>
|
| 280 |
+
<td style="width: 20%" align="right">
|
| 281 |
+
<a href="Website.html" title="Website">
|
| 282 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 283 |
+
</a>
|
| 284 |
+
</td>
|
| 285 |
+
</tr>
|
| 286 |
+
<tr>
|
| 287 |
+
<td style="width: 20%" align="left" valign="top">Tests</td>
|
| 288 |
+
<td style="width: 60%" align="center"></td>
|
| 289 |
+
<td style="width: 20%" align="right" valign="top">Website</td>
|
| 290 |
+
</tr>
|
| 291 |
+
</table>
|
| 292 |
+
</body>
|
| 293 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Builds.html
CHANGED
|
@@ -1,3 +1,442 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Builds</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Builds</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Running-EGit-from-Eclipse.html" title="Running EGit from Eclipse">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Documentation.html" title="Documentation">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Running EGit from Eclipse</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Documentation</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Builds">Builds</h1>
|
| 33 |
+
<p>The central EGit and JGit builds run on the Jenkins build infrastructure provided by the Eclipse foundation.</p>
|
| 34 |
+
<ul>
|
| 35 |
+
<li>
|
| 36 |
+
<a href="https://ci.eclipse.org/egit/" target="egit_external">EGit Jenkins instance</a>
|
| 37 |
+
</li>
|
| 38 |
+
<li>
|
| 39 |
+
<a href="https://ci.eclipse.org/jgit/" target="egit_external">JGit Jenkins instance</a>
|
| 40 |
+
</li>
|
| 41 |
+
</ul>
|
| 42 |
+
<p>Prerequisites for the Maven build are</p>
|
| 43 |
+
<ul>
|
| 44 |
+
<li>since 6.7
|
| 45 |
+
<a href="https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/201773" target="egit_external">(#201773)</a> Java 17, still compiled for Java 11, required by Tycho 4.0 used to build OSGi artefacts
|
| 46 |
+
<ul>
|
| 47 |
+
<li>since 6.0 Java 11</li>
|
| 48 |
+
<li>older versions need Java 8 </li>
|
| 49 |
+
</ul>
|
| 50 |
+
</li>
|
| 51 |
+
<li>
|
| 52 |
+
<a href="https://maven.apache.org/download.html" target="egit_external">at least Maven 3.5.2</a>
|
| 53 |
+
</li>
|
| 54 |
+
<li>see
|
| 55 |
+
<a href="https://maven.apache.org/settings.html" target="egit_external">settings.xml reference</a> on how to do basic Maven configuration
|
| 56 |
+
</li>
|
| 57 |
+
<li>if you want to learn how Maven works start reading
|
| 58 |
+
<a href="https://maven.apache.org/guides/getting-started/index.html" target="egit_external">the Maven Getting Started Guide</a>
|
| 59 |
+
</li>
|
| 60 |
+
</ul>
|
| 61 |
+
<h2 id="JGit_2">JGit</h2>
|
| 62 |
+
<ul>
|
| 63 |
+
<li>JGit can be built using Maven or Bazel</li>
|
| 64 |
+
<li>use Java 17 to run the JGit build, it's compiled for Java 11 but Tycho 4.0 used to build OSGi artefacts requires Java 17</li>
|
| 65 |
+
<li>JGit packaging projects (Eclipse features and p2 repository) are built using Maven and Tycho.</li>
|
| 66 |
+
</ul>
|
| 67 |
+
<h2 id="EGit_2">EGit</h2>
|
| 68 |
+
<ul>
|
| 69 |
+
<li>EGit is built using Maven and Tycho.</li>
|
| 70 |
+
</ul>
|
| 71 |
+
<h2 id="Mailing_Lists">Mailing Lists</h2>
|
| 72 |
+
<p>If you're interested in following builds, please check out the following mailing lists:</p>
|
| 73 |
+
<ul>
|
| 74 |
+
<li>
|
| 75 |
+
<a href="https://dev.eclipse.org/mailman/listinfo/jgit-build" target="egit_external">Subscribe to jgit-build@eclipse.org</a>
|
| 76 |
+
</li>
|
| 77 |
+
<li>
|
| 78 |
+
<a href="https://dev.eclipse.org/mailman/listinfo/egit-build" target="egit_external">Subscribe to egit-build@eclipse.org</a>
|
| 79 |
+
</li>
|
| 80 |
+
</ul>
|
| 81 |
+
<h2 id="Maven_Build">Maven Build</h2>
|
| 82 |
+
<p>To build JGit or EGit versions <= 5.12.0 maven must be run using Java 1.8. Ensure that environment variable <tt>JAVA_HOME</tt> points to a Java 1.8 installation.</p>
|
| 83 |
+
<p>EGit versions >= 5.12.1 and < 6.0.0 can be built with any Java >= 1.8, but the build uses
|
| 84 |
+
<a href="https://maven.apache.org/guides/mini/guide-using-toolchains.html" target="egit_external">maven toolchain</a> definitions. To run a local EGit build for these versions (including the 'master' branch, i.e. EGit nightly), you need to have a local file <tt>
|
| 85 |
+
<b>~/.m2/toolchains.xml</b></tt> providing at least a JDK toolchain definition for "JavaSE-1.8":
|
| 86 |
+
</p>
|
| 87 |
+
<pre style="width: 55em;">
|
| 88 |
+
<?xml version="1.0" encoding="UTF8"?>
|
| 89 |
+
<toolchains>
|
| 90 |
+
<toolchain>
|
| 91 |
+
<type>jdk</type>
|
| 92 |
+
<provides>
|
| 93 |
+
<id>JavaSE-1.8</id>
|
| 94 |
+
<version>1.8</version>
|
| 95 |
+
</provides>
|
| 96 |
+
<configuration>
|
| 97 |
+
<jdkHome>/absolute/path/to/jdk1.8</jdkHome>
|
| 98 |
+
</configuration>
|
| 99 |
+
</toolchain>
|
| 100 |
+
<toolchain>
|
| 101 |
+
<type>jdk</type>
|
| 102 |
+
<provides>
|
| 103 |
+
<id>JavaSE-11</id>
|
| 104 |
+
<version>11</version>
|
| 105 |
+
</provides>
|
| 106 |
+
<configuration>
|
| 107 |
+
<jdkHome>/absolute/path/to/jdk11</jdkHome>
|
| 108 |
+
</configuration>
|
| 109 |
+
</toolchain>
|
| 110 |
+
</toolchains>
|
| 111 |
+
</pre>
|
| 112 |
+
<p>The <tt>jdkHome</tt> directory is the one that contains the <tt>bin</tt> directory in which there is the <tt>java</tt> executable.</p>
|
| 113 |
+
<p>Also include a definition for a Java 11 toolchain as shown above.</p>
|
| 114 |
+
<ul>
|
| 115 |
+
<li>EGit versions >= 6.0.0 require at least Java 11 to build, and require a Java 11 toolchain definition for running the tests.</li>
|
| 116 |
+
<li>EGit versions >= 6.6.0 require at least Java 17 to build, and require a Java 11 toolchain definition for running the tests.</li>
|
| 117 |
+
</ul>
|
| 118 |
+
<ul>
|
| 119 |
+
<li>JGit versions < 6.0.0 with maven require running maven with Java 1.8 in all cases.</li>
|
| 120 |
+
<li>JGit versions >= 6.0.0 with maven require running maven and compiling with at least Java 11.</li>
|
| 121 |
+
<li>JGit versions >= 6.6.0 with maven require running maven with at least Java 17.</li>
|
| 122 |
+
</ul>
|
| 123 |
+
<ul>
|
| 124 |
+
<li>Due to a
|
| 125 |
+
<a href="https://wiki.eclipse.org/Tycho/How_Tos/Dependency_on_pom-first_artifacts" target="egit_external">limitation of Tycho</a> it is not possible to mix pom-first and manifest-first builds in the same reactor build hence the pom-first JGit build has to run separately before the build for the manifest-first JGit packaging project.
|
| 126 |
+
</li>
|
| 127 |
+
<li>The local maven builds must share the same local Maven repository otherwise dependencies between these builds cannot be resolved.</li>
|
| 128 |
+
<li>To run the build behind a firewall follow
|
| 129 |
+
<a href="https://maven.apache.org/guides/mini/guide-proxies.html" target="egit_external">https://maven.apache.org/guides/mini/guide-proxies.html</a>
|
| 130 |
+
</li>
|
| 131 |
+
<li>To run the JGit maven build on a
|
| 132 |
+
<i>case-insensitive</i> file system, you might need to suppress javadoc generation if you get an error "class IO clashes with package of same name". Use "<tt>mvn clean install -Dmaven.javadoc.skip=true</tt>" instead of plain "<tt>mvn clean install</tt>".
|
| 133 |
+
</li>
|
| 134 |
+
</ul>
|
| 135 |
+
<p>Complete build sequence for a clean build (assuming $M2_HOME/bin is on the path and local Maven repository at ~/.m2/repository):</p>
|
| 136 |
+
<pre style="width: 55em;">
|
| 137 |
+
[~/src/jgit] $ mvn clean install
|
| 138 |
+
[INFO] Scanning for projects...
|
| 139 |
+
...
|
| 140 |
+
|
| 141 |
+
[~/src/jgit] $ mvn -f org.eclipse.jgit.packaging/pom.xml clean install
|
| 142 |
+
[INFO] Scanning for projects...
|
| 143 |
+
...
|
| 144 |
+
|
| 145 |
+
[~/src/jgit] $ cd ../egit
|
| 146 |
+
|
| 147 |
+
[~/src/egit] $ mvn clean install
|
| 148 |
+
[INFO] Scanning for projects...
|
| 149 |
+
...
|
| 150 |
+
|
| 151 |
+
[~/src/jgit] $ cd ../egit-github
|
| 152 |
+
|
| 153 |
+
[~/src/egit-github] $ mvn clean install
|
| 154 |
+
[INFO] Scanning for projects...
|
| 155 |
+
...
|
| 156 |
+
</pre>
|
| 157 |
+
<p>The EGit build uses the JGit p2 repository to resolve jgit dependencies. For local builds the build assumes
|
| 158 |
+
that egit and jgit source trees are located under a common parent folder. If this is not the case the path
|
| 159 |
+
to the jgit p2 repository has to be injected via system property:</p>
|
| 160 |
+
<pre>[~/src/egit] $ mvn clean install -Djgit-site=file:/path/to/jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository
|
| 161 |
+
</pre>
|
| 162 |
+
<p>in the same way you can configure a custom path for the build of egit-github to the egit p2 repository</p>
|
| 163 |
+
<pre>[~/src/egit-github] $ mvn clean install -Degit-site=file:/path/to/egit/org.eclipse.egit.repository/target/repository
|
| 164 |
+
</pre>
|
| 165 |
+
<p>The Jenkins build uses (for SNAPSHOT builds):</p>
|
| 166 |
+
<pre>[~/src/egit] $ mvn clean install -Djgit-site=<a href="https://repo.eclipse.org/content/unzip/snapshots.unzip/" target="egit_external">https://repo.eclipse.org/content/unzip/snapshots.unzip/</a>
|
| 167 |
+
org/eclipse/jgit/org.eclipse.jgit.repository/${JGIT_VERSION}/org.eclipse.jgit.repository-${JGIT_VERSION}.zip-unzip/
|
| 168 |
+
</pre>
|
| 169 |
+
<p>If you wan to build EGit for a specific Eclipse platform use the corresponding EGit target platform. For instance, to build for Eclipse 4.19 (2021-03), use the <code>egit-4.19</code> target platform:</p>
|
| 170 |
+
<pre>[~/src/egit] $ mvn -Dtarget-platform=egit-4.19 clean install
|
| 171 |
+
</pre>
|
| 172 |
+
<p>See the contents of bundle <code>org.eclipse.egit.target</code> for the available target platforms.</p>
|
| 173 |
+
<p>Upon a successful build, a p2 update site should be generated inside
|
| 174 |
+
<i>egit/org.eclipse.egit.repository/target/repository</i>. If not, make sure the target platform has been downloaded from within Eclipse (Windows>Preferences>Plug-in Development>Target Platform). The default target platform defined in the maven build is currently Eclipse 4.6 (Neon). If you skip setting the system property <code>target-platform</code> the target platform for Eclipse 4.6 will be used. EGit built with that target platform can run on any Eclipse >= 4.6. If you choose a higher target platform, the EGit produced may not run on Eclipses older than the target platform version.
|
| 175 |
+
</p>
|
| 176 |
+
<h2 id="Dependencies_and_License_Check">Dependencies and License Check</h2>
|
| 177 |
+
<p>We use the
|
| 178 |
+
<a href="https://github.com/eclipse/dash-licenses#example-maven-plugin" target="egit_external">dash-licenses Maven plugin</a> to check the license of 3rd party dependencies. See the
|
| 179 |
+
<a href="https://www.eclipse.org/projects/handbook/#ip-license-tool" target="egit_external">Eclipse projects handbook</a>.
|
| 180 |
+
</p>
|
| 181 |
+
<p>On the master branch with the following changes the maven build is now running the license-check automatically</p>
|
| 182 |
+
<ul>
|
| 183 |
+
<li>
|
| 184 |
+
<a href="https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/196333" target="egit_external">jgit</a>
|
| 185 |
+
</li>
|
| 186 |
+
<li>
|
| 187 |
+
<a href="https://eclipse.gerrithub.io/c/eclipse-egit/egit/+/196335" target="egit_external">egit</a>
|
| 188 |
+
</li>
|
| 189 |
+
</ul>
|
| 190 |
+
<p>A summary of the check results is written to the
|
| 191 |
+
<i>target/dash/summary</i> file. Dependencies which need to be vetted are marked as
|
| 192 |
+
<i>restricted</i> in this file.
|
| 193 |
+
</p>
|
| 194 |
+
<p>It will fail the build if any dependency needs to be vetted:</p>
|
| 195 |
+
<pre>
|
| 196 |
+
13:35:57 11:35:57 [INFO] --- license-tool-plugin:0.0.1-SNAPSHOT:license-check (license-check) @ egit-parent ---
|
| 197 |
+
13:36:10 11:36:09 [INFO] Querying Eclipse Foundation for license data for 299 items.
|
| 198 |
+
13:36:10 11:36:10 [INFO] Found 246 items.
|
| 199 |
+
13:36:10 11:36:10 [INFO] License information could not be automatically verified for the following content:
|
| 200 |
+
13:36:10 11:36:10 [INFO]
|
| 201 |
+
13:36:10 11:36:10 [INFO] p2/orbit/p2.eclipse.feature/org.eclipse.emf.ecore/2.23.0.v20200630-0516
|
| 202 |
+
13:36:10 11:36:10 [INFO]
|
| 203 |
+
13:36:10 11:36:10 [INFO] This content is either not correctly mapped by the system, or requires review.
|
| 204 |
+
13:36:10 11:36:10 [INFO] Summary file was written to: /home/jenkins/agent/workspace/egit.gerrit/repo/target/dash/summary
|
| 205 |
+
13:36:10 11:36:10 [ERROR] Dependency license check failed. Some dependencies need to be vetted.
|
| 206 |
+
</pre>
|
| 207 |
+
<p>If that happens run the build again locally and provide a
|
| 208 |
+
<a href="https://gitlab.eclipse.org/-/profile/personal_access_tokens" target="egit_external">gitlab token with scope "api"</a> to automatically create review requests for the IP team:
|
| 209 |
+
</p>
|
| 210 |
+
<pre>
|
| 211 |
+
mvn clean install -Ddash.iplab.token="<gitlab token>"
|
| 212 |
+
</pre>
|
| 213 |
+
<p>Then wait until these requests have been approved.</p>
|
| 214 |
+
<p>You can set the option
|
| 215 |
+
<i>dash.skip</i> to skip the license check:
|
| 216 |
+
</p>
|
| 217 |
+
<pre>
|
| 218 |
+
mvn clean install -Ddash.skip
|
| 219 |
+
</pre>
|
| 220 |
+
<h2 id="JGit_Bazel_Build">JGit Bazel Build</h2>
|
| 221 |
+
<p>Since Gerrit is built using
|
| 222 |
+
<a href="https://www.bazel.io/" target="egit_external">Bazel</a> a Bazel build was also implemented for JGit.
|
| 223 |
+
This simplifies working on Gerrit features which also require changes in JGit.
|
| 224 |
+
</p>
|
| 225 |
+
<ul>
|
| 226 |
+
<li>
|
| 227 |
+
<a href="https://www.bazel.io/versions/master/docs/install.html" target="egit_external">Install Bazel</a>
|
| 228 |
+
</li>
|
| 229 |
+
<li>To build all libraries run</li>
|
| 230 |
+
</ul>
|
| 231 |
+
<pre>bazel build :all
|
| 232 |
+
</pre>
|
| 233 |
+
<ul>
|
| 234 |
+
<li>The following test labels are supported: api, attributes, dfs, diff, http, lfs, lfs-server, nls, notes, pack, patch, pgm, reftree, revplot, revwalk, storage, submodule, symlinks, transport, treewalk, util</li>
|
| 235 |
+
<li>To run all tests execute</li>
|
| 236 |
+
</ul>
|
| 237 |
+
<pre>bazel test //...
|
| 238 |
+
</pre>
|
| 239 |
+
<ul>
|
| 240 |
+
<li>To run specific tests, using labels:</li>
|
| 241 |
+
</ul>
|
| 242 |
+
<pre>bazel test --test_tag_filters=api,dfs,revplot,treewalk //...
|
| 243 |
+
</pre>
|
| 244 |
+
<ul>
|
| 245 |
+
<li>to rerun all tests ignoring cached test results execute</li>
|
| 246 |
+
</ul>
|
| 247 |
+
<pre>bazel test //... --cache_test_results=NO
|
| 248 |
+
</pre>
|
| 249 |
+
<ul>
|
| 250 |
+
<li>to set number of concurrent test runs</li>
|
| 251 |
+
</ul>
|
| 252 |
+
<pre>bazel test //... --jobs=4
|
| 253 |
+
</pre>
|
| 254 |
+
<ul>
|
| 255 |
+
<li>to debug a test run</li>
|
| 256 |
+
</ul>
|
| 257 |
+
<pre>bazel test --test_output=streamed --test_filter=<fully qualified test method> <test target>
|
| 258 |
+
</pre>
|
| 259 |
+
<p>e.g.</p>
|
| 260 |
+
<pre>bazel test --test_output=streamed --test_filter=org.eclipse.jgit.api.GitConstructionTest.testClose //org.eclipse.jgit.test:org_eclipse_jgit_api_GitConstructionTest
|
| 261 |
+
</pre>
|
| 262 |
+
<ul>
|
| 263 |
+
<li>to configure loggers for test runs edit org.eclipse.jgit.test/tst-rsrc/simplelogger.properties, see the
|
| 264 |
+
<a href="https://www.slf4j.org/api/org/slf4j/impl/SimpleLogger.html" target="egit_external">slf4j SimpleLogger documentation</a>
|
| 265 |
+
</li>
|
| 266 |
+
<li>to run tests repeatedly use</li>
|
| 267 |
+
</ul>
|
| 268 |
+
<pre>bazel test --runs_per_test=3 <test target>
|
| 269 |
+
</pre>
|
| 270 |
+
<ul>
|
| 271 |
+
<li>since 5.4.0 builds run with
|
| 272 |
+
<a href="https://github.com/google/error-prone" target="egit_external">the errorprone static analyzer</a> by default. If you want to enable it for older JGit versions execute
|
| 273 |
+
</li>
|
| 274 |
+
</ul>
|
| 275 |
+
<pre>bazel build --java_toolchain //tools:error_prone_warnings_toolchain :all
|
| 276 |
+
</pre>
|
| 277 |
+
<p>Note that the Bazel build does not yet support building JGit OSGi bundles, Eclipse features and the p2 repository which are required to install JGit in Eclipse.</p>
|
| 278 |
+
<h2 id="Updating_build_version">Updating build version</h2>
|
| 279 |
+
<p>use the tools/version.sh script to update the build version in all build files, e.g.</p>
|
| 280 |
+
<pre style="width: 55em;">
|
| 281 |
+
./tools/version.sh --snapshot=6.2.0-SNAPSHOT
|
| 282 |
+
</pre>
|
| 283 |
+
<h2 id="FindBugs_and_PMD">FindBugs and PMD</h2>
|
| 284 |
+
<p>As part of the build, JGit and EGit run FindBugs and PMD to find issues.</p>
|
| 285 |
+
<ul>
|
| 286 |
+
<li>
|
| 287 |
+
<a href="https://ci.eclipse.org/jgit/job/jgit/findbugs" target="egit_external">JGit FindBugs Results</a>
|
| 288 |
+
</li>
|
| 289 |
+
<li>
|
| 290 |
+
<a href="https://ci.eclipse.org/jgit/job/jgit/dry" target="egit_external">JGit DRY (PMD) Results</a>
|
| 291 |
+
</li>
|
| 292 |
+
<li>
|
| 293 |
+
<a href="https://ci.eclipse.org/egit/job/egit/findbugs" target="egit_external">EGit FindBugs Results</a>
|
| 294 |
+
</li>
|
| 295 |
+
<li>
|
| 296 |
+
<a href="https://ci.eclipse.org/egit/job/egit/dry" target="egit_external">EGit DRY (PMD) Results</a>
|
| 297 |
+
</li>
|
| 298 |
+
</ul>
|
| 299 |
+
<h2 id="Checking_for_JGit_API_Changes_using_API_Baseline">Checking for JGit API Changes using API Baseline</h2>
|
| 300 |
+
<p>The JGit projects have API tooling enabled. In order to use PDE API tools to get assistance with maintaining API changes and additions you need to set an API baseline:</p>
|
| 301 |
+
<ul>
|
| 302 |
+
<li>download the p2 repository for the latest EGit release (which includes the JGit artifacts) to a local folder, e.g. <code>~/egit-releases/updates-4.9.1</code>, find the p2 repository URLs
|
| 303 |
+
<a href="https://wiki.eclipse.org/EGit/FAQ#Where_can_I_find_older_releases_of_EGit.3F" target="egit_external">here</a> and download the p2 repository of the latest minor release (service releases don't change API) using the corresponding link in the last column of that table
|
| 304 |
+
</li>
|
| 305 |
+
<li>in Eclipse click "Preferences > Plug-In Development > API Baselines", click "Add Baseline..." and define a new baseline (e.g. egit-4.9.1) and point it to the local copy of the corresponding EGit p2 repository.</li>
|
| 306 |
+
<li>the API tools will then raise warning/errors for all detected problems and provide quick fixes helping to resolve these problems</li>
|
| 307 |
+
<li>see the
|
| 308 |
+
<a href="https://wiki.eclipse.org/PDE/API_Tools/User_Guide" target="egit_external">PDE API Tools User Guide</a> for more details.
|
| 309 |
+
</li>
|
| 310 |
+
</ul>
|
| 311 |
+
<h2 id="Signing_and_Publishing">Signing and Publishing</h2>
|
| 312 |
+
<p>EGit and JGit builds running on the JGit/EGit Jenkins instances are automatically signed
|
| 313 |
+
(using the
|
| 314 |
+
<a href="https://wiki.eclipse.org/Common_Build_Infrastructure#Signing_tool" title="Common_Build_Infrastructure#Signing_tool" target="egit_external">CBI eclipse-jarsigner-plugin</a>) and published to the folder
|
| 315 |
+
</p>
|
| 316 |
+
<pre>
|
| 317 |
+
master branch: /home/data/httpd/download.eclipse.org/egit/updates-nightly
|
| 318 |
+
latest stable branch: /home/data/httpd/download.eclipse.org/egit/updates-stable-nightly
|
| 319 |
+
</pre>
|
| 320 |
+
<ul>
|
| 321 |
+
<li>To enable signing the maven profile <code>eclipse-sign</code> must be enabled via the option <code>-P eclipse-sign</code> in the respective build jobs running at
|
| 322 |
+
<a href="https://ci.eclipse.org/egit/" target="egit_external">https://ci.eclipse.org/egit/</a>
|
| 323 |
+
</li>
|
| 324 |
+
</ul>
|
| 325 |
+
<h2 id="Creating_a_release">Creating a release</h2>
|
| 326 |
+
<p>Use the tools/release.sh script to create a new release, e.g.</p>
|
| 327 |
+
<pre style="width: 55em;">
|
| 328 |
+
./tools/release.sh v6.1.0.202203080745-r
|
| 329 |
+
</pre>
|
| 330 |
+
<ul>
|
| 331 |
+
<li>release versions have 5 parts <pre>major.minor.patch.buildTimestamp-qualifier</pre>
|
| 332 |
+
<ul>
|
| 333 |
+
<li>Traditionally we use local time in EST timezone for the buildTimestamp part of the version number since our build servers run in that timezone.</li>
|
| 334 |
+
<li>qualifier is <pre>m1,m2, ...</pre> for milestones, <pre>rc1, rc2, ...</pre> for release candidates and <pre>r</pre> for releases</li>
|
| 335 |
+
</ul>
|
| 336 |
+
</li>
|
| 337 |
+
<li>We sign release tags, follow
|
| 338 |
+
<a href="https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work" target="egit_external">Git Tools - Signing Your Work</a> to set this up on your computer before creating the first release.
|
| 339 |
+
</li>
|
| 340 |
+
<li>We create all milestones and releases on a dedicated stable branch to avoid interference with ongoing development on master. E.g. use the stable-6.1 branch for releasing 6.1.0 and subsequent patch releases like 6.1.1.</li>
|
| 341 |
+
<li>push the locally created release commit to eclipse.gerrithub.io for review</li>
|
| 342 |
+
<li>wait for the verification build to succeed and vote +1 on verified</li>
|
| 343 |
+
<li>review and submit the release change, then push the release tag to eclipse.gerrithub.io</li>
|
| 344 |
+
<li>the CI job will build the release version and deploy it to the Eclipse Maven repo at repo.eclipse.org</li>
|
| 345 |
+
</ul>
|
| 346 |
+
<h3 id="Release_Notes">Release Notes</h3>
|
| 347 |
+
<p>We create a release record for each release in the Eclipse project portal and publish release notes there.</p>
|
| 348 |
+
<ul>
|
| 349 |
+
<li>
|
| 350 |
+
<a href="https://projects.eclipse.org/projects/technology.jgit/governance" target="egit_external">JGit releases</a>
|
| 351 |
+
</li>
|
| 352 |
+
<li>
|
| 353 |
+
<a href="https://projects.eclipse.org/projects/technology.egit/governance" target="egit_external">EGit releases</a>
|
| 354 |
+
</li>
|
| 355 |
+
</ul>
|
| 356 |
+
<h3 id="New_and_Noteworthy">New and Noteworthy</h3>
|
| 357 |
+
<p>For major and minor releases (e.g. 6.0.0, 6.3.0) we create a New and Noteworthy page</p>
|
| 358 |
+
<ul>
|
| 359 |
+
<li>
|
| 360 |
+
<a href="https://wiki.eclipse.org/JGit/New_and_Noteworthy" target="egit_external">JGit New and Noteworthy</a>
|
| 361 |
+
</li>
|
| 362 |
+
<li>
|
| 363 |
+
<a href="https://wiki.eclipse.org/EGit/New_and_Noteworthy" target="egit_external">EGit New and Noteworthy</a>
|
| 364 |
+
</li>
|
| 365 |
+
</ul>
|
| 366 |
+
<h2 id="Contribution_to_Release_Train">Contribution to Release Train</h2>
|
| 367 |
+
<p>We participate in the
|
| 368 |
+
<a href="https://wiki.eclipse.org/Simultaneous_Release" target="egit_external">Eclipse simultaneous release</a> and its
|
| 369 |
+
<a href="https://wiki.eclipse.org/Category:SimRel-2022-09" target="egit_external">schedule</a>.
|
| 370 |
+
</p>
|
| 371 |
+
<p>The release train contribution for JGit and EGit is maintained in the git repository </p>
|
| 372 |
+
<pre>https://github.com/eclipse-simrel/simrel.build.git
|
| 373 |
+
</pre>
|
| 374 |
+
<p>in the files</p>
|
| 375 |
+
<pre>
|
| 376 |
+
simrel.aggr
|
| 377 |
+
egit.aggrcon
|
| 378 |
+
</pre>
|
| 379 |
+
<p>Checkout the master branch and update the versions of jgit and egit to be contributed and the URL of the new version.</p>
|
| 380 |
+
<p>Milestones (version ends with -m1, -m2, -m3) and release candidates (version ends with -rc1) are deployed on the download server to egit/staging/<tag name>, the final release (version ends with -r) goes to egit/updates-<major version>.<minor version>[.<micro version>]. The releases on the download server can be browsed
|
| 381 |
+
<a href="https://download.eclipse.org/justj/?file=egit" target="egit_external">here</a>. Old releases are moved to the
|
| 382 |
+
<a href="https://archive.eclipse.org/justj/?file=egit" target="egit_external">archive server</a>. Committers can trigger archiving
|
| 383 |
+
<a href="https://download.eclipse.org/egit/" target="egit_external">on this page</a>.
|
| 384 |
+
</p>
|
| 385 |
+
<p>All these builds are deployed to the corresponding release repositories on nexus.
|
| 386 |
+
Maven artefacts:</p>
|
| 387 |
+
<ul>
|
| 388 |
+
<li>
|
| 389 |
+
<a href="https://repo.eclipse.org/content/groups/releases/org/eclipse/jgit/" target="egit_external">jgit maven artefacts</a>
|
| 390 |
+
</li>
|
| 391 |
+
<li>
|
| 392 |
+
<a href="https://repo.eclipse.org/content/groups/releases/org/eclipse/egit/" target="egit_external">egit maven artefacts</a>
|
| 393 |
+
</li>
|
| 394 |
+
</ul>
|
| 395 |
+
<p>Corresponding p2 repositories are exposed dynamically using the Nexus Unzip Plugin:</p>
|
| 396 |
+
<ul>
|
| 397 |
+
<li>
|
| 398 |
+
<a href="https://repo.eclipse.org/content/unzip/releases.unzip/org/eclipse/jgit/" target="egit_external">jgit p2 repos</a>
|
| 399 |
+
</li>
|
| 400 |
+
<li>
|
| 401 |
+
<a href="https://repo.eclipse.org/content/unzip/releases.unzip/org/eclipse/egit/" target="egit_external">egit p2 repos</a>
|
| 402 |
+
</li>
|
| 403 |
+
</ul>
|
| 404 |
+
<p>Final releases of jgit are also deployed to Maven central using Sonatype's OSS Nexus using some scripts located in the jgit repository under tools/maven-central.</p>
|
| 405 |
+
<p>Open simrel.aggr using the
|
| 406 |
+
<a href="https://wiki.eclipse.org/CBI/aggregator" target="egit_external">CBI aggregator editor</a> to edit these files.
|
| 407 |
+
This editor knows the structure of these files and can check their validity.
|
| 408 |
+
</p>
|
| 409 |
+
<p>Push the change for review, review and submit it when the verification build job has voted +1 on verified.
|
| 410 |
+
Note that the simultaneous release repository only accepts fast-forward submits. This means if another project's change has been submitted you may have to rebase your change.</p>
|
| 411 |
+
<p>The release train build is coordinated on the
|
| 412 |
+
<a href="https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev" target="egit_external">cross-project-issues-dev mailing list</a>.
|
| 413 |
+
</p>
|
| 414 |
+
<p>
|
| 415 |
+
<br/>
|
| 416 |
+
</p><hr class="navigation-separator"/>
|
| 417 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 418 |
+
<tr>
|
| 419 |
+
<td style="width: 20%" align="left">
|
| 420 |
+
<a href="Running-EGit-from-Eclipse.html" title="Running EGit from Eclipse">
|
| 421 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 422 |
+
</a>
|
| 423 |
+
</td>
|
| 424 |
+
<td style="width: 60%" align="center">
|
| 425 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 426 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 427 |
+
</a>
|
| 428 |
+
</td>
|
| 429 |
+
<td style="width: 20%" align="right">
|
| 430 |
+
<a href="Documentation.html" title="Documentation">
|
| 431 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 432 |
+
</a>
|
| 433 |
+
</td>
|
| 434 |
+
</tr>
|
| 435 |
+
<tr>
|
| 436 |
+
<td style="width: 20%" align="left" valign="top">Running EGit from Eclipse</td>
|
| 437 |
+
<td style="width: 60%" align="center"></td>
|
| 438 |
+
<td style="width: 20%" align="right" valign="top">Documentation</td>
|
| 439 |
+
</tr>
|
| 440 |
+
</table>
|
| 441 |
+
</body>
|
| 442 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Contributing-Patches.html
CHANGED
|
@@ -1,3 +1,603 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Contributing Patches</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Contributing Patches</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Website.html" title="Website">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Gerrit-Code-Review-Cheatsheet.html" title="Gerrit Code Review Cheatsheet">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Website</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Gerrit Code Review Cheatsheet</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Contributing_Patches">Contributing Patches</h1>
|
| 33 |
+
<h2 id="Using_Gerrit">Using Gerrit</h2>
|
| 34 |
+
<p>EGit and JGit projects are using
|
| 35 |
+
<a href="https://www.gerritcodereview.com/" target="egit_external">Gerrit Code Review</a> for Git based patch submission and review.
|
| 36 |
+
</p>
|
| 37 |
+
<p>Both projects accept contributions
|
| 38 |
+
<i>only</i> via Gerrit. Please do not send patches by e-mail. Although both projects are mirrored to Github, EGit and JGit also cannot accept Github pull requests.
|
| 39 |
+
</p>
|
| 40 |
+
<p>
|
| 41 |
+
<b>
|
| 42 |
+
<i>Migration from git.eclipse.org to eclipse.gerrithub.io</i>
|
| 43 |
+
</b>
|
| 44 |
+
</p>
|
| 45 |
+
<p>Since the Eclipse Foundation decided to
|
| 46 |
+
<a href="https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Gerrit/Gerrit-and-Bugzilla-deprecation-and-migration-plan" target="egit_external">deprecate their Gerrit server</a> EGit and JGit
|
| 47 |
+
<a href="https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/3137" target="egit_external">migrated their repositories to GerritHub</a> at
|
| 48 |
+
<a href="https://eclipse.gerrithub.io" target="egit_external">https://eclipse.gerrithub.io</a>. The migration to GerritHub was completed
|
| 49 |
+
<a href="https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/3137#note_1391288" target="egit_external">on Nov 21, 2023</a>.
|
| 50 |
+
</p>
|
| 51 |
+
<p>GerritHub combines Gerrit for code review and GitHub for authentication, issue tracking and browsing repositories.</p>
|
| 52 |
+
<ul>
|
| 53 |
+
<li>Find the Eclipse tenant of GerritHub here:
|
| 54 |
+
<a href="https://eclipse.gerrithub.io" target="egit_external">https://eclipse.gerrithub.io</a>
|
| 55 |
+
</li>
|
| 56 |
+
</ul>
|
| 57 |
+
<h3 id="User_Account">User Account</h3>
|
| 58 |
+
<ul>
|
| 59 |
+
<li>In order to contribute you need an
|
| 60 |
+
<a href="https://dev.eclipse.org/site_login/createaccount.php" target="egit_external">Eclipse user account</a> on eclipse.org
|
| 61 |
+
<ul>
|
| 62 |
+
<li>On creation of a new account you must agree to the Contributor Agreement.</li>
|
| 63 |
+
</ul>
|
| 64 |
+
</li>
|
| 65 |
+
<li>For login to GerritHub and GitHub you need a
|
| 66 |
+
<a href="https://github.com/signup" target="egit_external">GitHub account</a>.
|
| 67 |
+
<ul>
|
| 68 |
+
<li>Associate your GitHub username with your Eclipse Account
|
| 69 |
+
<ul>
|
| 70 |
+
<li>Edit your
|
| 71 |
+
<a href="https://accounts.eclipse.org/" target="egit_external">Eclipse account</a>: login and click "Edit my account"
|
| 72 |
+
</li>
|
| 73 |
+
<li>Set your GitHub username at the bottom of the page "Personal Information".</li>
|
| 74 |
+
</ul>
|
| 75 |
+
</li>
|
| 76 |
+
</ul>
|
| 77 |
+
</li>
|
| 78 |
+
<li>If you are a project committer you will get an invitation to join the project's GitHub organization
|
| 79 |
+
<ul>
|
| 80 |
+
<li>Modifications of Eclipse user accounts are replicated every 2-3 hours to GitHub, i.e. it could take a few hours to get this invitation</li>
|
| 81 |
+
<li>You can check in
|
| 82 |
+
<a href="https://github.com/settings/organizations" target="egit_external">GitHub settings</a> if you are a member of the project's GitHub organization
|
| 83 |
+
</li>
|
| 84 |
+
</ul>
|
| 85 |
+
</li>
|
| 86 |
+
</ul>
|
| 87 |
+
<h3 id="Login_to_GerritHub_and_OAuth_access_to_GitHub">Login to GerritHub and OAuth access to GitHub</h3>
|
| 88 |
+
<p>
|
| 89 |
+
<a href="https://eclipse.gerrithub.io" target="egit_external">GerritHub</a> uses github.com for authentication. Permissions are granted to GitHub teams which are configured by Eclipse Foundation in the GitHub organisations
|
| 90 |
+
<a href="https://github.com/eclipse-jgit" target="egit_external">eclipse-egit</a> and
|
| 91 |
+
<a href="https://github.com/eclipse-jgit" target="egit_external">eclipse-jgit</a>.
|
| 92 |
+
</p>
|
| 93 |
+
<p>For that it needs an GitHub OAuth scope granting read access to GerritHub:</p>
|
| 94 |
+
<p>
|
| 95 |
+
<b>1. Login</b> to
|
| 96 |
+
<a href="https://eclipse.gerrithub.io" target="egit_external">https://eclipse.gerrithub.io</a> by clicking "GitHub Sign-in"
|
| 97 |
+
</p>
|
| 98 |
+
<p>
|
| 99 |
+
<img width="500" border="0" src="images/1-GerritHub-first-login.png"/>
|
| 100 |
+
</p>
|
| 101 |
+
<p>
|
| 102 |
+
<b>2. On the first login GerritHub requests authorization for read access to GitHub</b>.
|
| 103 |
+
</p>
|
| 104 |
+
<p>
|
| 105 |
+
<img width="500" border="0" src="images/2-Gerrithub-Github-request-access-to-eclipse-org.png"/>
|
| 106 |
+
</p>
|
| 107 |
+
<ul>
|
| 108 |
+
<li>
|
| 109 |
+
<i>Reviewer:</i> Review other people's changes using only your e-mail identity
|
| 110 |
+
</li>
|
| 111 |
+
<li>
|
| 112 |
+
<i>Contributor:</i> Contribute and upload changes to JGit/EGit
|
| 113 |
+
</li>
|
| 114 |
+
<li>
|
| 115 |
+
<i>ProjectCommitter:</i> Contribute to JGit/EGit as a committer
|
| 116 |
+
</li>
|
| 117 |
+
<li>
|
| 118 |
+
<i>EclipseStaff:</i> Administrate Eclipse Foundation Projects, import new projects from GitHub to GerritHub
|
| 119 |
+
</li>
|
| 120 |
+
</ul>
|
| 121 |
+
<p>
|
| 122 |
+
<br/>
|
| 123 |
+
|
| 124 |
+
<b>If you are an EGit/JGit committer or Eclipse Foundation administrator</b>
|
| 125 |
+
</p>
|
| 126 |
+
<ul>
|
| 127 |
+
<li>Request "organisation access" for the GitHub organisation eclipse-egit / eclipse-jgit. </li>
|
| 128 |
+
<li>This request needs to be approved by an Eclipse Foundation administrator.</li>
|
| 129 |
+
<li>It grants GerritHub read access to your membership in GitHub teams of the organisation used to check your committer / administrator status.</li>
|
| 130 |
+
</ul>
|
| 131 |
+
<p>
|
| 132 |
+
<br/>
|
| 133 |
+
|
| 134 |
+
<b>All users need to click "Authorize gerritforge-ltd"</b> which want to
|
| 135 |
+
</p>
|
| 136 |
+
<ul>
|
| 137 |
+
<li>participate in code review (contributors, committers)</li>
|
| 138 |
+
<li>contribute changes (contributors, committers)</li>
|
| 139 |
+
<li>administrate projects in eclipse.gerrithub.io (administrators)</li>
|
| 140 |
+
</ul>
|
| 141 |
+
<p>The initial scope selection done at login is stored as a cookie.</p>
|
| 142 |
+
<p>You are redirected to
|
| 143 |
+
<a href="https://eclipse.gerrithub.io" target="egit_external">https://eclipse.gerrithub.io</a>
|
| 144 |
+
</p>
|
| 145 |
+
<p>
|
| 146 |
+
<img width="500" border="0" src="images/3-Redirect-to-Gerrithub.png"/>
|
| 147 |
+
</p>
|
| 148 |
+
<p>If you are a committer or administrator you can check if access to github organisations was granted:</p>
|
| 149 |
+
<ul>
|
| 150 |
+
<li>Open
|
| 151 |
+
<a href="https://eclipse.gerrithub.io/settings/#Groups" target="egit_external">https://eclipse.gerrithub.io/settings/#Groups</a>
|
| 152 |
+
</li>
|
| 153 |
+
<li>If your request was approved you see groups of the GitHub organisation (e.g. "github/eclipse-jgit/technology-jgit-committers").</li>
|
| 154 |
+
</ul>
|
| 155 |
+
<p>
|
| 156 |
+
<img width="500" border="0" src="images/4-open-Gerrit-groups.png"/>
|
| 157 |
+
</p>
|
| 158 |
+
<ul>
|
| 159 |
+
<li>If the approval of your request takes too long open a ticket on the
|
| 160 |
+
<a href="https://gitlab.eclipse.org/eclipsefdn/helpdesk" target="egit_external">Eclipse helpdesk</a>.
|
| 161 |
+
</li>
|
| 162 |
+
</ul>
|
| 163 |
+
<p>
|
| 164 |
+
<br/>
|
| 165 |
+
|
| 166 |
+
<b>3. If you want to change your access scope</b>
|
| 167 |
+
</p>
|
| 168 |
+
<ul>
|
| 169 |
+
<li>click "GitHub > Scope"</li>
|
| 170 |
+
</ul>
|
| 171 |
+
<p>
|
| 172 |
+
<img width="500" border="0" src="images/5-Gerrithub-Github-Scope.png"/>
|
| 173 |
+
</p>
|
| 174 |
+
<ul>
|
| 175 |
+
<li>and select the access scope you want to use on GerritHub.</li>
|
| 176 |
+
</ul>
|
| 177 |
+
<p>
|
| 178 |
+
<img width="500" border="0" src="images/6-select-github-oauth-scope.png"/>
|
| 179 |
+
</p>
|
| 180 |
+
<p>
|
| 181 |
+
<br/>
|
| 182 |
+
|
| 183 |
+
<b>4. Click "login" to authenticate</b>.
|
| 184 |
+
</p>
|
| 185 |
+
<p>
|
| 186 |
+
<img width="300" border="0" src="images/7-login-to-github.png"/>
|
| 187 |
+
</p>
|
| 188 |
+
<ul>
|
| 189 |
+
<li>GitHub redirection after login may take up to 30 seconds to complete.</li>
|
| 190 |
+
<li>Be patient, just wait and do not refresh the page until you are redirected to eclipse.gerrithub.io.</li>
|
| 191 |
+
</ul>
|
| 192 |
+
<p>
|
| 193 |
+
<br/>
|
| 194 |
+
|
| 195 |
+
<b>Git over SSH</b>
|
| 196 |
+
</p>
|
| 197 |
+
<p>When accessing GerritHub over SSH from git or EGit</p>
|
| 198 |
+
<ul>
|
| 199 |
+
<li>use your GitHub username</li>
|
| 200 |
+
<li>upload your public SSH key to your GitHub account
|
| 201 |
+
<a href="https://github.com/settings/keys" target="egit_external">here</a>
|
| 202 |
+
</li>
|
| 203 |
+
<li>Import the keys to GerritHub
|
| 204 |
+
<ul>
|
| 205 |
+
<li>Login to
|
| 206 |
+
<a href="https://eclipse.gerrithub.io" target="egit_external">https://eclipse.gerrithub.io</a> and click "GitHub > Profile"
|
| 207 |
+
</li>
|
| 208 |
+
<li>Select the keys you want and then press "Next".</li>
|
| 209 |
+
</ul>
|
| 210 |
+
</li>
|
| 211 |
+
<li>Gerrit SSH URL: <code>ssh://username@eclipse.gerrithub.io:29418/eclipse-egit/egit</code></li>
|
| 212 |
+
<li>Find all the repositories
|
| 213 |
+
<a href="https://eclipse.gerrithub.io/admin/repos/q/filter:eclipse" target="egit_external">here</a>
|
| 214 |
+
</li>
|
| 215 |
+
</ul>
|
| 216 |
+
<p>
|
| 217 |
+
<br/>
|
| 218 |
+
|
| 219 |
+
<b>Git over HTTPS</b>
|
| 220 |
+
</p>
|
| 221 |
+
<p>When accessing GerritHub over HTTPS from git or EGit</p>
|
| 222 |
+
<ul>
|
| 223 |
+
<li>use your GitHub username and the Gerrit HTTP password which can be generated
|
| 224 |
+
<a href="https://eclipse.gerrithub.io/settings/#HTTPCredentials" target="egit_external">here</a>
|
| 225 |
+
</li>
|
| 226 |
+
<li>Gerrit HTTPS URL: <code>https://<username>@eclipse.gerrithub.io/a/eclipse-egit/egit</code></li>
|
| 227 |
+
<li>Find all the repositories
|
| 228 |
+
<a href="https://eclipse.gerrithub.io/admin/repos/q/filter:eclipse" target="egit_external">here</a>
|
| 229 |
+
</li>
|
| 230 |
+
</ul>
|
| 231 |
+
<h3 id="SSH_Keys">SSH Keys</h3>
|
| 232 |
+
<ul>
|
| 233 |
+
<li>Add one or more public SSH keys to
|
| 234 |
+
<a href="https://github.com/settings/keys" target="egit_external">your GitHub account here</a>.
|
| 235 |
+
</li>
|
| 236 |
+
<li>If you do not have keys already, you must create a public and private pair of SSH keys. It is strongly recommended that you
|
| 237 |
+
<a href="https://help.github.com/working-with-key-passphrases" target="egit_external">use a passphrase</a>.
|
| 238 |
+
</li>
|
| 239 |
+
<li>Generating SSH key pair on command line</li>
|
| 240 |
+
</ul>
|
| 241 |
+
<pre><pre style="width: 60em;">ssh-keygen -t ed25519 -C "your_email@youremail.com"</pre>
|
| 242 |
+
</pre>
|
| 243 |
+
<ul>
|
| 244 |
+
<li>Execute SSH once to accept the host key</li>
|
| 245 |
+
</ul>
|
| 246 |
+
<pre style="width: 60em;">ssh -p 29418 username@eclipse.gerrithub.io
|
| 247 |
+
</pre>
|
| 248 |
+
<p> </p>
|
| 249 |
+
<ul>
|
| 250 |
+
<li>
|
| 251 |
+
<a href="https://wiki.eclipse.org/EGit/User_Guide#Eclipse_SSH_Configuration" target="egit_external">Generating SSH key pair in Eclipse</a>
|
| 252 |
+
</li>
|
| 253 |
+
</ul>
|
| 254 |
+
<h3 id="Legal_Paperwork">Legal Paperwork</h3>
|
| 255 |
+
<p>Before your first contribution can be accepted, you need to electronically sign the
|
| 256 |
+
<a href="https://www.eclipse.org/legal/ECA.php" target="egit_external">Eclipse Contributor Agreement</a>(ECA). The ECA is good for three years. Find more information in the
|
| 257 |
+
<a href="https://www.eclipse.org/legal/ecafaq.php" target="egit_external">ECA FAQ</a>.
|
| 258 |
+
</p>
|
| 259 |
+
<p>Minimally, all Git commits you contribute must have the following:</p>
|
| 260 |
+
<ul>
|
| 261 |
+
<li>A single line summary in the comment field, followed by a more detailed descriptive paragraph;</li>
|
| 262 |
+
<li>Your credentials (email address) captured in the "Author" field</li>
|
| 263 |
+
<li>In addition ensure that the contributed code is licensed under the project license (EPL 2.0 for EGit and EDL 1.0 for JGit). This is done by putting a
|
| 264 |
+
<a href="https://www.eclipse.org/projects/handbook/#ip-copyright-headers" target="egit_external">copyright and license header</a> into every new java file. See other existing project source files for the correct content.
|
| 265 |
+
</li>
|
| 266 |
+
</ul>
|
| 267 |
+
<p>With a valid ECA on file and the copyright and license header in place, we will be able to accept small patches (<1000 LoC) immediately. For larger patches, we will also have to create a contribution questionnaire for review by the Eclipse IP team, but this usually doesn't require additional actions from you.</p>
|
| 268 |
+
<p>To verify whether a contribution
|
| 269 |
+
<a href="https://dev.eclipse.org/mhonarc/lists/eclipse.org-committers/msg00973.html" target="egit_external">requires a CQ</a>, use one of the following git commands to check:
|
| 270 |
+
</p>
|
| 271 |
+
<ul>
|
| 272 |
+
<li>If it's committed: <tt>git log --shortstat</tt></li>
|
| 273 |
+
<li>If not committed: <tt>git diff --stat</tt></li>
|
| 274 |
+
</ul>
|
| 275 |
+
<p>These commands tell you the number of insertions(+), and deletions(-). If the total number of lines inserted (e.g. added) in a contribution is greater than 1000 (yes, this includes comments) then a CQ is required.</p>
|
| 276 |
+
<p>Find more details about how to contribute in
|
| 277 |
+
<a href="https://wiki.eclipse.org/Development_Resources/Contributing_via_Git" target="egit_external">Contributing via Git (for contributors)</a> and
|
| 278 |
+
<a href="https://wiki.eclipse.org/Development_Resources/Handling_Git_Contributions" target="egit_external">Handling Git Contributions (for committers)</a>.
|
| 279 |
+
</p>
|
| 280 |
+
<h3 id="Doing_Code_Reviews_with_Gerrit">Doing Code Reviews with Gerrit</h3>
|
| 281 |
+
<ul>
|
| 282 |
+
<li>Visit the
|
| 283 |
+
<a href="https://eclipse.gerrithub.io" target="egit_external">Eclipse tenant of GerritHub</a> to start reviewing,
|
| 284 |
+
</li>
|
| 285 |
+
<li>
|
| 286 |
+
<a href="https://eclipse.gerrithub.io/settings/#Notifications" target="egit_external">Register to watch projects</a> if you want to be notified by email on new or updated changes pushed for review
|
| 287 |
+
</li>
|
| 288 |
+
<li>Adjust your
|
| 289 |
+
<a href="https://eclipse.gerrithub.io/settings/" target="egit_external">Gerrit settings</a> to customize it to your needs
|
| 290 |
+
</li>
|
| 291 |
+
<li>See the
|
| 292 |
+
<a href="https://eclipse.gerrithub.io/Documentation/intro-user.html" target="egit_external">Gerrit user guide</a> for more information about using Gerrit.
|
| 293 |
+
</li>
|
| 294 |
+
<li>The
|
| 295 |
+
<a href="https://wiki.eclipse.org/EGit/User_Guide#EGit_Tutorial_.28EclipseCon_Europe_Nov_2011.29" target="egit_external">EGit tutorial</a> walks you through the basic steps of working with Gerrit and EGit.
|
| 296 |
+
</li>
|
| 297 |
+
<li>Use
|
| 298 |
+
<a href="https://eclipse.gerrithub.io/Documentation/user-search.html" target="egit_external">Gerrit queries</a> to filter the review list for changes you are interested in:
|
| 299 |
+
<ul>
|
| 300 |
+
<li>
|
| 301 |
+
<a href="https://eclipse.gerrithub.io/q/project:eclipse-jgit/jgit+status:open" target="egit_external">EGit changes pending in review</a>
|
| 302 |
+
</li>
|
| 303 |
+
<li>
|
| 304 |
+
<a href="https://eclipse.gerrithub.io/q/project:eclipse-egit/egit+status:open" target="egit_external">JGit changes pending in review</a>
|
| 305 |
+
</li>
|
| 306 |
+
</ul>
|
| 307 |
+
</li>
|
| 308 |
+
</ul>
|
| 309 |
+
<h3 id="Using_Gerrit_with_git_command_line:">Using Gerrit with git command line:</h3>
|
| 310 |
+
<ul>
|
| 311 |
+
<li>Upload your patch from Git to the target project:</li>
|
| 312 |
+
</ul>
|
| 313 |
+
<p>
|
| 314 |
+
<b>JGit</b>
|
| 315 |
+
</p>
|
| 316 |
+
<pre style="width: 60em;">git push ssh://username@eclipse.gerrithub.io:29418/eclipse-jgit/jgit.git HEAD:refs/for/master
|
| 317 |
+
</pre>
|
| 318 |
+
<p>
|
| 319 |
+
|
| 320 |
+
<b>EGit</b>
|
| 321 |
+
</p>
|
| 322 |
+
<pre style="width: 60em;">git push ssh://username@eclipse.gerrithub.io:29418/eclipse-egit/egit.git HEAD:refs/for/master
|
| 323 |
+
</pre>
|
| 324 |
+
<p> </p>
|
| 325 |
+
<ul>
|
| 326 |
+
<li>Visit the
|
| 327 |
+
<a href="https://eclipse.gerrithub.io/" target="egit_external">Eclipse tenant of GerritHub</a> to start reviewing
|
| 328 |
+
</li>
|
| 329 |
+
</ul>
|
| 330 |
+
<h4 id="Adding_a_dedicated_remote">Adding a dedicated remote</h4>
|
| 331 |
+
<p>Since git can have multiple remotes, you can define one to be used to refer to Gerrit to save typing. Inside a previously checked-out repository you can run: </p>
|
| 332 |
+
<pre>cd path/to/jgit
|
| 333 |
+
git config remote.review.url ssh://username@eclipse.gerrithub.io:29418/eclipse-jgit/jgit.git
|
| 334 |
+
git config remote.review.push HEAD:refs/for/master
|
| 335 |
+
|
| 336 |
+
cd path/to/egit
|
| 337 |
+
git config remote.review.url ssh://username@eclipse.gerrithub.io:29418/eclipse-egit/egit.git
|
| 338 |
+
git config remote.review.push HEAD:refs/for/master
|
| 339 |
+
</pre>
|
| 340 |
+
<p>
|
| 341 |
+
You can now submit review requests from either repository using: </p>
|
| 342 |
+
<pre>git push review
|
| 343 |
+
</pre>
|
| 344 |
+
<h3 id="Using_Gerrit_with_EGit:">Using Gerrit with EGit:</h3>
|
| 345 |
+
<p>Eclipse will look for your private key in the SSH2 Home location specified in the General>Network Connections>SSH2 Preference Page.</p>
|
| 346 |
+
<ul>
|
| 347 |
+
<li>
|
| 348 |
+
<a href="../../EGit/User_Guide/Tasks.html#Cloning_Remote_Repositories" title="EGit/User_Guide#Cloning_Remote_Repositories">Clone the JGit and EGit repositories</a> and select
|
| 349 |
+
<b>Gerrit Configuration...</b> in the context menu of the remote "origin" in the Git Repositories view to
|
| 350 |
+
<a href="https://wiki.eclipse.org/EGit/User_Guide#Gerrit_Configuration" target="egit_external">configure pushing to the code review queue</a>.
|
| 351 |
+
</li>
|
| 352 |
+
<li>Alternative approach: Add a new review remote in the Git Repositories view and select
|
| 353 |
+
<b>Gerrit Configuration...</b> in the context menu of the remote
|
| 354 |
+
<ul>
|
| 355 |
+
<li>From the appropriate Remotes node, create a New Remote and choose to Configure for Push. A unique name should be chosen,
|
| 356 |
+
<i>review</i> is suggested.
|
| 357 |
+
</li>
|
| 358 |
+
<li>Changes committed to your local clone can now be pushed to Gerrit using the
|
| 359 |
+
<i>review</i> Remote. You will be prompted for your private key's passphrase if Eclipse is looking for it in the right place.
|
| 360 |
+
</li>
|
| 361 |
+
</ul>
|
| 362 |
+
</li>
|
| 363 |
+
<li>Instead of using the
|
| 364 |
+
<b>Gerrit Configuration...</b> wizard you can do the configuration steps manually:
|
| 365 |
+
<ul>
|
| 366 |
+
<li>Change the main URI or Add a Push URI (your Gerrit user name must be used here)
|
| 367 |
+
<ul>
|
| 368 |
+
<li><code>ssh://username@eclipse.gerrithub.io:29418/(project).git</code> </li>
|
| 369 |
+
</ul>
|
| 370 |
+
</li>
|
| 371 |
+
<li>In the Ref mapping section, add a RefSpec specification of <code>HEAD:refs/for/master</code></li>
|
| 372 |
+
</ul>
|
| 373 |
+
</li>
|
| 374 |
+
</ul>
|
| 375 |
+
<ul>
|
| 376 |
+
<li>Visit our
|
| 377 |
+
<a href="https://eclipse.gerrithub.io/" target="egit_external">Gerrit Code Review instance</a> to start reviewing
|
| 378 |
+
</li>
|
| 379 |
+
</ul>
|
| 380 |
+
<h2 id="Granularity_of_Changes">Granularity of Changes</h2>
|
| 381 |
+
<ul>
|
| 382 |
+
<li>Make small commits, as small as reasonable. This makes them easy to review.</li>
|
| 383 |
+
<li>Each commit should have a commit message that explains very clearly what the commit sets out to achieve (unless this is abundantly clear from the code itself, which is basically only the case for trivial patches). Also, when you fix a bug then report which bug you fix. When there are deeper reasons for doing things the way the commit does, then explain these as well. This all is for the reviewers and yourself: the context of the commit is completely clear.</li>
|
| 384 |
+
<li>Do not mix concerns in commits: have a commit do a single thing. This makes them reviewable 'in isolation'. The purpose of the commit is clear and can be understood easily by the reviewers and yourself.</li>
|
| 385 |
+
<li>Do not break the build and tests for
|
| 386 |
+
<b>any commit</b>: this is very important for bug hunting.
|
| 387 |
+
</li>
|
| 388 |
+
<li>Split your work into multiple smaller pieces of work (when possible) and implement each of these pieces in a series of commits.</li>
|
| 389 |
+
<li>A series of commits should work towards a 'feature' in a clear way and only 'enable' the feature in the last commit of the series.</li>
|
| 390 |
+
<li>In a series of commits first lay the groundwork and then build on that towards the feature.</li>
|
| 391 |
+
</ul>
|
| 392 |
+
<h3 id="Branches">Branches</h3>
|
| 393 |
+
<p>When working with Gerrit, you can create local branches as you wish. When you are ready to push your changes, only the commits from your branch are pushed and are converted to reviews on Gerrit. The branch name itself is not visible on Gerrit.</p>
|
| 394 |
+
<p>Do not mix unrelated changes in branches: When you encounter a bug while working on something then create a new branch to fix the bug. Make sure you base it on the state of the remote branch that you want your fix to go to, e.g.
|
| 395 |
+
<i>origin/master</i>. If you have other changes that depend on the bug being fixed then rebase your work on that new branch.
|
| 396 |
+
</p>
|
| 397 |
+
<p>Merge/Rebase: If you want your branch to include new commits from the remote repository, rebase your local branch. The reason for this is that in Gerrit, changes are reviewed one commit at a time, and modified until all review feedback has been addressed. This is different from a pull request workflow, where the combined changes are reviewed and feedback is addressed with additional commits.</p>
|
| 398 |
+
<h2 id="Coding_standards">Coding standards</h2>
|
| 399 |
+
<p>Eclipse has standards for how to write code.</p>
|
| 400 |
+
<p>
|
| 401 |
+
<a href="https://wiki.eclipse.org/Coding_Conventions" title="Coding_Conventions" target="egit_external">Coding conventions</a>
|
| 402 |
+
</p>
|
| 403 |
+
<p>
|
| 404 |
+
<a href="https://wiki.eclipse.org/User_Interface_Guidelines" title="User_Interface_Guidelines" target="egit_external">Use interface guidelines</a>
|
| 405 |
+
</p>
|
| 406 |
+
<p>These documents have links to other document. Browse through them without expecting to learn everything, just so you know roughly what areas and types of details they covert. When you are
|
| 407 |
+
not sure about how to write a piece of code or design the user interface, these are the two
|
| 408 |
+
first places to look at.</p>
|
| 409 |
+
<p>In addition there is all the worlds collective knowledge on how to write programs that shine.
|
| 410 |
+
When there is a conflict, the Eclipse guide lines and conventions take precedence.</p>
|
| 411 |
+
<p>Breaking the rules is ok if there is a very good reason and you can tell us what that reason
|
| 412 |
+
is.</p>
|
| 413 |
+
<p>In addition to these general rules, we regard performance high. If the EGit plugin is slow
|
| 414 |
+
in any way, that is a bug and should be reported and fixed. Java isn't slow, but there is a
|
| 415 |
+
lot of slow Java code.</p>
|
| 416 |
+
<h3 id="Braces_for_one-line_statements">Braces for one-line statements</h3>
|
| 417 |
+
<p>Before 3.7.0 both in JGit and EGit, the preferred coding style was to leave off braces around statements with one line (with some exceptions to this rule), e.g.:</p>
|
| 418 |
+
<pre>if (condition)
|
| 419 |
+
doSomething();
|
| 420 |
+
</pre>
|
| 421 |
+
<p>Starting with 3.7.0 braces are mandatory independently on the number of lines, without exceptions. The old code will remain as is, but the new changes should use the style below:</p>
|
| 422 |
+
<pre>if (condition) {
|
| 423 |
+
doSomething();
|
| 424 |
+
}
|
| 425 |
+
</pre>
|
| 426 |
+
<p>The main reason to the change was to simplify the review process, coding guidelines and to make them more consistent with Eclipse code formatter, see .</p>
|
| 427 |
+
<h3 id="Removing_trailing_whitespace">Removing trailing whitespace</h3>
|
| 428 |
+
<p>In JGit and EGit we have enabled the save action "Remove trailing white spaces on all lines" for Java sources. This works except for empty comment lines, see .</p>
|
| 429 |
+
<p>As a workaround, use the following sequence of commands in the Java editor to trick the save action:</p>
|
| 430 |
+
<ul>
|
| 431 |
+
<li>remove the offending trailing whitespace</li>
|
| 432 |
+
<li>the save action re-adds the trailing whitespace</li>
|
| 433 |
+
<li>CTRL-Z (CMD-Z on Mac) removes the re-added whitespace without triggering the save action again</li>
|
| 434 |
+
</ul>
|
| 435 |
+
<p>Another workaround is to use
|
| 436 |
+
<a href="https://stackoverflow.com/questions/10413922/convert-spaces-to-tabs-in-lines-i-changed-in-a-commit?answertab=active#tab-top" target="egit_external">this little script</a> from the command line to edit away trailing whitespace from changed lines.
|
| 437 |
+
</p>
|
| 438 |
+
<h3 id="Use_of_the_.22final.22_modifier">Use of the "final" modifier</h3>
|
| 439 |
+
<p>New code uses the "final" modifier in the following circumstances
|
| 440 |
+
<a href="https://gerrit-review.googlesource.com/c/gerrit/+/61701/" target="egit_external">https://gerrit-review.googlesource.com/c/gerrit/+/61701/</a>.
|
| 441 |
+
</p>
|
| 442 |
+
<p>Always:</p>
|
| 443 |
+
<ul>
|
| 444 |
+
<li>final fields: marking fields as final forces them to be initialized in the constructor or at declaration</li>
|
| 445 |
+
<li>final static fields: clearly communicates the intent</li>
|
| 446 |
+
<li>where necessary to use final variables in inner anonymous classes</li>
|
| 447 |
+
<li>for simple local constants, e.g. final int MAX_RETRIES = 5;</li>
|
| 448 |
+
</ul>
|
| 449 |
+
<p>Optional:</p>
|
| 450 |
+
<ul>
|
| 451 |
+
<li>final classes: use when appropriate, e.g. API restriction</li>
|
| 452 |
+
<li>final methods: similar to final classes</li>
|
| 453 |
+
</ul>
|
| 454 |
+
<p>Never:</p>
|
| 455 |
+
<ul>
|
| 456 |
+
<li>local variables: it clutters the code, and makes the code less readable. When copying old code to new location, finals should be removed</li>
|
| 457 |
+
<li>method parameters: similar to local variables</li>
|
| 458 |
+
</ul>
|
| 459 |
+
<h2 id="Commit_message_guidelines">Commit message guidelines</h2>
|
| 460 |
+
<ul>
|
| 461 |
+
<li>The commit message header should fit on one line, try to keep it shorter than 50 characters, at most 72. A blank line separates it from the body of the message.</li>
|
| 462 |
+
<li>The first line should be a clear and concise description about the change. It is recommended to start with the modified subsystem, followed by a colon and a description starting with capital letter and without period at the end. For example: <code>UploadPack: Use reachability checker to validate non-advertised wants</code></li>
|
| 463 |
+
<li>In case of release engineering tasks without bugzilla entries the commit message header may look like "[findbugs] Fix warning XYZ for String constructor". The prefix in brackets is an indication why this comes without a corresponding bug. </li>
|
| 464 |
+
<li>Enter a newline before providing a more detailed description about the change.</li>
|
| 465 |
+
<li>Format the commit message to have newline characters after every 60-70 characters. </li>
|
| 466 |
+
<li>Find more reasoning about commit message formatting in
|
| 467 |
+
<a href="https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html" target="egit_external">"A Note About Git Commit Messages"</a>
|
| 468 |
+
</li>
|
| 469 |
+
<li>
|
| 470 |
+
<i>Commit message trailers</i> (everything following the last blank line in the commit message) in
|
| 471 |
+
<i>Key: value</i> format are used for additional commit meta data. Some tools especially
|
| 472 |
+
<i>Gerrit</i> parse this meta data to provide additional functionality. You can use the
|
| 473 |
+
<a href="https://git-scm.com/docs/git-interpret-trailers" target="egit_external">git interpret-trailers</a> command to add or parse trailer lines at the end of commit messages.
|
| 474 |
+
<ul>
|
| 475 |
+
<li>If there is an associated bug number in Bugzilla about it, it should come as a
|
| 476 |
+
<i>Bug:</i> trailer right before Gerrit's Change-Id trailer (if available) or towards the end. Use exactly the capitalization "Bug", since the automatic linking mechanism to the bug database is case sensitive.
|
| 477 |
+
</li>
|
| 478 |
+
<li>A
|
| 479 |
+
<i>Gerrit Change-Id</i> trailer is required for all changes pushed to Gerrit (to enable pushing new patchsets for the same change), it should be added in the format shown below. Use the
|
| 480 |
+
<a href="Gerrit-Code-Review-Cheatsheet.html#Install_the_commit-msg_hook_in_your_repository" title="EGit/Contributor_Guide#Install_the_commit-msg_hook_in_your_repository">Gerrit commit message hook or EGit</a> to add the
|
| 481 |
+
<i>Change-Id</i>.
|
| 482 |
+
</li>
|
| 483 |
+
<li>A "Signed-off-by" can be added at the end of the commit message (see example below). It may be used to list all who modified (amended, rebased, cherry-picked) this change. This trailer
|
| 484 |
+
<a href="https://www.eclipse.org/lists/eclipse.org-committers/msg01291.html" target="egit_external">isn't mandatory anymore since March 2021</a>.
|
| 485 |
+
</li>
|
| 486 |
+
</ul>
|
| 487 |
+
</li>
|
| 488 |
+
</ul>
|
| 489 |
+
<pre>CommitDialog: Fix the commit dialog to respect the workbench's selection
|
| 490 |
+
|
| 491 |
+
Originally, the commit dialog would automatically check off all
|
| 492 |
+
files in the dialog. This behaviour contradicts a user's expectation
|
| 493 |
+
because their selection in the workbench is completely ignored. The
|
| 494 |
+
code has been corrected to only preselect what the user has actually
|
| 495 |
+
selected.
|
| 496 |
+
|
| 497 |
+
Bug: 12345
|
| 498 |
+
Change-Id: I71ac4844ab9d2f848352eba9252090c586b4146a
|
| 499 |
+
Signed-off-by: Your Name <your.email@example.org>
|
| 500 |
+
</pre>
|
| 501 |
+
<h2 id="License_Header">License Header</h2>
|
| 502 |
+
<p>All new code files, including test code, must have a license header.</p>
|
| 503 |
+
<p>
|
| 504 |
+
<b>JGit</b> is licensed under the
|
| 505 |
+
<a href="https://www.eclipse.org/org/documents/edl-v10.php" target="egit_external">Eclipse Distribution License</a> which is a form of the
|
| 506 |
+
<a href="https://opensource.org/licenses/BSD-3-Clause" target="egit_external">New BSD License</a>.
|
| 507 |
+
Use of this license by an Eclipse project requires unanimous approval by the Board of Directors of the Eclipse Foundation
|
| 508 |
+
which was approved in a
|
| 509 |
+
<a href="https://www.eclipse.org/org/foundation/boardminutes/2009_09_16_Minutes.php" target="egit_external">meeting of the board in Sep 2009</a>.
|
| 510 |
+
</p>
|
| 511 |
+
<p>The license and copyright header to be used for
|
| 512 |
+
<b>JGit</b> is
|
| 513 |
+
</p>
|
| 514 |
+
<pre>/*
|
| 515 |
+
* Copyright © YEAR CONTRIBUTOR[ and others]
|
| 516 |
+
*
|
| 517 |
+
* This program and the accompanying materials are made available under the
|
| 518 |
+
* terms of the Eclipse Distribution License v. 1.0 which is available at
|
| 519 |
+
* <a href="https://www.eclipse.org/org/documents/edl-v10.php" target="egit_external">https://www.eclipse.org/org/documents/edl-v10.php</a>.
|
| 520 |
+
*
|
| 521 |
+
* SPDX-License-Identifier: BSD-3-Clause
|
| 522 |
+
*/
|
| 523 |
+
</pre>
|
| 524 |
+
<p>
|
| 525 |
+
<b>EGit</b> is licensed under the
|
| 526 |
+
<a href="https://www.eclipse.org/legal/epl-2.0/" target="egit_external">Eclipse Public License 2.0</a> and uses the license header
|
| 527 |
+
</p>
|
| 528 |
+
<pre>/*******************************************************************************
|
| 529 |
+
* Copyright © YEAR CONTRIBUTOR[ and others.]
|
| 530 |
+
*
|
| 531 |
+
* All rights reserved. This program and the accompanying materials
|
| 532 |
+
* are made available under the terms of the Eclipse Public License 2.0
|
| 533 |
+
* which accompanies this distribution, and is available at
|
| 534 |
+
* <a href="https://www.eclipse.org/legal/epl-2.0/" target="egit_external">https://www.eclipse.org/legal/epl-2.0/</a>
|
| 535 |
+
*
|
| 536 |
+
* SPDX-License-Identifier: EPL-2.0
|
| 537 |
+
*******************************************************************************/
|
| 538 |
+
</pre>
|
| 539 |
+
<p>The license header is placed at the very beginning of a file; in Java files above the "package" line.</p>
|
| 540 |
+
<p>See
|
| 541 |
+
<a href="https://www.eclipse.org/legal/copyrightandlicensenotice.php" target="egit_external">https://www.eclipse.org/legal/copyrightandlicensenotice.php</a> for more information.
|
| 542 |
+
</p>
|
| 543 |
+
<h2 id="Copyright">Copyright</h2>
|
| 544 |
+
<p>When contributing patches, you have to update the copyright section at the beginning of the file if there is one. Please follow the style that is already present in the file. Some examples follow.</p>
|
| 545 |
+
<p>When there is only one copyright present (from a person or a company), like this:</p>
|
| 546 |
+
<pre>Copyright (C) 2010, 2011 Some Name <some@example.org>
|
| 547 |
+
</pre>
|
| 548 |
+
<p>Change it like this (notice the updated year):</p>
|
| 549 |
+
<pre>Copyright (C) 2010, YEAR Some Name <some@example.org> and others.
|
| 550 |
+
</pre>
|
| 551 |
+
<p>If there is a section <tt>Contributors:</tt> below the legal text and your change is more than a few lines, you can add your name there and optionally describe the change and link to a bug number. You can also start such a section if you contributed a significant change.</p>
|
| 552 |
+
<p>When there are multiple copyright entries there, add yours as a separate line. So, given this:</p>
|
| 553 |
+
<pre>Copyright (C) 2010 Some Name <some@example.org>
|
| 554 |
+
Copyright (C) 2011 Other Name <other@example.org>
|
| 555 |
+
</pre>
|
| 556 |
+
<p>Add another line:</p>
|
| 557 |
+
<pre>Copyright (C) 2010 Some Name <some@example.org>
|
| 558 |
+
Copyright (C) 2011 Other Name <other@example.org>
|
| 559 |
+
Copyright (C) YEAR Your Name <you@example.org>
|
| 560 |
+
</pre>
|
| 561 |
+
<p>For new files, copy one of the existing headers and start the copyright section with your name.</p>
|
| 562 |
+
<h2 id="Test_before_submitting">Test before submitting</h2>
|
| 563 |
+
<p>See the
|
| 564 |
+
<a href="#Manual_alpha_testing">Manual alpha testing</a> section for some advice about how to test you work yourself.
|
| 565 |
+
</p>
|
| 566 |
+
<ul>
|
| 567 |
+
<li>Add automated tests for enhancements and bug fixes to ensure functional correctness and avoid regressions</li>
|
| 568 |
+
<li>Run all existing tests. It does not take very long.</li>
|
| 569 |
+
<li>Pay attention to the Java and Eclipse SDK baselines. EGit requires only Java 8 and Eclipse 4.4. You cannot use API's that are newer.</li>
|
| 570 |
+
</ul>
|
| 571 |
+
<h2 id="Sending_patches_by_mail">Sending patches by mail</h2>
|
| 572 |
+
<p>EGit and JGit can accept patches only via Gerrit as per
|
| 573 |
+
<a href="#Contributing_Patches">Contributing_Patches</a>.
|
| 574 |
+
</p>
|
| 575 |
+
<p>
|
| 576 |
+
<br/>
|
| 577 |
+
</p><hr class="navigation-separator"/>
|
| 578 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 579 |
+
<tr>
|
| 580 |
+
<td style="width: 20%" align="left">
|
| 581 |
+
<a href="Website.html" title="Website">
|
| 582 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 583 |
+
</a>
|
| 584 |
+
</td>
|
| 585 |
+
<td style="width: 60%" align="center">
|
| 586 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 587 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 588 |
+
</a>
|
| 589 |
+
</td>
|
| 590 |
+
<td style="width: 20%" align="right">
|
| 591 |
+
<a href="Gerrit-Code-Review-Cheatsheet.html" title="Gerrit Code Review Cheatsheet">
|
| 592 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 593 |
+
</a>
|
| 594 |
+
</td>
|
| 595 |
+
</tr>
|
| 596 |
+
<tr>
|
| 597 |
+
<td style="width: 20%" align="left" valign="top">Website</td>
|
| 598 |
+
<td style="width: 60%" align="center"></td>
|
| 599 |
+
<td style="width: 20%" align="right" valign="top">Gerrit Code Review Cheatsheet</td>
|
| 600 |
+
</tr>
|
| 601 |
+
</table>
|
| 602 |
+
</body>
|
| 603 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Contributor-Guide.html
CHANGED
|
@@ -1,3 +1,89 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">EGit Contributor Guide</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left"></td>
|
| 15 |
+
<td style="width: 60%" align="center"></td>
|
| 16 |
+
<td style="width: 20%" align="right">
|
| 17 |
+
<a href="Automated-Developer-Setup.html" title="Automated Developer Setup">
|
| 18 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 19 |
+
</a>
|
| 20 |
+
</td>
|
| 21 |
+
</tr>
|
| 22 |
+
<tr>
|
| 23 |
+
<td style="width: 20%" align="left" valign="top"></td>
|
| 24 |
+
<td style="width: 60%" align="center"></td>
|
| 25 |
+
<td style="width: 20%" align="right" valign="top">Automated Developer Setup</td>
|
| 26 |
+
</tr>
|
| 27 |
+
</table><hr class="navigation-separator"/>
|
| 28 |
+
<h1 id="Communication">Communication</h1>
|
| 29 |
+
<table border="1" cellpadding="3" cellspacing="0">
|
| 30 |
+
<tr>
|
| 31 |
+
<th>Channel</th>
|
| 32 |
+
<th>JGit</th>
|
| 33 |
+
<th>EGit </th>
|
| 34 |
+
</tr>
|
| 35 |
+
<tr>
|
| 36 |
+
<td>Developer Mailing List</td>
|
| 37 |
+
<td>
|
| 38 |
+
<a href="https://dev.eclipse.org/mailman/listinfo/jgit-dev" target="egit_external">JGit developer mailing list</a>
|
| 39 |
+
</td>
|
| 40 |
+
<td>
|
| 41 |
+
<a href="https://dev.eclipse.org/mailman/listinfo/egit-dev" target="egit_external">EGit developer mailing list</a>
|
| 42 |
+
</td>
|
| 43 |
+
</tr>
|
| 44 |
+
<tr>
|
| 45 |
+
<td>Build Notices Mailing List</td>
|
| 46 |
+
<td>
|
| 47 |
+
<a href="https://dev.eclipse.org/mailman/listinfo/jgit-build" target="egit_external">JGit build notices mailing list</a>
|
| 48 |
+
</td>
|
| 49 |
+
<td>
|
| 50 |
+
<a href="https://dev.eclipse.org/mailman/listinfo/egit-build" target="egit_external">EGit build notices mailing list</a>
|
| 51 |
+
</td>
|
| 52 |
+
</tr>
|
| 53 |
+
<tr>
|
| 54 |
+
<td>Reporting Bugs</td>
|
| 55 |
+
<td>
|
| 56 |
+
<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit&rep_platform=All&op_sys=All" target="egit_external">File new JGit bug</a>
|
| 57 |
+
</td>
|
| 58 |
+
<td>
|
| 59 |
+
<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit&rep_platform=All&op_sys=All" target="egit_external">File new EGit bug</a>
|
| 60 |
+
</td>
|
| 61 |
+
</tr>
|
| 62 |
+
<tr>
|
| 63 |
+
<td>User Forum</td>
|
| 64 |
+
<td>
|
| 65 |
+
<a href="https://www.eclipse.org/forums/index.php?t=thread&frm_id=48" target="egit_external">EGit User Forum</a>
|
| 66 |
+
</td>
|
| 67 |
+
</tr>
|
| 68 |
+
</table>
|
| 69 |
+
<p>
|
| 70 |
+
<br/>
|
| 71 |
+
</p><hr class="navigation-separator"/>
|
| 72 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 73 |
+
<tr>
|
| 74 |
+
<td style="width: 20%" align="left"></td>
|
| 75 |
+
<td style="width: 60%" align="center"></td>
|
| 76 |
+
<td style="width: 20%" align="right">
|
| 77 |
+
<a href="Automated-Developer-Setup.html" title="Automated Developer Setup">
|
| 78 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 79 |
+
</a>
|
| 80 |
+
</td>
|
| 81 |
+
</tr>
|
| 82 |
+
<tr>
|
| 83 |
+
<td style="width: 20%" align="left" valign="top"></td>
|
| 84 |
+
<td style="width: 60%" align="center"></td>
|
| 85 |
+
<td style="width: 20%" align="right" valign="top">Automated Developer Setup</td>
|
| 86 |
+
</tr>
|
| 87 |
+
</table>
|
| 88 |
+
</body>
|
| 89 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Development-IDE-Configuration.html
CHANGED
|
@@ -1,3 +1,152 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Development IDE Configuration</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Development IDE Configuration</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Obtaining-Sources.html" title="Obtaining Sources">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Builds.html" title="Builds">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Obtaining Sources</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Builds</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Development_IDE_Configuration">Development IDE Configuration</h1>
|
| 33 |
+
<p>Download and install the Eclipse package "Eclipse IDE for Eclipse Committers" or "Eclipse for RCP and RAP Developers" from here, if you don't already have it:</p>
|
| 34 |
+
<p>
|
| 35 |
+
<a href="http://www.eclipse.org/downloads/" target="egit_external">http://www.eclipse.org/downloads/</a>
|
| 36 |
+
</p>
|
| 37 |
+
<h2 id="Tools">Tools</h2>
|
| 38 |
+
<p>
|
| 39 |
+
<b>Note:</b> You have to use at least Eclipse 4.3.2 (Kepler SR2), earlier versions had a bug where the following did not work (see
|
| 40 |
+
<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=409073" target="egit_external">bug 409073</a>).
|
| 41 |
+
</p>
|
| 42 |
+
<p>To install all the necessary tools to work on EGit/JGit, there is a
|
| 43 |
+
<a href="http://git.eclipse.org/c/egit/egit.git/plain/tools/egit-developer-tools.p2f" target="egit_external">egit-developer-tools.p2f</a> file which you can use as follows:
|
| 44 |
+
</p>
|
| 45 |
+
<ul>
|
| 46 |
+
<li>File > Import > Install > Install Software Items from File</li>
|
| 47 |
+
<li>Browse...
|
| 48 |
+
<ul>
|
| 49 |
+
<li>Go to the location of your egit repository, open the
|
| 50 |
+
<i>tools</i> directory and select
|
| 51 |
+
<i>egit-developer-tools.p2f</i>
|
| 52 |
+
</li>
|
| 53 |
+
<li>Alternatively, if you only want to contribute to JGit, download the file from the above link and select it</li>
|
| 54 |
+
</ul>
|
| 55 |
+
</li>
|
| 56 |
+
<li>All the items you don't already have should be selected automatically</li>
|
| 57 |
+
<li>Finish the wizard</li>
|
| 58 |
+
<li>Restart</li>
|
| 59 |
+
</ul>
|
| 60 |
+
<h2 id="Java_Requirements">Java Requirements</h2>
|
| 61 |
+
<p>EGit and JGit have Java 7.0 and
|
| 62 |
+
<a href="https://wiki.eclipse.org/EGit/FAQ#What_versions_of_Eclipse_does_EGit_target.3F" target="egit_external">Eclipse Platform 3.8.2 (Juno)</a> as minimum requirements, so dependencies to newer Java and platform versions must be avoided.
|
| 63 |
+
</p>
|
| 64 |
+
<p>We are using
|
| 65 |
+
<i>API Tools Environment Descriptions</i> (see changes for
|
| 66 |
+
<a href="https://git.eclipse.org/r/#/c/4785/" target="egit_external">JGit</a> and
|
| 67 |
+
<a href="https://git.eclipse.org/r/#/c/4365/" target="egit_external">EGit</a>) to facilitate detecting code which isn't working on Java 7. If you followed the instructions in the
|
| 68 |
+
<i>Tools</i> section above, the necessary descriptions should already be installed. Otherwise install
|
| 69 |
+
<i>API Tools Environment Descriptions</i> from the release train repository, see
|
| 70 |
+
<a href="http://wiki.eclipse.org/Execution_Environments#Installing_Execution_Environment_Descriptions" title="Execution_Environments#Installing_Execution_Environment_Descriptions" target="egit_external">Installing Execution Environment Descriptions</a>.
|
| 71 |
+
</p>
|
| 72 |
+
<h2 id="Dependencies">Dependencies</h2>
|
| 73 |
+
<p>After importing the EGit and JGit projects in Eclipse, they will not compile due to missing dependencies. There are a few ways to install these.</p>
|
| 74 |
+
<h3 id="Option_1_.28recommended.29:_Use_a_Target_Platform">Option 1 (recommended): Use a Target Platform</h3>
|
| 75 |
+
<p>
|
| 76 |
+
<img align="right" title="EGit target platforms in org.eclipse.egit.target" alt="EGit target platforms in org.eclipse.egit.target" border="0" src="images/EGit-Target-Platforms.png"/>
|
| 77 |
+
</p>
|
| 78 |
+
<p>This is the easiest method to install dependencies:</p>
|
| 79 |
+
<ul>
|
| 80 |
+
<li>Open the
|
| 81 |
+
<i>org.eclipse.egit.target</i> project
|
| 82 |
+
</li>
|
| 83 |
+
<li>Choose the
|
| 84 |
+
<i>egit-<version>.target</i> file matching the version of your Eclipse platform (e.g. 4.5 for Mars) and open it (this may take a while as it downloads the indexes of the p2 repositories the target platform refers to)
|
| 85 |
+
</li>
|
| 86 |
+
<li>In the resulting editor, click on the
|
| 87 |
+
<i>Set as Target Platform</i> link at the top right (this may also take a while since it downloads the dependencies)
|
| 88 |
+
</li>
|
| 89 |
+
</ul>
|
| 90 |
+
<p>After that, the workspace should build cleanly. If not, try Project > Clean... > All. If this also doesn't help open Preferences > Plug-In Development > Target Platform,
|
| 91 |
+
select the checked target platform and click "Reload..." this will flush PDE's bundle cache and re-download the artifacts listed in the target platform.</p>
|
| 92 |
+
<p>There are different target definitions, one for each version of Eclipse that EGit supports. The one you select will be the one that is started if you want to try out a feature or bug fix.</p>
|
| 93 |
+
<p>You can always switch between them to test on different Eclipse versions. E.g. when you are developing some major UI functionality, you should try it with the oldest supported Eclipse release to make sure it doesn't depend on API that is only available in later versions.</p>
|
| 94 |
+
<h3 id="Option_2:_Install_from_Orbit_P2_Repository">Option 2: Install from Orbit P2 Repository</h3>
|
| 95 |
+
<p>Install the dependencies from the Orbit p2 repository by importing the p2f file described
|
| 96 |
+
<a href="#Tools">above</a>.
|
| 97 |
+
</p>
|
| 98 |
+
<p>If you want to try another Orbit p2 repository version on the
|
| 99 |
+
<a href="https://download.eclipse.org/tools/orbit/downloads/" target="egit_external">Orbit Downloads</a> page, click on the newest recommended build (R-Build) and copy the update site link from "Orbit Build Repository" (it should end with <tt>/repository</tt>). Add this update site in Eclipse using "Install New Software..." and then find and select the following entries:
|
| 100 |
+
</p>
|
| 101 |
+
<ul>
|
| 102 |
+
<li>Java Mocking and Stubbing Framework</li>
|
| 103 |
+
<li>Args4j</li>
|
| 104 |
+
<li>Protocol Buffers</li>
|
| 105 |
+
<li>Apache Jakarta log4j Plug-in</li>
|
| 106 |
+
<li>Apache Commons Compress</li>
|
| 107 |
+
<li>XZ Data Compression</li>
|
| 108 |
+
<li>Hamcrest Library of Matchers</li>
|
| 109 |
+
<li>JavaEWAH</li>
|
| 110 |
+
</ul>
|
| 111 |
+
<h2 id="Running">Running</h2>
|
| 112 |
+
<p>Now that everything builds, the next step is to run an Eclipse instance with the EGit/JGit code of the workspace:</p>
|
| 113 |
+
<ul>
|
| 114 |
+
<li>Right click on the
|
| 115 |
+
<i>org.eclipse.egit.ui</i> project
|
| 116 |
+
</li>
|
| 117 |
+
<li>Debug As > Eclipse Application</li>
|
| 118 |
+
</ul>
|
| 119 |
+
<p>This should create a new launch configuration and start a new nested Eclipse instance in debug mode. The created launch configuration can be edited, e.g. to change where the workspace of the nested Eclipse should be located.</p>
|
| 120 |
+
<p>The launch configuration can also be used in normal (non-debug) mode of course.</p>
|
| 121 |
+
<p>Also see the
|
| 122 |
+
<a href="http://help.eclipse.org/juno/topic/org.eclipse.pde.doc.user/guide/tools/launchers/eclipse_application_launcher.htm" target="egit_external">reference on eclipse application launchers</a>.
|
| 123 |
+
</p>
|
| 124 |
+
<p>
|
| 125 |
+
<br/>
|
| 126 |
+
</p><hr class="navigation-separator"/>
|
| 127 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 128 |
+
<tr>
|
| 129 |
+
<td style="width: 20%" align="left">
|
| 130 |
+
<a href="Obtaining-Sources.html" title="Obtaining Sources">
|
| 131 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 132 |
+
</a>
|
| 133 |
+
</td>
|
| 134 |
+
<td style="width: 60%" align="center">
|
| 135 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 136 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 137 |
+
</a>
|
| 138 |
+
</td>
|
| 139 |
+
<td style="width: 20%" align="right">
|
| 140 |
+
<a href="Builds.html" title="Builds">
|
| 141 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 142 |
+
</a>
|
| 143 |
+
</td>
|
| 144 |
+
</tr>
|
| 145 |
+
<tr>
|
| 146 |
+
<td style="width: 20%" align="left" valign="top">Obtaining Sources</td>
|
| 147 |
+
<td style="width: 60%" align="center"></td>
|
| 148 |
+
<td style="width: 20%" align="right" valign="top">Builds</td>
|
| 149 |
+
</tr>
|
| 150 |
+
</table>
|
| 151 |
+
</body>
|
| 152 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Documentation.html
CHANGED
|
@@ -1,3 +1,121 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Documentation</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Documentation</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Builds.html" title="Builds">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Tests.html" title="Tests">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Builds</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Tests</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Documentation">Documentation</h1>
|
| 33 |
+
<h2 id="JGit_3">JGit</h2>
|
| 34 |
+
<p>The JGit project generates a project report and javadocs using a Maven site. This Maven site is deployed to
|
| 35 |
+
<a href="https://download.eclipse.org/jgit/site/$" target="egit_external">https://download.eclipse.org/jgit/site/$</a>{project.version}.
|
| 36 |
+
E.g.
|
| 37 |
+
<a href="https://download.eclipse.org/jgit/site/4.4.1.201607150455-r/" target="egit_external">https://download.eclipse.org/jgit/site/4.4.1.201607150455-r/</a>
|
| 38 |
+
</p>
|
| 39 |
+
<p>Generating the site:</p>
|
| 40 |
+
<pre><b>$ mvn site:site</b>
|
| 41 |
+
</pre>
|
| 42 |
+
<p>Staging the site locally under ./target/staging:</p>
|
| 43 |
+
<pre><b>$ mvn site:stage</b>
|
| 44 |
+
</pre>
|
| 45 |
+
<p>If you can connect to build.eclipse.org over ssh (ask webmaster if you are a committer and need ssh access) you can deploy a local build of the site:</p>
|
| 46 |
+
<pre><b>$ mvn site:deploy</b>
|
| 47 |
+
</pre>
|
| 48 |
+
<p>The site is deployed under
|
| 49 |
+
<a href="https://download.eclipse.org/jgit/site/$" target="egit_external">https://download.eclipse.org/jgit/site/$</a>{project.version}
|
| 50 |
+
</p>
|
| 51 |
+
<p>To select the ssh key to use for deploying over ssh add the following section to your Maven settings.xml:</p>
|
| 52 |
+
<pre><server>
|
| 53 |
+
<id>jgit.website</id>
|
| 54 |
+
<username>username</username>
|
| 55 |
+
<privateKey>${user.home}/.ssh/id_rsa</privateKey>
|
| 56 |
+
<password>{<encrypted passphrase>}</password>
|
| 57 |
+
<filePermissions>664</filePermission>
|
| 58 |
+
<directoryPermissions>775</directoryPermissions>
|
| 59 |
+
<configuration></configuration>
|
| 60 |
+
</server>
|
| 61 |
+
</pre>
|
| 62 |
+
<p>Password encryption for Maven is described in
|
| 63 |
+
<a href="https://maven.apache.org/guides/mini/guide-encryption.html" target="egit_external">https://maven.apache.org/guides/mini/guide-encryption.html</a>
|
| 64 |
+
</p>
|
| 65 |
+
<p>To deploy the site from JGit HIPP (Hudson) at
|
| 66 |
+
<a href="https://hudson.eclipse.org/jgit/" target="egit_external">https://hudson.eclipse.org/jgit/</a> enable the Maven profile
|
| 67 |
+
<b>build-server</b> and add the Maven goals
|
| 68 |
+
<b>site:site site:deploy</b>.
|
| 69 |
+
</p>
|
| 70 |
+
<p>If you uploaded the site for a new release update the index
|
| 71 |
+
/home/data/httpd/download.eclipse.org/jgit/docs/latest/apidocs/index.html
|
| 72 |
+
to refer to the new release's site.</p>
|
| 73 |
+
<h2 id="EGit_3">EGit</h2>
|
| 74 |
+
<p>The EGit project sources its documentation from the wiki and generates Eclipse help content from it (under the covers, we are using
|
| 75 |
+
<a href="https://wiki.eclipse.org/Mylyn/WikiText" target="egit_external">Mylyn WikiText</a> to make this possible). This significantly lowers the barrier for people to contribute documentation to the EGit project. To contribute documentation, simply modify the
|
| 76 |
+
<a href="https://wiki.eclipse.org/EGit/User_Guide" target="egit_external">EGit User's Guide</a>. Have a look at the
|
| 77 |
+
<a href="https://wiki.eclipse.org/DocumentationGuidelines/StyleGuidelines" title="DocumentationGuidelines/StyleGuidelines" target="egit_external">Style Guidelines</a> and
|
| 78 |
+
<a href="https://wiki.eclipse.org/Eclipse_Doc_Style_Guide" title="Eclipse_Doc_Style_Guide" target="egit_external">Eclipse Documentation Style Guide</a> to get some guidance on how to write good documentation. More on that can be found
|
| 79 |
+
<a href="https://wiki.eclipse.org/DocumentationGuidelines" title="DocumentationGuidelines" target="egit_external">here</a>.
|
| 80 |
+
</p>
|
| 81 |
+
<p>The documentation is contained in the
|
| 82 |
+
<b>org.eclipse.egit.doc</b> plug-in. The
|
| 83 |
+
<b>build-help.xml</b> drives the generation of the help content. It is integrated into the maven build. The regular maven build of
|
| 84 |
+
<b>org.eclipse.egit.doc</b>
|
| 85 |
+
</p>
|
| 86 |
+
<pre><b>$ mvn clean install</b>
|
| 87 |
+
</pre>
|
| 88 |
+
<p>will only package the help content committed to the egit repository. To update the help content by downloading the latest documentation from the wiki run</p>
|
| 89 |
+
<pre><b>$ mvn clean install -Dupdate.egit.doc</b>
|
| 90 |
+
</pre>
|
| 91 |
+
<p>Don't forget to check all the generated help pages and especially all hyperlinks and images before pushing the updated help to the code review system for inclusion into the continuous build.</p>
|
| 92 |
+
<p>The aim is to generate new documentation every month or so (or just on demand). If you're making big changes or want the documentation refreshed, please let us know on the egit-dev mailing list.</p>
|
| 93 |
+
<p>
|
| 94 |
+
<br/>
|
| 95 |
+
</p><hr class="navigation-separator"/>
|
| 96 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 97 |
+
<tr>
|
| 98 |
+
<td style="width: 20%" align="left">
|
| 99 |
+
<a href="Builds.html" title="Builds">
|
| 100 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 101 |
+
</a>
|
| 102 |
+
</td>
|
| 103 |
+
<td style="width: 60%" align="center">
|
| 104 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 105 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 106 |
+
</a>
|
| 107 |
+
</td>
|
| 108 |
+
<td style="width: 20%" align="right">
|
| 109 |
+
<a href="Tests.html" title="Tests">
|
| 110 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 111 |
+
</a>
|
| 112 |
+
</td>
|
| 113 |
+
</tr>
|
| 114 |
+
<tr>
|
| 115 |
+
<td style="width: 20%" align="left" valign="top">Builds</td>
|
| 116 |
+
<td style="width: 60%" align="center"></td>
|
| 117 |
+
<td style="width: 20%" align="right" valign="top">Tests</td>
|
| 118 |
+
</tr>
|
| 119 |
+
</table>
|
| 120 |
+
</body>
|
| 121 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Gerrit-Code-Review-Cheatsheet.html
CHANGED
|
@@ -1,3 +1,171 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Gerrit Code Review Cheatsheet</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Gerrit Code Review Cheatsheet</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Contributing-Patches.html" title="Contributing Patches">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Updating-This-Document.html" title="Updating This Document">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Contributing Patches</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Gerrit_Code_Review_Cheatsheet">Gerrit Code Review Cheatsheet</h1>
|
| 33 |
+
<h2 id="Install_the_commit-msg_hook_in_your_repository">Install the commit-msg hook in your repository</h2>
|
| 34 |
+
<pre style="width: 60em;">scp -p -P 29418 username@eclipse.gerrithub.io:hooks/commit-msg .git/hooks/
|
| 35 |
+
</pre>
|
| 36 |
+
<p>
|
| 37 |
+
This will ask for a password. It is the password that you have to generate in the
|
| 38 |
+
<i>SSH Keys</i> section of settings in your Gerrit account.
|
| 39 |
+
</p>
|
| 40 |
+
<p>You can alternatively
|
| 41 |
+
<a href="https://eclipse.gerrithub.io/tools/hooks/commit-msg" target="egit_external">download the file</a>. The
|
| 42 |
+
<a href="https://gerrit-review.googlesource.com/Documentation/cmd-hook-commit-msg.html" target="egit_external">hook</a> helps append a Change-Id trailer to your commit message.
|
| 43 |
+
</p>
|
| 44 |
+
<p>EGit can also generate a Gerrit Change-Id into your commit message both
|
| 45 |
+
<a href="../../EGit/User_Guide/Tasks.html#Commit_Message" title="EGit/User_Guide#Commit_Message">manually</a> or in an
|
| 46 |
+
<a href="../../EGit/User_Guide/Tasks.html#Gerrit_Configuration" title="EGit/User_Guide#Gerrit_Configuration">automated</a> way.
|
| 47 |
+
</p>
|
| 48 |
+
<h2 id="To_create_a_new_change">To create a new change</h2>
|
| 49 |
+
<ul>
|
| 50 |
+
<li>JGit</li>
|
| 51 |
+
</ul>
|
| 52 |
+
<pre style="width: 60em;">git push origin HEAD:refs/for/master
|
| 53 |
+
</pre>
|
| 54 |
+
<p> </p>
|
| 55 |
+
<ul>
|
| 56 |
+
<li>EGit</li>
|
| 57 |
+
</ul>
|
| 58 |
+
<pre style="width: 60em;">git push origin HEAD:refs/for/master
|
| 59 |
+
</pre>
|
| 60 |
+
<p>
|
| 61 |
+
Or, if you've followed the instructions on
|
| 62 |
+
<a href="Contributing-Patches.html#Adding_a_dedicated_remote">Adding_a_dedicated_remote</a> you can simply do:
|
| 63 |
+
</p>
|
| 64 |
+
<pre style="width: 60em;">git push review
|
| 65 |
+
</pre>
|
| 66 |
+
<h2 id="To_update_an_existing_change_with_a_new_commit">To update an existing change with a new commit</h2>
|
| 67 |
+
<pre style="width: 60em;">git push origin HEAD:refs/for/master
|
| 68 |
+
</pre>
|
| 69 |
+
<p>
|
| 70 |
+
This works because Gerrit links the new commit to the prior change based upon the Change-Id footer in the commit message. (This is automatically generated by the commit-msg hook you installed above.) If you refuse to use the commit-msg hook, or don't have a Change-Id footer, you should read the Gerrit documentation on
|
| 71 |
+
<a href="https://eclipse.gerrithub.io/Documentation/user-changeid.html" target="egit_external">change-id lines</a> and
|
| 72 |
+
<a href="https://eclipse.gerrithub.io/Documentation/user-upload.html#push_replace" target="egit_external">replacing changes</a>.
|
| 73 |
+
</p>
|
| 74 |
+
<p>
|
| 75 |
+
<b>Note:</b> To be picked up by Gerrit, a Change-Id line must be in the bottom portion (last paragraph) of a commit message, and may be mixed together with the Signed-off-by, Acked-by, or other such footers. So if your Change-Id line is ignored it's probably not in the last paragraph :).
|
| 76 |
+
</p>
|
| 77 |
+
<h2 id="To_compare_bulk_diffs_using_Git">To compare bulk diffs using Git</h2>
|
| 78 |
+
<p>Since each Gerrit review patchset actually commits its own tree, you can pull out the trees and compare them. </p>
|
| 79 |
+
<p>If you've got a large changeset, and you want to be able to do diffs between them via (command line) git instead of browsing on the web, then you can fetch the individual changes and then perform a diff. For example,
|
| 80 |
+
<a href="https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/2" target="egit_external">https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/2</a> shows the 'download' section for each patchset. In this case, it looks like:
|
| 81 |
+
</p>
|
| 82 |
+
<ul>
|
| 83 |
+
<li>Patch Set 1 <code>git pull origin refs/changes/02/2/1 (1d3331a91bd477d3f70cde9613576cf9688ac358)</code> </li>
|
| 84 |
+
<li>Patch Set 2 <code>git pull origin refs/changes/02/2/2 (13ab9a43d4d512963556a92e889b1204d32f8e68)</code> </li>
|
| 85 |
+
<li>Patch Set 3 <code>git pull origin refs/changes/02/2/3 (d14cc645655683ba3e30a35833fb2282142e898f)</code> </li>
|
| 86 |
+
<li>Patch Set 4 <code>git pull origin refs/changes/02/2/4 (43de8d385b614c72fd796e17da75d381f6e0cc25)</code></li>
|
| 87 |
+
</ul>
|
| 88 |
+
<p>Performing a <code>git pull</code> will both get the bits and merge them into your tree, which won't do what you want for comparison. So, in order to get the bits (but not merge), you need to do a <code>git fetch</code> instead. Let's say we want to diff the last two patches against each other rather than reviewing the entire patchset again: </p>
|
| 89 |
+
<pre>git fetch origin refs/changes/02/2/3
|
| 90 |
+
git fetch origin refs/changes/02/2/4
|
| 91 |
+
|
| 92 |
+
git diff d14cc645655683ba3e30a35833fb2282142e898f 43de8d385b614c72fd796e17da75d381f6e0cc25
|
| 93 |
+
|
| 94 |
+
or git diff d14cc6 43de8d
|
| 95 |
+
</pre>
|
| 96 |
+
<p>Git fetched data will stay around in your repository, but will be 'orphaned' if no references point to it. To clean up, you can run <code>git gc</code> or wait until this happens automatically.</p>
|
| 97 |
+
<h2 id="Trigger_Jenkins_build_for_a_change">Trigger Jenkins build for a change</h2>
|
| 98 |
+
<p>We have build jobs
|
| 99 |
+
<b>jgit.gerrit</b> on
|
| 100 |
+
<a href="https://ci.eclipse.org/jgit/" target="egit_external">https://ci.eclipse.org/jgit/</a>, and
|
| 101 |
+
<b>egit.gerrit</b> and
|
| 102 |
+
<b>egit-github.gerrit</b> on
|
| 103 |
+
<a href="https://ci.eclipse.org/egit/" target="egit_external">https://ci.eclipse.org/egit/</a> which are triggered automatically when a new change or a new patchset for an existing change is pushed for review. These jobs will comment on the respective change when the build is started and when it's finished and vote on the change according to the build and test results.
|
| 104 |
+
</p>
|
| 105 |
+
<p>Sometimes you may want to retrigger such a build e.g. because it may have failed due to some temporary problem.
|
| 106 |
+
Committers can manually trigger these jobs in the following way:</p>
|
| 107 |
+
<ul>
|
| 108 |
+
<li>Go to
|
| 109 |
+
<a href="https://ci.eclipse.org/jgit/gerrit_manual_trigger/" target="egit_external">Trigger a Gerrit event manually</a> page
|
| 110 |
+
</li>
|
| 111 |
+
<li>Search for a change you'd like to build</li>
|
| 112 |
+
<li>Select the patch set(s) you want to trigger</li>
|
| 113 |
+
<li>Press
|
| 114 |
+
<b>Trigger Selected</b> button
|
| 115 |
+
</li>
|
| 116 |
+
</ul>
|
| 117 |
+
<p>If you are not a committer and need to retrigger a build ask for that on the mailing list.</p>
|
| 118 |
+
<h2 id="To_approve_a_change">To approve a change</h2>
|
| 119 |
+
<ul>
|
| 120 |
+
<li>Click on Publish Comments </li>
|
| 121 |
+
<li>Vote with the radio buttons</li>
|
| 122 |
+
</ul>
|
| 123 |
+
<h2 id="To_add_a_reviewer">To add a reviewer</h2>
|
| 124 |
+
<p>Once you've pushed your commit to Gerrit for review, you can go to the web page (
|
| 125 |
+
<a href="https://eclipse.gerrithub.io" target="egit_external">https://eclipse.gerrithub.io</a>) and see your changes. By clicking on the review, there's an option to add a reviewer by e-mail address; they'll then be sent a message indicating that they'd like your review on the item.
|
| 126 |
+
</p>
|
| 127 |
+
<p>It's usually not necessary to add any reviewers, it should be reviewed by the committers sooner or later. If this hasn't happened, you can look for people that did changes in the same area and add them as reviewers. It's also ok to comment on a change to "bump" its visibility.</p>
|
| 128 |
+
<h2 id="Code_Review">Code Review</h2>
|
| 129 |
+
<p>The code review category indicates your opinion on the quality of the code, and how well it fits within the purpose of the existing surrounding code. A +2 vote from any committer is required before submission can occur. A -2 vote from any committer will block submission. </p>
|
| 130 |
+
<h2 id="Submission_Guidelines">Submission Guidelines</h2>
|
| 131 |
+
<p>We strive to use Gerrit to improve our understanding of the code base and improve quality. </p>
|
| 132 |
+
<p>In order to ensure a proper review happens, some simple guidelines should be followed:</p>
|
| 133 |
+
<ul>
|
| 134 |
+
<li>vote 0/-1 for not-ready-to-submit (AKA WIP) own proposals, +1 otherwise;</li>
|
| 135 |
+
<li>If a changeset is not-ready-to-submit, please put [RFC] or [DRAFT] in the message to let people know</li>
|
| 136 |
+
<li>let non-trivial changes be in review for at least 24 hours</li>
|
| 137 |
+
<li>if you want your changeset reviewed by someone, please add them as a reviewer</li>
|
| 138 |
+
</ul>
|
| 139 |
+
<h2 id="Tips_.26_Tricks">Tips & Tricks</h2>
|
| 140 |
+
<h3 id="Class_Loading_Issues">Class Loading Issues</h3>
|
| 141 |
+
<p>If you encounter strange class loading issues during runtime (e.g. on UI test executions) the following might help:</p>
|
| 142 |
+
<p>Enable tracing in your launch configuration to get information how imported packages are resolved at runtime. Select the Tracing tab in your launch configuration, select "Enable tracing", select plug-in org.eclipse.osgi, select category resolver/wiring on the right side.</p>
|
| 143 |
+
<p>
|
| 144 |
+
<a href="https://wiki.eclipse.org/Category:Draft_Documentation" title="Category:Draft_Documentation" target="egit_external">Category:Draft_Documentation</a>
|
| 145 |
+
</p><hr class="navigation-separator"/>
|
| 146 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 147 |
+
<tr>
|
| 148 |
+
<td style="width: 20%" align="left">
|
| 149 |
+
<a href="Contributing-Patches.html" title="Contributing Patches">
|
| 150 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 151 |
+
</a>
|
| 152 |
+
</td>
|
| 153 |
+
<td style="width: 60%" align="center">
|
| 154 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 155 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 156 |
+
</a>
|
| 157 |
+
</td>
|
| 158 |
+
<td style="width: 20%" align="right">
|
| 159 |
+
<a href="Updating-This-Document.html" title="Updating This Document">
|
| 160 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 161 |
+
</a>
|
| 162 |
+
</td>
|
| 163 |
+
</tr>
|
| 164 |
+
<tr>
|
| 165 |
+
<td style="width: 20%" align="left" valign="top">Contributing Patches</td>
|
| 166 |
+
<td style="width: 60%" align="center"></td>
|
| 167 |
+
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
|
| 168 |
+
</tr>
|
| 169 |
+
</table>
|
| 170 |
+
</body>
|
| 171 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Manual-Developer-Setup.html
CHANGED
|
@@ -1,3 +1,174 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Manual Developer Setup</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Manual Developer Setup</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Automated-Developer-Setup.html" title="Automated Developer Setup">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Running-EGit-from-Eclipse.html" title="Running EGit from Eclipse">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Automated Developer Setup</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Running EGit from Eclipse</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Manual_Developer_Setup">Manual Developer Setup</h1>
|
| 33 |
+
<h2 id="Obtaining_Sources">Obtaining Sources</h2>
|
| 34 |
+
<p>EGit and JGit are self hosted in
|
| 35 |
+
<a href="https://eclipse.gerrithub.io/" target="egit_external">Gerrit</a>. We use GerritHub which combines Gerrit for code review and GitHub for authentication, browsing and issue tracking. You can browse the repositories on their GitHub mirrors:
|
| 36 |
+
|
| 37 |
+
<a href="https://github.com/eclipse-egit/egit" target="egit_external">EGit</a>,
|
| 38 |
+
<a href="https://github.com/eclipse-jgit/jgit" target="egit_external">JGit</a>
|
| 39 |
+
or using the Gerrit gitiles plugin:
|
| 40 |
+
|
| 41 |
+
<a href="https://eclipse.gerrithub.io/plugins/gitiles/eclipse-egit/egit/" target="egit_external">EGit</a>,
|
| 42 |
+
<a href="https://eclipse.gerrithub.io/plugins/gitiles/eclipse-jgit/jgit/" target="egit_external">JGit</a>.
|
| 43 |
+
</p>
|
| 44 |
+
<p>The first section below describes how to clone a repository and can be skipped if you have done this before.
|
| 45 |
+
The next section lists the repositories and their URLs.</p>
|
| 46 |
+
<h3 id="Cloning">Cloning</h3>
|
| 47 |
+
<h4 id="On_the_command_line">On the command line</h4>
|
| 48 |
+
<pre style="width: 40em;">
|
| 49 |
+
git clone <enter URL>
|
| 50 |
+
</pre>
|
| 51 |
+
<p>After that, import the projects into Eclipse using Import > Existing Projects into Workspace.</p>
|
| 52 |
+
<h4 id="Using_EGit_.28see_.5Bhttps:.2F.2Fwww.eclipse.org.2Fegit.2Fdownload.2F_download_page.5D.29">Using EGit (see
|
| 53 |
+
<a href="https://www.eclipse.org/egit/download/" target="egit_external">download page</a>)
|
| 54 |
+
</h4>
|
| 55 |
+
<p>First, verify that the default repository folder as set on the main Git preference page is to your liking.</p>
|
| 56 |
+
<p>Then, clone the repository and import the projects:</p>
|
| 57 |
+
<ul>
|
| 58 |
+
<li>Open
|
| 59 |
+
<i>File</i> >
|
| 60 |
+
<i>Import...</i> and select
|
| 61 |
+
<i>Git</i> >
|
| 62 |
+
<i>Projects from Git</i>
|
| 63 |
+
</li>
|
| 64 |
+
<li>Selet
|
| 65 |
+
<i>URI</i>
|
| 66 |
+
</li>
|
| 67 |
+
<li>Enter the URL (see next section) </li>
|
| 68 |
+
<li>Import existing projects into the workspace from the newly created working directory</li>
|
| 69 |
+
</ul>
|
| 70 |
+
<h3 id="Repositories">Repositories</h3>
|
| 71 |
+
<p>To develop EGit, the EGit and JGit repositories are needed, the others are optional. To develop JGit, only JGit is needed. </p>
|
| 72 |
+
<h4 id="EGit">EGit</h4>
|
| 73 |
+
<p>URL:
|
| 74 |
+
<a href="https://eclipse.gerrithub.io/eclipse-egit/egit.git" target="egit_external">https://eclipse.gerrithub.io/eclipse-egit/egit.git</a>
|
| 75 |
+
</p>
|
| 76 |
+
<p>This is the main repository, where the standard EGit feature is developed. It contains the code for the UI and Eclipse integration.</p>
|
| 77 |
+
<h4 id="JGit">JGit</h4>
|
| 78 |
+
<p>URL:
|
| 79 |
+
<a href="https://eclipse.gerrithub.io/eclipse-jgit/jgit.git" target="egit_external">https://eclipse.gerrithub.io/eclipse-jgit/jgit.git</a>
|
| 80 |
+
</p>
|
| 81 |
+
<p>This is the Java implementation of Git used by EGit, for working with Git repositories.</p>
|
| 82 |
+
<h4 id="EGit_GitHub_Integration">EGit GitHub Integration</h4>
|
| 83 |
+
<p>URL:
|
| 84 |
+
<a href="https://eclipse.gerrithub.io/eclipse-egit/egit-github.git" target="egit_external">https://eclipse.gerrithub.io/eclipse-egit/egit-github.git</a>
|
| 85 |
+
</p>
|
| 86 |
+
<p>
|
| 87 |
+
<b>Moved to Mylyn:</b>
|
| 88 |
+
EGit also provided tools for integrating with GitHub and Mylyn tasks.
|
| 89 |
+
They were moved to Mylyn in Eclipse 2023-06, see
|
| 90 |
+
<a href="https://github.com/eclipse-mylyn/org.eclipse.mylyn/tree/main/mylyn.egit" target="egit_external">mylyn.egit</a>.
|
| 91 |
+
</p>
|
| 92 |
+
<h2 id="Development_IDE_Configuration">Development IDE Configuration</h2>
|
| 93 |
+
<p>Download and install the Eclipse package "Eclipse IDE for Eclipse Committers" or "Eclipse for RCP and RAP Developers" from here, if you don't already have it:</p>
|
| 94 |
+
<p>
|
| 95 |
+
<a href="https://www.eclipse.org/downloads/packages/" target="egit_external">https://www.eclipse.org/downloads/packages/</a>
|
| 96 |
+
</p>
|
| 97 |
+
<h3 id="Tools">Tools</h3>
|
| 98 |
+
<p>To install all the necessary tools to work on EGit/JGit, there is a
|
| 99 |
+
<a href="https://github.com/eclipse-egit/egit/blob/refs/heads/master/tools/egit-developer-tools.p2f" target="egit_external">egit-developer-tools.p2f</a> file which you can use as follows:
|
| 100 |
+
</p>
|
| 101 |
+
<ul>
|
| 102 |
+
<li>File > Import > Install > Install Software Items from File</li>
|
| 103 |
+
<li>Browse...
|
| 104 |
+
<ul>
|
| 105 |
+
<li>Go to the location of your egit repository, open the
|
| 106 |
+
<i>tools</i> directory and select
|
| 107 |
+
<i>egit-developer-tools.p2f</i>
|
| 108 |
+
</li>
|
| 109 |
+
<li>Alternatively, if you only want to contribute to JGit, download the file from the above link and select it</li>
|
| 110 |
+
</ul>
|
| 111 |
+
</li>
|
| 112 |
+
<li>All the items you don't already have should be selected automatically</li>
|
| 113 |
+
<li>Finish the wizard</li>
|
| 114 |
+
<li>Restart</li>
|
| 115 |
+
</ul>
|
| 116 |
+
<h3 id="Java_Requirements">Java Requirements</h3>
|
| 117 |
+
<p>Since 6.0 EGit and JGit have Java 11 and
|
| 118 |
+
<a href="https://wiki.eclipse.org/EGit/FAQ#What_versions_of_Eclipse_does_EGit_target.3F" target="egit_external">Eclipse Platform 4.17 (2020-09)</a> as minimum requirements, so dependencies to newer Java and platform versions must be avoided.
|
| 119 |
+
</p>
|
| 120 |
+
<p>We are using
|
| 121 |
+
<i>API Tools Environment Descriptions</i> (see changes for
|
| 122 |
+
<a href="https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/4785" target="egit_external">JGit</a> and
|
| 123 |
+
<a href="https://eclipse.gerrithub.io/c/eclipse-egit/egit/+/4365" target="egit_external">EGit</a>) to facilitate detecting code which isn't working on Java 11. If you followed the instructions in the
|
| 124 |
+
<i>Tools</i> section above, the necessary descriptions should already be installed. Otherwise install
|
| 125 |
+
<i>API Tools Environment Descriptions</i> from the release train repository, see
|
| 126 |
+
<a href="https://wiki.eclipse.org/Execution_Environments#Installing_Execution_Environment_Descriptions" title="Execution_Environments#Installing_Execution_Environment_Descriptions" target="egit_external">Installing Execution Environment Descriptions</a>.
|
| 127 |
+
</p>
|
| 128 |
+
<h3 id="Dependencies">Dependencies</h3>
|
| 129 |
+
<p>After importing the EGit and JGit projects in Eclipse, they will not compile due to missing dependencies.
|
| 130 |
+
Set a Target Platform to fix this</p>
|
| 131 |
+
<p>
|
| 132 |
+
<img align="right" title="EGit target platforms in org.eclipse.egit.target" alt="EGit target platforms in org.eclipse.egit.target" border="0" src="images/EGit-Target-Platforms.png"/>
|
| 133 |
+
</p>
|
| 134 |
+
<ul>
|
| 135 |
+
<li>Open the
|
| 136 |
+
<i>org.eclipse.egit.target</i> project
|
| 137 |
+
</li>
|
| 138 |
+
<li>Choose the
|
| 139 |
+
<i>egit-<version>.target</i> file matching the version of your Eclipse platform (e.g. 4.21 for 2021-09) and open it (this may take a while as it downloads the indexes of the p2 repositories the target platform refers to)
|
| 140 |
+
</li>
|
| 141 |
+
<li>In the resulting editor, click on the
|
| 142 |
+
<i>Set as Target Platform</i> link at the top right (this may also take a while since it downloads the dependencies)
|
| 143 |
+
</li>
|
| 144 |
+
</ul>
|
| 145 |
+
<p>After that, the workspace should build cleanly. If not, try Project > Clean... > All. If this also doesn't help open Preferences > Plug-In Development > Target Platform,
|
| 146 |
+
select the checked target platform and click "Reload..." this will flush PDE's bundle cache and re-download the artifacts listed in the target platform.</p>
|
| 147 |
+
<p>There are different target definitions, one for each version of Eclipse that EGit supports. The one you select will be the one that is started if you want to try out a feature or bug fix.</p>
|
| 148 |
+
<p>You can always switch between them to test on different Eclipse versions. E.g. when you are developing some major UI functionality, you should try it with the oldest supported Eclipse release to make sure it doesn't depend on API that is only available in later versions.</p><hr class="navigation-separator"/>
|
| 149 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 150 |
+
<tr>
|
| 151 |
+
<td style="width: 20%" align="left">
|
| 152 |
+
<a href="Automated-Developer-Setup.html" title="Automated Developer Setup">
|
| 153 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 154 |
+
</a>
|
| 155 |
+
</td>
|
| 156 |
+
<td style="width: 60%" align="center">
|
| 157 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 158 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 159 |
+
</a>
|
| 160 |
+
</td>
|
| 161 |
+
<td style="width: 20%" align="right">
|
| 162 |
+
<a href="Running-EGit-from-Eclipse.html" title="Running EGit from Eclipse">
|
| 163 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 164 |
+
</a>
|
| 165 |
+
</td>
|
| 166 |
+
</tr>
|
| 167 |
+
<tr>
|
| 168 |
+
<td style="width: 20%" align="left" valign="top">Automated Developer Setup</td>
|
| 169 |
+
<td style="width: 60%" align="center"></td>
|
| 170 |
+
<td style="width: 20%" align="right" valign="top">Running EGit from Eclipse</td>
|
| 171 |
+
</tr>
|
| 172 |
+
</table>
|
| 173 |
+
</body>
|
| 174 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Obtaining-Sources.html
CHANGED
|
@@ -1,3 +1,120 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Obtaining Sources</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Obtaining Sources</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Development-IDE-Configuration.html" title="Development IDE Configuration">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">EGit Contributor Guide</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Development IDE Configuration</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Obtaining_Sources">Obtaining Sources</h1>
|
| 33 |
+
<p>EGit and JGit are self hosted in Git. You can browse the repositories on the web:
|
| 34 |
+
|
| 35 |
+
<a href="http://git.eclipse.org/c/egit/" target="egit_external">EGit</a>,
|
| 36 |
+
<a href="http://git.eclipse.org/c/jgit/" target="egit_external">JGit</a>
|
| 37 |
+
</p>
|
| 38 |
+
<p>The first section below describes how to clone a repository and can be skipped if you have done this before.</p>
|
| 39 |
+
<p>The next section lists the repositories and their URLs.</p>
|
| 40 |
+
<h2 id="Cloning">Cloning</h2>
|
| 41 |
+
<h3 id="On_the_command_line">On the command line</h3>
|
| 42 |
+
<pre style="width: 40em;">
|
| 43 |
+
git clone <enter URL>
|
| 44 |
+
</pre>
|
| 45 |
+
<p>After that, import the projects into Eclipse using Import > Existing Projects into Workspace.</p>
|
| 46 |
+
<h3 id="Using_EGit_.28see_.5Bhttp:.2F.2Fwww.eclipse.org.2Fegit.2Fdownload.2F_download_page.5D.29">Using EGit (see
|
| 47 |
+
<a href="http://www.eclipse.org/egit/download/" target="egit_external">download page</a>)
|
| 48 |
+
</h3>
|
| 49 |
+
<p>First, verify that the default repository folder as set on the main Git preference page is to your liking.</p>
|
| 50 |
+
<p>Then, clone the repository and import the projects:</p>
|
| 51 |
+
<ul>
|
| 52 |
+
<li>Open
|
| 53 |
+
<i>File</i> >
|
| 54 |
+
<i>Import...</i> and select
|
| 55 |
+
<i>Git</i> >
|
| 56 |
+
<i>Projects from Git</i>
|
| 57 |
+
</li>
|
| 58 |
+
<li>Selet
|
| 59 |
+
<i>URI</i>
|
| 60 |
+
</li>
|
| 61 |
+
<li>Enter the URL (see next section) </li>
|
| 62 |
+
<li>Import existing projects into the workspace from the newly created working directory</li>
|
| 63 |
+
</ul>
|
| 64 |
+
<h2 id="Repositories">Repositories</h2>
|
| 65 |
+
<p>To develop EGit, the EGit and JGit repositories are needed, the others are optional. To develop JGit, only JGit is needed. </p>
|
| 66 |
+
<h3 id="EGit">EGit</h3>
|
| 67 |
+
<p>URL:
|
| 68 |
+
<a href="https://git.eclipse.org/r/egit/egit.git" target="egit_external">https://git.eclipse.org/r/egit/egit.git</a>
|
| 69 |
+
</p>
|
| 70 |
+
<p>This is the main repository, where the standard EGit feature is developed. It contains the code for the UI and Eclipse integration.</p>
|
| 71 |
+
<h3 id="JGit">JGit</h3>
|
| 72 |
+
<p>URL:
|
| 73 |
+
<a href="https://git.eclipse.org/r/jgit/jgit.git" target="egit_external">https://git.eclipse.org/r/jgit/jgit.git</a>
|
| 74 |
+
</p>
|
| 75 |
+
<p>This is the Java implementation of Git used by EGit, for working with Git repositories.</p>
|
| 76 |
+
<h3 id="EGit_GitHub_Integration">EGit GitHub Integration</h3>
|
| 77 |
+
<p>URL:
|
| 78 |
+
<a href="https://git.eclipse.org/r/p/egit/egit-github.git" target="egit_external">https://git.eclipse.org/r/p/egit/egit-github.git</a>
|
| 79 |
+
</p>
|
| 80 |
+
<p>EGit also provides tools for integrating with GitHub and Mylyn tasks.</p>
|
| 81 |
+
<p>For getting the dependencies, open the file <code>org.eclipse.mylyn.github-feature/github.target</code> (
|
| 82 |
+
<a href="http://git.eclipse.org/c/egit/egit-github.git/plain/org.eclipse.mylyn.github-feature/github.target" target="egit_external">view on web</a>) and select
|
| 83 |
+
<i>Set as Target Platfrom</i>.
|
| 84 |
+
</p>
|
| 85 |
+
<h3 id="EGit_PDE_Tools">EGit PDE Tools</h3>
|
| 86 |
+
<p>URL:
|
| 87 |
+
<a href="https://git.eclipse.org/r/egit/egit-pde.git" target="egit_external">https://git.eclipse.org/r/egit/egit-pde.git</a>
|
| 88 |
+
</p>
|
| 89 |
+
<p>EGit also provides tools for integrating with
|
| 90 |
+
<a href="http://wiki.eclipse.org/PDE/Build" title="PDE/Build" target="egit_external">PDE Build</a> and Eclipse RelEng Tools. If you are an Eclipse developer using PDE Build and/or the Eclipse RelEng tools you might be interesting in the following as well. Otherwise you might just skip this section.
|
| 91 |
+
</p>
|
| 92 |
+
<p>In addition to the
|
| 93 |
+
<a href="Development-IDE-Configuration.html#Dependencies">dependencies</a> required for JGit and EGit you also need Eclipse PDE (>= 3.6.1) as well as <code>org.eclipse.releng.tools</code> in your target platform or checked out from Git in your workspaces.
|
| 94 |
+
</p><hr class="navigation-separator"/>
|
| 95 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 96 |
+
<tr>
|
| 97 |
+
<td style="width: 20%" align="left">
|
| 98 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 99 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 100 |
+
</a>
|
| 101 |
+
</td>
|
| 102 |
+
<td style="width: 60%" align="center">
|
| 103 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 104 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 105 |
+
</a>
|
| 106 |
+
</td>
|
| 107 |
+
<td style="width: 20%" align="right">
|
| 108 |
+
<a href="Development-IDE-Configuration.html" title="Development IDE Configuration">
|
| 109 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 110 |
+
</a>
|
| 111 |
+
</td>
|
| 112 |
+
</tr>
|
| 113 |
+
<tr>
|
| 114 |
+
<td style="width: 20%" align="left" valign="top">EGit Contributor Guide</td>
|
| 115 |
+
<td style="width: 60%" align="center"></td>
|
| 116 |
+
<td style="width: 20%" align="right" valign="top">Development IDE Configuration</td>
|
| 117 |
+
</tr>
|
| 118 |
+
</table>
|
| 119 |
+
</body>
|
| 120 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Running-EGit-from-Eclipse.html
CHANGED
|
@@ -1,3 +1,73 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Running EGit from Eclipse</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Running EGit from Eclipse</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Manual-Developer-Setup.html" title="Manual Developer Setup">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Builds.html" title="Builds">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Manual Developer Setup</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Builds</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Running_EGit_from_Eclipse">Running EGit from Eclipse</h1>
|
| 33 |
+
<p>Now that everything builds, the next step is to run an Eclipse instance with the EGit/JGit code of the workspace:</p>
|
| 34 |
+
<ul>
|
| 35 |
+
<li>Right click on the
|
| 36 |
+
<i>org.eclipse.egit.ui</i> project
|
| 37 |
+
</li>
|
| 38 |
+
<li>Debug As > Eclipse Application</li>
|
| 39 |
+
</ul>
|
| 40 |
+
<p>This should create a new launch configuration and start a new nested Eclipse instance in debug mode. The created launch configuration can be edited, e.g. to change where the workspace of the nested Eclipse should be located.</p>
|
| 41 |
+
<p>The launch configuration can also be used in normal (non-debug) mode of course.</p>
|
| 42 |
+
<p>Also see the
|
| 43 |
+
<a href="https://help.eclipse.org/index.jsp?topic=%2Forg.eclipse.pde.doc.user%2Fguide%2Ftools%2Flaunchers%2Feclipse_application_launcher.htm" target="egit_external">reference on eclipse application launchers</a>.
|
| 44 |
+
</p>
|
| 45 |
+
<p>
|
| 46 |
+
<br/>
|
| 47 |
+
</p><hr class="navigation-separator"/>
|
| 48 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 49 |
+
<tr>
|
| 50 |
+
<td style="width: 20%" align="left">
|
| 51 |
+
<a href="Manual-Developer-Setup.html" title="Manual Developer Setup">
|
| 52 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 53 |
+
</a>
|
| 54 |
+
</td>
|
| 55 |
+
<td style="width: 60%" align="center">
|
| 56 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 57 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 58 |
+
</a>
|
| 59 |
+
</td>
|
| 60 |
+
<td style="width: 20%" align="right">
|
| 61 |
+
<a href="Builds.html" title="Builds">
|
| 62 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 63 |
+
</a>
|
| 64 |
+
</td>
|
| 65 |
+
</tr>
|
| 66 |
+
<tr>
|
| 67 |
+
<td style="width: 20%" align="left" valign="top">Manual Developer Setup</td>
|
| 68 |
+
<td style="width: 60%" align="center"></td>
|
| 69 |
+
<td style="width: 20%" align="right" valign="top">Builds</td>
|
| 70 |
+
</tr>
|
| 71 |
+
</table>
|
| 72 |
+
</body>
|
| 73 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Tests.html
CHANGED
|
@@ -1,3 +1,109 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Tests</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Tests</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Documentation.html" title="Documentation">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Bugs.html" title="Bugs">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Documentation</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Bugs</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Tests">Tests</h1>
|
| 33 |
+
<h2 id="JGit_Unit_Tests">JGit Unit Tests</h2>
|
| 34 |
+
<p>The JGit unit tests are executed during the maven build.
|
| 35 |
+
To run them from the Eclipse workbench use the launch configurations which are part of the sources of the test bundles'.</p>
|
| 36 |
+
<h2 id="JGit_HTTP_Tests">JGit HTTP Tests</h2>
|
| 37 |
+
<p>The JGit HTTP tests in
|
| 38 |
+
<i>org.eclipse.jgit.http.test</i> rely on the Jetty web container.
|
| 39 |
+
</p>
|
| 40 |
+
<p>To run these tests from Eclipse the Jetty feature is needed. Use one of the target platforms as described in
|
| 41 |
+
<a href="Manual-Developer-Setup.html#Dependencies">dependencies</a>.
|
| 42 |
+
</p>
|
| 43 |
+
<h2 id="EGit_Core_Tests">EGit Core Tests</h2>
|
| 44 |
+
<p>The EGit Core tests are executed during the maven build for the bundle
|
| 45 |
+
<i>org.eclipse.egit.core.test</i>.
|
| 46 |
+
</p>
|
| 47 |
+
<p>To run them from the Eclipse workbench use the launch configuration which is part of the sources of the test bundle
|
| 48 |
+
<i>org.eclipse.egit.core.test</i>.
|
| 49 |
+
</p>
|
| 50 |
+
<h2 id="EGit_UI_Tests">EGit UI Tests</h2>
|
| 51 |
+
<p>The EGit UI tests are using SWTBot, using the 'SWTBot for Eclipse Testing' feature.</p>
|
| 52 |
+
<p>You need to install at least "SWTBot for Eclipse Testing" and "SWTBot IDE Feature":</p>
|
| 53 |
+
<ul>
|
| 54 |
+
<li>
|
| 55 |
+
<a href="https://download.eclipse.org/technology/swtbot/snapshots/" target="egit_external">https://download.eclipse.org/technology/swtbot/snapshots/</a>
|
| 56 |
+
</li>
|
| 57 |
+
</ul>
|
| 58 |
+
<p>Starting a UI test from Eclipse:</p>
|
| 59 |
+
<ul>
|
| 60 |
+
<li>select the test class or test method</li>
|
| 61 |
+
<li>click
|
| 62 |
+
<b>Run As > SWTBot Test</b>
|
| 63 |
+
</li>
|
| 64 |
+
</ul>
|
| 65 |
+
<p>
|
| 66 |
+
<img border="0" src="images/Start-swtbot-test.png"/>
|
| 67 |
+
</p>
|
| 68 |
+
<p>Do not touch the mouse or keyboard when the UI test is running since this may
|
| 69 |
+
disturb the UI test by e.g. moving the current focus to another window.</p>
|
| 70 |
+
<h3 id="During_Maven_Build">During Maven Build</h3>
|
| 71 |
+
<p>The tests are executed in the integration-test phase of the
|
| 72 |
+
<a href="https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html" target="egit_external">default Maven lifecycle</a>.
|
| 73 |
+
</p>
|
| 74 |
+
<p>If you want to skip execution of UI tests (only execute core tests):</p>
|
| 75 |
+
<pre>mvn -P skip-ui-tests clean install
|
| 76 |
+
</pre>
|
| 77 |
+
<p>If you want to skip all tests:</p>
|
| 78 |
+
<pre>mvn clean install -Dmaven.test.skip=true
|
| 79 |
+
</pre>
|
| 80 |
+
<h2 id="Auxilary_testing_tools">Auxilary testing tools</h2>
|
| 81 |
+
<p>Any code, including testing code, does not always do what you expected it to. The most common failure is probably the failure to actually execute the part of the code you wanted to test. Code coverage tools like
|
| 82 |
+
<a href="https://www.eclemma.org/" target="egit_external">EclEmma</a> can easily visualize what part of the code is being executed.
|
| 83 |
+
</p><hr class="navigation-separator"/>
|
| 84 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 85 |
+
<tr>
|
| 86 |
+
<td style="width: 20%" align="left">
|
| 87 |
+
<a href="Documentation.html" title="Documentation">
|
| 88 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 89 |
+
</a>
|
| 90 |
+
</td>
|
| 91 |
+
<td style="width: 60%" align="center">
|
| 92 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 93 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 94 |
+
</a>
|
| 95 |
+
</td>
|
| 96 |
+
<td style="width: 20%" align="right">
|
| 97 |
+
<a href="Bugs.html" title="Bugs">
|
| 98 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 99 |
+
</a>
|
| 100 |
+
</td>
|
| 101 |
+
</tr>
|
| 102 |
+
<tr>
|
| 103 |
+
<td style="width: 20%" align="left" valign="top">Documentation</td>
|
| 104 |
+
<td style="width: 60%" align="center"></td>
|
| 105 |
+
<td style="width: 20%" align="right" valign="top">Bugs</td>
|
| 106 |
+
</tr>
|
| 107 |
+
</table>
|
| 108 |
+
</body>
|
| 109 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Updating-This-Document.html
CHANGED
|
@@ -1,3 +1,55 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Updating This Document</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Updating This Document</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Gerrit-Code-Review-Cheatsheet.html" title="Gerrit Code Review Cheatsheet">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right"></td>
|
| 21 |
+
</tr>
|
| 22 |
+
<tr>
|
| 23 |
+
<td style="width: 20%" align="left" valign="top">Gerrit Code Review Cheatsheet</td>
|
| 24 |
+
<td style="width: 60%" align="center"></td>
|
| 25 |
+
<td style="width: 20%" align="right" valign="top"></td>
|
| 26 |
+
</tr>
|
| 27 |
+
</table><hr class="navigation-separator"/>
|
| 28 |
+
<h1 id="Updating_This_Document">Updating This Document</h1>
|
| 29 |
+
<p> This document is maintained in a collaborative wiki. If you wish to
|
| 30 |
+
update or modify this document please visit
|
| 31 |
+
|
| 32 |
+
<a href="https://wiki.eclipse.org/EGit/Contributor_Guide" target="egit_external">https://wiki.eclipse.org/EGit/Contributor_Guide</a>
|
| 33 |
+
</p><hr class="navigation-separator"/>
|
| 34 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 35 |
+
<tr>
|
| 36 |
+
<td style="width: 20%" align="left">
|
| 37 |
+
<a href="Gerrit-Code-Review-Cheatsheet.html" title="Gerrit Code Review Cheatsheet">
|
| 38 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 39 |
+
</a>
|
| 40 |
+
</td>
|
| 41 |
+
<td style="width: 60%" align="center">
|
| 42 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 43 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 44 |
+
</a>
|
| 45 |
+
</td>
|
| 46 |
+
<td style="width: 20%" align="right"></td>
|
| 47 |
+
</tr>
|
| 48 |
+
<tr>
|
| 49 |
+
<td style="width: 20%" align="left" valign="top">Gerrit Code Review Cheatsheet</td>
|
| 50 |
+
<td style="width: 60%" align="center"></td>
|
| 51 |
+
<td style="width: 20%" align="right" valign="top"></td>
|
| 52 |
+
</tr>
|
| 53 |
+
</table>
|
| 54 |
+
</body>
|
| 55 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/Website.html
CHANGED
|
@@ -1,3 +1,100 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit Contributor Guide - Website</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Website</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Bugs.html" title="Bugs">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Contributing-Patches.html" title="Contributing Patches">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Bugs</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Contributing Patches</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Website">Website</h1>
|
| 33 |
+
<p>The EGit and JGit websites are located in Git repositories which are configured for Gerrit code review.</p>
|
| 34 |
+
<p>
|
| 35 |
+
<b>EGit</b>
|
| 36 |
+
</p>
|
| 37 |
+
<ul>
|
| 38 |
+
<li>File > Import > Git > Projects from Git</li>
|
| 39 |
+
<li>Select URL
|
| 40 |
+
<ul>
|
| 41 |
+
<li>HTTPS protocol:
|
| 42 |
+
<b>
|
| 43 |
+
<a href="https://eclipse.gerrithub.io/eclipse-egit/egit-website" target="egit_external">https://eclipse.gerrithub.io/eclipse-egit/egit-website</a>
|
| 44 |
+
</b>
|
| 45 |
+
</li>
|
| 46 |
+
<li>SSH protocol:
|
| 47 |
+
<b>ssh://user@eclipse.gerrithub.io:29418/eclipse-egit/egit-website</b>
|
| 48 |
+
</li>
|
| 49 |
+
</ul>
|
| 50 |
+
</li>
|
| 51 |
+
<li>in Repositories View on node "origin" click "Gerrit Configuration..." and select branch "master", then changes you push to upstream will end up in Gerrit for review and can be submitted there</li>
|
| 52 |
+
</ul>
|
| 53 |
+
<p>
|
| 54 |
+
<b>JGit</b>
|
| 55 |
+
</p>
|
| 56 |
+
<ul>
|
| 57 |
+
<li>File > Import > Git > Projects from Git</li>
|
| 58 |
+
<li>Select URL
|
| 59 |
+
<ul>
|
| 60 |
+
<li>HTTP protocol:
|
| 61 |
+
<b>
|
| 62 |
+
<a href="https://eclipse.gerrithub.io/eclipse-jgit/jgit-website" target="egit_external">https://eclipse.gerrithub.io/eclipse-jgit/jgit-website</a>
|
| 63 |
+
</b>
|
| 64 |
+
</li>
|
| 65 |
+
<li>SSH protocol:
|
| 66 |
+
<b>ssh://user@eclipse.gerrithub.io:29418/eclipse-jgit/jgit-website</b>
|
| 67 |
+
</li>
|
| 68 |
+
</ul>
|
| 69 |
+
</li>
|
| 70 |
+
<li>in Repositories View on node "origin" click "Gerrit Configuration..." and select branch "master", then changes you push to upstream will end up in Gerrit for review and can be submitted there</li>
|
| 71 |
+
</ul>
|
| 72 |
+
<p>
|
| 73 |
+
<br/>
|
| 74 |
+
</p><hr class="navigation-separator"/>
|
| 75 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 76 |
+
<tr>
|
| 77 |
+
<td style="width: 20%" align="left">
|
| 78 |
+
<a href="Bugs.html" title="Bugs">
|
| 79 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 80 |
+
</a>
|
| 81 |
+
</td>
|
| 82 |
+
<td style="width: 60%" align="center">
|
| 83 |
+
<a href="Contributor-Guide.html" title="EGit Contributor Guide">
|
| 84 |
+
<img alt="EGit Contributor Guide" border="0" src="../../images/home.gif"/>
|
| 85 |
+
</a>
|
| 86 |
+
</td>
|
| 87 |
+
<td style="width: 20%" align="right">
|
| 88 |
+
<a href="Contributing-Patches.html" title="Contributing Patches">
|
| 89 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 90 |
+
</a>
|
| 91 |
+
</td>
|
| 92 |
+
</tr>
|
| 93 |
+
<tr>
|
| 94 |
+
<td style="width: 20%" align="left" valign="top">Bugs</td>
|
| 95 |
+
<td style="width: 60%" align="center"></td>
|
| 96 |
+
<td style="width: 20%" align="right" valign="top">Contributing Patches</td>
|
| 97 |
+
</tr>
|
| 98 |
+
</table>
|
| 99 |
+
</body>
|
| 100 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/1-GerritHub-first-login.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/3-Redirect-to-Gerrithub.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/5-Gerrithub-Github-Scope.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/7-login-to-github.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/EGit-Target-Platforms.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-01-advanced-mode.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-02-proxy-product-selection.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-03-project-egit.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-04-installer-progress.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-05-eclipse-progress.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph-06-ide.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Oomph_-01a-proxy-settings.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Contributor_Guide/images/Start-swtbot-test.png
CHANGED
|
Git LFS Details
|
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html
CHANGED
|
@@ -1,3 +1,523 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>Git for Eclipse Users</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Git for Eclipse Users</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left"></td>
|
| 15 |
+
<td style="width: 60%" align="center"></td>
|
| 16 |
+
<td style="width: 20%" align="right">
|
| 17 |
+
<a href="Updating-This-Document.html" title="Updating This Document">
|
| 18 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 19 |
+
</a>
|
| 20 |
+
</td>
|
| 21 |
+
</tr>
|
| 22 |
+
<tr>
|
| 23 |
+
<td style="width: 20%" align="left" valign="top"></td>
|
| 24 |
+
<td style="width: 60%" align="center"></td>
|
| 25 |
+
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
|
| 26 |
+
</tr>
|
| 27 |
+
</table><hr class="navigation-separator"/>
|
| 28 |
+
<p>This post is aimed at those who have been using Eclipse for a while, and probably have been using either the baked-in CVS or external SVN providers to store their source code. The content of the post is about Git: what it means to you, as an Eclipse user, and specifically, how it affects how you obtain or work with projects from Eclipse.org.</p>
|
| 29 |
+
<p>This post is not about the relative merits of Git over CVS/SVN, or of Git versus other distributed version control systems (DVCS) like Mercurial (Hg). Other sites can give those flavours if needed.</p>
|
| 30 |
+
<p>Once you understand the conceptual differences between CVS/SVN and Git, and then subsequently start to use Git, you may find it very difficult to go back. You should really start to experiment only if you think you're going to migrate in the near future, because using Git is like watching TV in colour: once you've discovered it, it's really difficult to go back to black & white.</p>
|
| 31 |
+
<dl>
|
| 32 |
+
<dd>☞
|
| 33 |
+
<b>Once you start to use a DVCS, it's very unlikely you'll want to go back</b>
|
| 34 |
+
</dd>
|
| 35 |
+
</dl>
|
| 36 |
+
<h2 id="Centralised_version_control_systems">Centralised version control systems</h2>
|
| 37 |
+
<p>So, what do you need to know about Git? Well, both CVS and SVN are known as
|
| 38 |
+
<i>centralised</i> version control systems (CVCS). That is, there is one Master repository where people share code; everyone checks out their code (or branch) from that repository, and checks changes back in. For code that needs to be sent person-to-person (for example, for review, or as a way of contributing fixes), it is possible to create a
|
| 39 |
+
<i>patch</i>, which is a diff of your code against the given Master repository version (often HEAD, but sometimes a branch like Eclipse_35).
|
| 40 |
+
</p>
|
| 41 |
+
<p>Two problems surface with a centralised version control system, although they aren't immediately obvious: </p>
|
| 42 |
+
<ul>
|
| 43 |
+
<li>You need to be 'online' to perform actions, like diff or patch
|
| 44 |
+
<a href="#reference-1">[1</a>].
|
| 45 |
+
</li>
|
| 46 |
+
<li>Patches generated against a particular branch can become outdated fairly quickly as development of the snapshot-in-time branch moves on (e.g. when it is time to apply the patch, HEAD is different than it was when the patch was generated).</li>
|
| 47 |
+
</ul>
|
| 48 |
+
<p>
|
| 49 |
+
<a href="#ref-1">[1</a>]
|
| 50 |
+
<i>(A note on SVN: since SVN keeps the last-known checkout, it's possible to do a limited set of operations while disconnected from SVN, like diff from the last-known checkout. However, in general, you are prevented from doing many of the operations that are possible while connected.)</i>
|
| 51 |
+
</p>
|
| 52 |
+
<p>The first problem is rarely apparent for those working with Eclipse in a location at (or near) the repository itself. Those in the same continent will rarely experience delays due to global network variation; in addition, they tend to be employed in an organisation and sit at a desktop connected to wired networking for most of the day. Road warriors (those with laptops and who code from the local coffee shop) tend to operate in a more frequently disconnected mode, which limits repository functionality to when they are connected.</p>
|
| 53 |
+
<p>The second problem is simply an artifact of the way in which patches work. These are generally performed against HEAD (a snapshot in time) and then applied later (sometimes months or even
|
| 54 |
+
<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=4922" target="egit_external">eight years later</a>). Although they record the version of the file they were patched against, the patch itself is sensitive to big changes in the file, sometimes leading to the patch being inapplicable. Even relatively simple operations, like a file rename, can throw a well-formed CVCS patch out of the window.
|
| 55 |
+
</p>
|
| 56 |
+
<h2 id="Distributed_Version_Control_Systems">Distributed Version Control Systems</h2>
|
| 57 |
+
<p>Distributed Version Control Systems (DVCS) are a family of version control systems unlike those with which many are familiar. Two of the most popular are
|
| 58 |
+
<a href="http://www.git-scm.org" target="egit_external">Git</a> and
|
| 59 |
+
<a href="http://mercurial.selenic.com" target="egit_external">Hg</a>, although others (
|
| 60 |
+
<a href="http://darcs.net/" target="egit_external">Darcs</a>,
|
| 61 |
+
<a href="http://bazaar.canonical.com/en/" target="egit_external">Bazaar</a>,
|
| 62 |
+
<a href="http://www.bitkeeper.com/" target="egit_external">Bitkeeper</a>, etc.) exist. In a DVCS each user has a complete copy of the repository, including its entire history. A user may potentially push changes to or pull changes from any other repository. Although policy may confer special status on one or more repositories, in principle every repository is a first-class citizen in the DVCS model. This stands in contrast to a centralised version control system, where every individual checks files into and out of an authoritative repository.
|
| 63 |
+
</p>
|
| 64 |
+
<dl>
|
| 65 |
+
<dd>☞
|
| 66 |
+
<b>Each user has a full copy of the repository</b>
|
| 67 |
+
</dd>
|
| 68 |
+
</dl>
|
| 69 |
+
<p>This initially sounds impossible, especially if you're used to centralised version control systems, and even more so if they involve pessimistic file-based locking. (If you do firmly want pessimistic locking, please stop reading here. Thanks.) Questions arise, like:</p>
|
| 70 |
+
<ol>
|
| 71 |
+
<li>If everyone has a copy of the repository, don't all the forks diverge?</li>
|
| 72 |
+
<li>Where is the master repository kept?</li>
|
| 73 |
+
<li>Isn't the repository, like, really big?</li>
|
| 74 |
+
<li>No really, I like pessimistic locking.</li>
|
| 75 |
+
</ol>
|
| 76 |
+
<p>Let's answer each one of these questions in turn. (If I missed your favourite question, then please feel free to add one in the comments.)</p>
|
| 77 |
+
<ol>
|
| 78 |
+
<li>Yes, the forks
|
| 79 |
+
<i>can</i> diverge. But after all, open-source can diverge anyway. There's nothing stopping me from forking the <code>dev.eclipse.org</code> codebase, and publishing my own version of it called
|
| 80 |
+
<a href="http://sourceforge.net/projects/rcpapps/files/maclipse/" target="egit_external">Maclipse</a>. The key thing here is that whilst forks are possible,
|
| 81 |
+
<i>forking is not a bad thing in itself</i>. After all, look at Linux and Android; originally, they shared a history, but are now different. XFree86 and X.Org
|
| 82 |
+
<a href="http://www.x.org/wiki/XorgFoundation" target="egit_external">split</a> over licensing issues. MySQL was forked to create
|
| 83 |
+
<a href="http://askmonty.org/wiki/index.php/MariaDB" target="egit_external">MariaDB</a>, and so on. The key thing about forks is that the best survive. X.Org is now the default X client, whereas XFree86 was the default beforehand. The jury is still out on MySQL versus MariaDB. And although Maclipse has been downloaded literally <span title="Actually, about one and a half thousand. That's more than I expected.">tens of times</span>, it hasn't caused a dent in Eclipse's growth.
|
| 84 |
+
<dl>
|
| 85 |
+
<dd>☞
|
| 86 |
+
<b>Forks happen</b>
|
| 87 |
+
</dd>
|
| 88 |
+
</dl>
|
| 89 |
+
</li>
|
| 90 |
+
<li>Do not try to bend the <span title="spoon">master repository</span> – that's impossible. Instead, try only to realise the truth; there is no <span title="spoon">master repository</span>. In fact, there's a veritable matrix of master repositories possible. Each repository can be considered a node in a graph; nodes in the graph can be connected to each other in any way. However, rather than an n-n set of links, the graph usually self-organises into a tree-like structure, logically associating with one point that acts as a funnel for everything else. In a sense, that's a master repository – everyone has already made the choice; now you have to understand it. Should an oracle intervene, a neo-master can be chosen.
|
| 91 |
+
<dl>
|
| 92 |
+
<dd>☞
|
| 93 |
+
<b>There is no master repository</b>
|
| 94 |
+
</dd>
|
| 95 |
+
</dl>
|
| 96 |
+
</li>
|
| 97 |
+
<li>Given that there is no master repository, it becomes clear that the repository must live in its entirety on each of the nodes in the DVCS. This usually leads to fears about the size of the repository, even taking into account that storage is cheap. A key point here is that DVCS repositories are usually far
|
| 98 |
+
<i>smaller</i> than their counterpart CVCS repositories, not least of the reasons for which being that everyone has to have a full repository in order to do any work. It's a natural consequence that they're smaller. However, they're smaller also because each repository contains far less scope than a CVCS repository. For example, most organisations will have one mammoth CVCS repository with several thousand top-level 'modules' (or 'projects') underneath. Because of the administrative overhead of 'creating a new repository', it is often easier to reuse the same one for everything. (SVN put some limits on how wide it could grow, which CVS tended not to have; but even so, the main
|
| 99 |
+
<a href="http://svn.apache.org/viewvc?view=revision&revision=908283" target="egit_external">Apache SVN</a> is over 900k revisions.) By contrast, a DVCS is usually nothing more than a directory with a few administrative files inside. It doesn't require administrator privileges or specific ports; in fact, since there's no central server to speak of, it doesn't even need to be shared by network protocols. As a result, a DVCS repository is much more granular – and easy to create – than a conventional CVCS repository. Firstly, it's always on your machine (there's no centralised server to configure) and secondly, all you need access to is a file system. So typically, a DVCS “repository” will often be at the level of an Eclipse project or project working set. For example, although the [
|
| 100 |
+
<a href="http://dev.eclipse.org/viewcvs/index.cgi/?root=RT_Project" target="egit_external">http://dev.eclipse.org/viewcvs/index.cgi/?root=RT_Project</a> CVS <span title="RunTime">RT</span> repository] is shared by
|
| 101 |
+
<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.equinox/?root=RT_Project" target="egit_external">Equinox</a> and
|
| 102 |
+
<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.ecf/?root=RT_Project&view=log" target="egit_external">ECF</a>, a DVCS-based solution would almost certainly see the Equinox and ECF projects in their own repositories; perhaps, even breaking down further into (say) ECF-Doc and ECF-Bundles. Think of a DVCS repository as one or a few Eclipse projects instead of hundreds of projects together.
|
| 103 |
+
<dl>
|
| 104 |
+
<dd>☞
|
| 105 |
+
<b>DVCS repositories are much smaller, typically because they contain only a small number of highly-related projects</b>
|
| 106 |
+
</dd>
|
| 107 |
+
</dl>
|
| 108 |
+
</li>
|
| 109 |
+
<li>That's not a question. Look, if you want the benefits of a centralised DVCS with pessimistic locking and pessimistic users, then go look at
|
| 110 |
+
<a href="http://www-01.ibm.com/software/awdtools/clearcase/" target="egit_external">ClearCase</a>.
|
| 111 |
+
<dl>
|
| 112 |
+
<dd>☞
|
| 113 |
+
<b>Friends don't let friends use ClearCase</b>
|
| 114 |
+
</dd>
|
| 115 |
+
</dl>
|
| 116 |
+
</li>
|
| 117 |
+
</ol>
|
| 118 |
+
<h2 id="How_does_it_work.3F">How does it work?</h2>
|
| 119 |
+
<p>There are two pieces of information that identify elements in a CVCS; a file's
|
| 120 |
+
<i>name</i>, and its
|
| 121 |
+
<i>version</i> (sometimes called
|
| 122 |
+
<i>revision</i>). In the case of CVS, each file has its own version stream (1.1, 1.2, 1.3), whilst in SVN, each changeset has a 'repository revision' number. Tags (or branches) are symbolic identifiers which may be attached to any specific set of files or repository revision, and are mostly for human consumption (e.g. HEAD, trunk, ECLIPSE_35).
|
| 123 |
+
</p>
|
| 124 |
+
<p>This doesn't work in a DVCS. Because there is no central repository, there is no central repository version number (either for the repository as a whole, or for individual files).</p>
|
| 125 |
+
<p>Instead, a DVCS operates at the level of a
|
| 126 |
+
<i>changeset</i>. Logically, a repository is made up of an initial (empty) state, followed by many changesets. (A changeset is merely a change to a set of files; if you think 'patch' from CVS or SVN, you're not far off.)
|
| 127 |
+
</p>
|
| 128 |
+
<p>Identifying a changeset is much harder. We can't use a (global) revision number, because that concept isn't used. Instead, a changeset is represented as a hash of its contents. For example, given the changeset:</p>
|
| 129 |
+
<pre>--- a/README.txt
|
| 130 |
+
+++ b/README.txt
|
| 131 |
+
@@ -1 +1 @@
|
| 132 |
+
-SVN is great
|
| 133 |
+
+Git is great
|
| 134 |
+
</pre>
|
| 135 |
+
<p>we can create a 'hash' using (for example) <code>md5</code>, to generate the string <code>0878a8189e6a3ae1ded86d9e9c7cbe3f</code>. When referring to our change with others, we can use this hash to identify the change in question.</p>
|
| 136 |
+
<dl>
|
| 137 |
+
<dd>☞
|
| 138 |
+
<b>Changesets are identified by a hash of their contents</b>
|
| 139 |
+
</dd>
|
| 140 |
+
</dl>
|
| 141 |
+
<p>Clearly, though, this doesn't work on its own. What happens if we do the same change later on? It would have the same change, and we don't want the same hash value.</p>
|
| 142 |
+
<p>What happens is that a changeset contains two things; the change itself, and a back-pointer to the previous changeset. In other words, we end up with something like:</p>
|
| 143 |
+
<pre>previous: 48b2179994d494485b79504e8b5a6b23ce24a026
|
| 144 |
+
--- a/README.txt
|
| 145 |
+
+++ b/README.txt
|
| 146 |
+
@@ -1 +1 @@
|
| 147 |
+
-SVN is great
|
| 148 |
+
+Git is great
|
| 149 |
+
</pre>
|
| 150 |
+
<dl>
|
| 151 |
+
<dd>☞
|
| 152 |
+
<b>Changesets (recursively) contain pointers to the previous changeset</b>
|
| 153 |
+
</dd>
|
| 154 |
+
</dl>
|
| 155 |
+
<p>Now, if we were to have the same change again, the
|
| 156 |
+
<i>previous</i> value would be different, so we'd get a different hash value. We could set up an argument:
|
| 157 |
+
</p>
|
| 158 |
+
<pre>previous: 48b2179994d494485b79504e8b5a6b23ce24a026
|
| 159 |
+
--- a/README.txt
|
| 160 |
+
+++ b/README.txt
|
| 161 |
+
@@ -1 +1 @@
|
| 162 |
+
-SVN is great
|
| 163 |
+
+Git is great
|
| 164 |
+
</pre>
|
| 165 |
+
<pre>previous: 8cafc7ecd01d86977d2af254fc400cee
|
| 166 |
+
--- a/README.txt
|
| 167 |
+
+++ b/README.txt
|
| 168 |
+
@@ -1 +1 @@
|
| 169 |
+
-Git is great
|
| 170 |
+
+SVN is great
|
| 171 |
+
</pre>
|
| 172 |
+
<pre>previous: cba3ef5b2d1101c2ac44846dc4cdc6f4
|
| 173 |
+
--- a/README.txt
|
| 174 |
+
+++ b/README.txt
|
| 175 |
+
@@ -1 +1 @@
|
| 176 |
+
-Git is great
|
| 177 |
+
+SVN is great
|
| 178 |
+
</pre>
|
| 179 |
+
<p>Each time, the value of the changeset includes a pointer to what comes before, so the hash is continually changing.</p>
|
| 180 |
+
<p>
|
| 181 |
+
<b>Note</b>: Rather than using <code>md5</code>, as shown here, most DVCS (including Git) use an <code>sha1</code> hash instead. Also, the exact way that the prior elements in the tree are stored, and their relationships, isn't accurately portrayed above; however, it gives sufficiently well the idea of how they are organised.
|
| 182 |
+
</p>
|
| 183 |
+
<dl>
|
| 184 |
+
<dd>☞
|
| 185 |
+
<b>Git changesets are identified by an SHA-1 hash</b>
|
| 186 |
+
</dd>
|
| 187 |
+
</dl>
|
| 188 |
+
<h2 id="Changesets_and_branches">Changesets and branches</h2>
|
| 189 |
+
<p>Given that a changeset is a long value like <code>48b2179994d494485b79504e8b5a6b23ce24a026</code>, it can be unfriendly to use. Fortunately, there are a couple of ways around this. Git, like other DVCSs, allow you to use an abbreviated form of the changeset, provided that it's unique in the repository. For small repositories, this means that you can refer to changesets by really short values, like <code>48b21</code> or even <code>48</code>. Conventionally, developers often use 6 digits of the hash – but large projects (like the Linux kernel) tend to have to use slightly larger references in order to have uniqueness.</p>
|
| 190 |
+
<dl>
|
| 191 |
+
<dd>☞
|
| 192 |
+
<b>Git hashes can be shortened to any unique prefix</b>
|
| 193 |
+
</dd>
|
| 194 |
+
</dl>
|
| 195 |
+
<p>The current version of your repository is simply a pointer to the end of the tree. For this reason, it's often referred to as a
|
| 196 |
+
<i>tip</i>, but <code>HEAD</code> is the symbolic identifier for what the current repository is pointing to. Similarly, any branch can be referred to by its changeset id, which includes that and all prior changes. The default branch is usually called
|
| 197 |
+
<i>main</i>.
|
| 198 |
+
</p>
|
| 199 |
+
<dl>
|
| 200 |
+
<dd>☞
|
| 201 |
+
<b>The default 'trunk' is called 'main' in Git</b>
|
| 202 |
+
</dd>
|
| 203 |
+
<dd>☞
|
| 204 |
+
<b>The tip of the current branch is referred to as 'HEAD</b>'
|
| 205 |
+
</dd>
|
| 206 |
+
</dl>
|
| 207 |
+
<p>As a direct corollary to this, creating branches in a DVCS is fast. All that happens is that the repository on disk is updated to point to a different element in the (already physically present) tree, and you're done. Furthermore, it's trivial to ping-pong between different branches on the same repository that may contain different states and evolve independently.</p>
|
| 208 |
+
<dl>
|
| 209 |
+
<dd>☞
|
| 210 |
+
<b>Creating, and switching between, branches is fast</b>
|
| 211 |
+
</dd>
|
| 212 |
+
</dl>
|
| 213 |
+
<p>Because branching is so fast, branches get used for things that a user of a CVCS wouldn't normally use branching for. For example, each bug in Bugzilla could have a new branch associated with it; if a couple of independent features are being worked on concurrently, they'd get their own branch; if you needed to drop back to do maintenance work on an ECLIPSE_35 branch, then you'd switch to a branch for that as well. Branches get created at least as frequently as
|
| 214 |
+
<a href="http://www.peterfriese.de/using-cvs-change-sets/" target="egit_external">changesets</a> might in CVS, if not more so.
|
| 215 |
+
</p>
|
| 216 |
+
<dl>
|
| 217 |
+
<dd>☞
|
| 218 |
+
<b>Create a new branch for each Bugzilla or feature item that you work on</b>
|
| 219 |
+
</dd>
|
| 220 |
+
<dd>☞
|
| 221 |
+
<b>Think of branches as throwaway changesets</b>
|
| 222 |
+
</dd>
|
| 223 |
+
</dl>
|
| 224 |
+
<h2 id="Merging">Merging</h2>
|
| 225 |
+
<p>With great power comes great flexibility, but ultimately, you want to get your changes into some kind of merged stream (like
|
| 226 |
+
<i>main</i>). One of the fears of unconstrained branching is that of unconstrained merge pains later on. SVN makes this slightly less difficult than CVS, but unless you merge to HEAD frequently, you can easily get lost – particularly when refactorings start happening.
|
| 227 |
+
</p>
|
| 228 |
+
<dl>
|
| 229 |
+
<dd>☞
|
| 230 |
+
<b>It's painful to merge in a CVCS; therefore branches tend not to happen</b>
|
| 231 |
+
</dd>
|
| 232 |
+
</dl>
|
| 233 |
+
<p>Fortunately, DVCSs are all about merging. Given that each node in the changeset tree contains a pointer to its previous node (and transitively, to the beginning of time), it's much more powerful than the standard flat CVCS diff. In other words, not only do you know what changes need to be made, but also
|
| 234 |
+
<i>at what point in history they need to be made</i>. So, if you have a changeset that renames a file, and then merge in a changeset that points to the file as it was before it was renamed, a CVCS will just fall over; but a DVCS will be able to apply the change
|
| 235 |
+
<i>before</i> the rename occurred, and then play forward the changes.
|
| 236 |
+
</p>
|
| 237 |
+
<p>Merges are just the weaving together of two (or more) local branches into one. The
|
| 238 |
+
<a href="http://www.kernel.org/pub/software/scm/git/docs/git-merge.html" target="egit_external">git merge</a> documentation has some graphical examples of this; but basically, it's just like any other merge you've seen. However, unlike CVCS, you don't have to specify anything about where you're merging from and to; the trees automatically know what their split point was in the past, and can work it out from there.
|
| 239 |
+
</p>
|
| 240 |
+
<dl>
|
| 241 |
+
<dd>☞
|
| 242 |
+
<b>Merging in a DVCS like Git is trivial</b>
|
| 243 |
+
</dd>
|
| 244 |
+
</dl>
|
| 245 |
+
<h2 id="Pulling_and_pushing">Pulling and pushing</h2>
|
| 246 |
+
<p>So far, we've not talked much about the distributed nature of DVCS. Implicitly, though, the changes and ideas above are all to support distribution.</p>
|
| 247 |
+
<p>Given that a DVCS tree is merely a pointer to a branch (which transitively contains a long list of previous branches), and that each one of these nodes is identified by its hash, then you and I can share the same revision identifiers for common parts of our tree. There are three cases to consider for comparing our two trees:</p>
|
| 248 |
+
<ul>
|
| 249 |
+
<li>Your tip is an ancestor of my tip</li>
|
| 250 |
+
<li>My tip is an ancestor of your tip</li>
|
| 251 |
+
<li>Neither of our tips are direct ancestors; however, we both share a common ancestor</li>
|
| 252 |
+
</ul>
|
| 253 |
+
<p>The first two cases are trivial; if we synchronise trees, they just become a fast-forward merge. In fact, if that occurs, chances are you won't know who is ahead of the other; it will just happen.</p>
|
| 254 |
+
<p>The last case is only slightly more tricky; a common ancestor must be found; say, <code>746d6c</code>. Then I send changes between my tip and <code>746d6c</code>, and you send changes between your tip and <code>746d6c</code>. That way, we both end up with the same contents on our repositories.</p>
|
| 255 |
+
<p>Changes flow between repositories by
|
| 256 |
+
<i>push</i> and
|
| 257 |
+
<i>pull</i> operations. In essence, it doesn't matter whether I push my changes to you, or you pull my changes from me; the net result is the same. However, in the case of Eclipse.org infrastructure, it's likely that a central Git repository will be writable only by Eclipse committers. Thus, if I contribute a fix, I can ask a committer to pull the fix from my repository, and then they (after reviewing, and optionally rebasing) can push the fix to the Eclipse.org repository.
|
| 258 |
+
</p>
|
| 259 |
+
<p>The best part of a DVCS is that it takes care of all the paperwork for you. You don't need to use SVN-like <code>314:321</code> tags to remind you where you branched from; you don't even have to worry if you haven't updated recently. It all just works.</p>
|
| 260 |
+
<dl>
|
| 261 |
+
<dd>☞
|
| 262 |
+
<b>Pulling and pushing in a DVCS like Git is trivial</b>
|
| 263 |
+
</dd>
|
| 264 |
+
</dl>
|
| 265 |
+
<h2 id="Cloning_and_remotes">Cloning and remotes</h2>
|
| 266 |
+
<p>Where you can push (or pull) to is configured on a per (local) repository basis. Typically, if you clone an existing project, then a
|
| 267 |
+
<i>remote name</i> called
|
| 268 |
+
<i>origin</i> is automatically set up for you. For example, if you wanted to get hold of
|
| 269 |
+
<a href="http://git.eclipse.org/cgit.cgi/babel/org.eclipse.babel.server.git/" target="egit_external"> org.eclipse.babel.server.git</a>, then you could do:
|
| 270 |
+
</p>
|
| 271 |
+
<pre>git clone git://git.eclipse.org/gitroot/babel/org.eclipse.babel.server.git
|
| 272 |
+
</pre>
|
| 273 |
+
<p>We can then keep up-to-date with what's happening on the remote server by executing a pull from the remote:</p>
|
| 274 |
+
<pre>git pull origin
|
| 275 |
+
</pre>
|
| 276 |
+
<p>...but we're not limited to one repository. Let's say we wanted to create a separate copy on
|
| 277 |
+
<a href="http://www.github.com" target="egit_external">GitHub</a> for easy forking; we can do that by adding another remote Git URL and then pushing to that:
|
| 278 |
+
</p>
|
| 279 |
+
<pre>git remote add github <a href="http://github.com/alblue/babel.git" target="egit_external">http://github.com/alblue/babel.git</a>
|
| 280 |
+
git push github
|
| 281 |
+
</pre>
|
| 282 |
+
<p>We can now use <code>git push</code> and <code>git pull</code> to move items between the two git repositories. By default, they both refer to the special-named
|
| 283 |
+
<i>origin</i>, but you can specify whatever remote to talk to on the command line.
|
| 284 |
+
</p>
|
| 285 |
+
<dl>
|
| 286 |
+
<dd>☞
|
| 287 |
+
<b>Origin is the name of the default remote, but you can have many remotes per repository.</b>
|
| 288 |
+
</dd>
|
| 289 |
+
</dl>
|
| 290 |
+
<h2 id="Initialising.2C_committing_and_branching">Initialising, committing and branching</h2>
|
| 291 |
+
<p>To create a new Git repository, the <code>git init</code> command is used. This creates an empty repository in the current directory. They can, but often don't, end with <code>.git</code> – typically it's only repositories pushed to remote servers that use the <code>.git</code> extension. As noted above, a Git repository should ideally hold only one or a few highly related/coupled projects.</p>
|
| 292 |
+
<dl>
|
| 293 |
+
<dd>☞
|
| 294 |
+
<b>'git init' creates a fresh repository in the current directory</b>
|
| 295 |
+
</dd>
|
| 296 |
+
</dl>
|
| 297 |
+
<p>Git allows you to commit files, much like any other VCS. Each commit may be a single file, or many files; and a message goes along with it. Unlike other VCS, Git has a separate concept of an
|
| 298 |
+
<i>index</i>, which is a set of files that would be committed. You can think of it as an active changeset; as you're working on multiple files, you want only some changes to be committed as a unit. These files get <code>git add</code>ed to the index first, then <code>git commit</code>ted subsequently. (If you don't like this behaviour, there's a <code>git commit -a</code> option, which performs as CVS or SVN would.)
|
| 299 |
+
</p>
|
| 300 |
+
<dl>
|
| 301 |
+
<dd>☞
|
| 302 |
+
<b>'git add' is used to add files and track changes to files</b>
|
| 303 |
+
</dd>
|
| 304 |
+
<dd>☞
|
| 305 |
+
<b>'git commit' is used to commit tracked files</b>
|
| 306 |
+
</dd>
|
| 307 |
+
</dl>
|
| 308 |
+
<p>To create branches, you can use <code>git branch</code> (which creates, but does not switch to, the new branch) and <code>git checkout</code> (which switches to the new branch). A shorthand for new branches is <code>git checkout -b</code>, which creates-and-switches to a branch. At any point, <code>git branch</code> shows you a list of branches and marks the current one with a * next to the name.</p>
|
| 309 |
+
<dl>
|
| 310 |
+
<dd>☞
|
| 311 |
+
<b>'git branch' is used to create and list branches</b>
|
| 312 |
+
</dd>
|
| 313 |
+
<dd>☞
|
| 314 |
+
<b>'git checkout' is used to switch branches</b>
|
| 315 |
+
</dd>
|
| 316 |
+
<dd>☞
|
| 317 |
+
<b>'git checkout -b' is used to create and then switch branches</b>
|
| 318 |
+
</dd>
|
| 319 |
+
</dl>
|
| 320 |
+
<h2 id="Worked_example">Worked example</h2>
|
| 321 |
+
<p>Here's a transcript of working with setting up an initial repository, then copying data to and from a 'remote' repository, albeit in a different directory on the same system. The instructions are for a Unix-like environment (e.g. Cygwin on Windows).</p>
|
| 322 |
+
<pre>$ mkdir /tmp/example
|
| 323 |
+
$ cd /tmp/example
|
| 324 |
+
$ git init
|
| 325 |
+
Initialized empty Git repository in /tmp/example/.git/
|
| 326 |
+
$ echo "Hello, world" > README.txt
|
| 327 |
+
$ git commit # Won't commit files by default
|
| 328 |
+
# On branch main
|
| 329 |
+
#
|
| 330 |
+
# Initial commit
|
| 331 |
+
#
|
| 332 |
+
# Untracked files:
|
| 333 |
+
# (use "git add <file>..." to include in what will be committed)
|
| 334 |
+
#
|
| 335 |
+
# README.txt
|
| 336 |
+
nothing added to commit but untracked files present (use "git add" to track)
|
| 337 |
+
$ git add README.txt # Similar to Team -> Add to Version Control
|
| 338 |
+
$ # git commit # Would prompt for message
|
| 339 |
+
$ git commit -m "Added README.txt"
|
| 340 |
+
[main (root-commit) 0dd1f35] Added README.txt
|
| 341 |
+
1 files changed, 1 insertions(+), 0 deletions(-)
|
| 342 |
+
create mode 100644 README.txt
|
| 343 |
+
$ echo "Hello, solar system" > README.txt
|
| 344 |
+
$ git commit
|
| 345 |
+
# On branch main
|
| 346 |
+
# Changed but not updated:
|
| 347 |
+
# (use "git add <file>..." to update what will be committed)
|
| 348 |
+
# (use "git checkout -- <file>..." to discard changes in working directory)
|
| 349 |
+
#
|
| 350 |
+
# modified: README.txt
|
| 351 |
+
#
|
| 352 |
+
no changes added to commit (use "git add" and/or "git commit -a")
|
| 353 |
+
$ git commit -a -m "Updated README.txt"
|
| 354 |
+
[main 9b1939a] Updated README.txt
|
| 355 |
+
1 files changed, 1 insertions(+), 1 deletions(-)
|
| 356 |
+
$ git log --graph --oneline # Shows graph nodes (not much here) and change info
|
| 357 |
+
* 9b1939a Updated README.txt
|
| 358 |
+
* 0dd1f35 Added README.txt
|
| 359 |
+
$ git checkout -b french 0dd1f35 # create and switch to a new branch 'french'
|
| 360 |
+
Switched to a new branch 'french'
|
| 361 |
+
$ cat README.txt
|
| 362 |
+
Hello, world
|
| 363 |
+
$ echo "Bonjour, tout le monde" > README.txt
|
| 364 |
+
$ git add README.txt # or commit -a
|
| 365 |
+
$ git commit -m "Ajouté README.txt"
|
| 366 |
+
[french 66a644c] Ajouté README.txt
|
| 367 |
+
1 files changed, 1 insertions(+), 1 deletions(-)
|
| 368 |
+
$ git log --graph --oneline
|
| 369 |
+
* 66a644c Ajouté README.txt
|
| 370 |
+
* 0dd1f35 Added README.txt
|
| 371 |
+
$ git checkout -b web 0dd1f35 # Create and checkout a branch 'web' from initial commit
|
| 372 |
+
$ echo '<a href="<a href="http://git.eclipse.org" target="egit_external">http://git.eclipse.org</a>">git.eclipse.org</a>' > index.html
|
| 373 |
+
$ git add index.html
|
| 374 |
+
$ git commit -m "Added homepage"
|
| 375 |
+
[web d47e30c] Added homepage
|
| 376 |
+
1 files changed, 1 insertions(+), 0 deletions(-)
|
| 377 |
+
create mode 100644 index.html
|
| 378 |
+
$ git checkout main
|
| 379 |
+
$ git branch # See what branches we've got
|
| 380 |
+
french
|
| 381 |
+
* main
|
| 382 |
+
web
|
| 383 |
+
$ git merge web # pull 'web' into current branch 'main'
|
| 384 |
+
Merge made by recursive.
|
| 385 |
+
index.html | 1 +
|
| 386 |
+
1 files changed, 1 insertions(+), 0 deletions(-)
|
| 387 |
+
create mode 100644 index.html
|
| 388 |
+
$ git checkout french # Switch to 'french' branch
|
| 389 |
+
Switched to branch 'french'
|
| 390 |
+
$ git merge web # And merge in the same
|
| 391 |
+
Merge made by recursive.
|
| 392 |
+
index.html | 1 +
|
| 393 |
+
1 files changed, 1 insertions(+), 0 deletions(-)
|
| 394 |
+
create mode 100644 index.html
|
| 395 |
+
$ git log --graph --oneline
|
| 396 |
+
* e974231 Merge branch 'web' into french
|
| 397 |
+
|\
|
| 398 |
+
| * d47e30c Added homepage
|
| 399 |
+
* | 66a644c Ajouté README.txt
|
| 400 |
+
|/
|
| 401 |
+
* 0dd1f35 Added README.txt
|
| 402 |
+
$ git checkout main
|
| 403 |
+
$ git log --graph --oneline
|
| 404 |
+
* e3de4de Merge branch 'web'
|
| 405 |
+
|\
|
| 406 |
+
| * d47e30c Added homepage
|
| 407 |
+
* | 9b1939a Updated README.txt
|
| 408 |
+
|/
|
| 409 |
+
* 0dd1f35 Added README.txt
|
| 410 |
+
$ (mkdir /tmp/other;cd /tmp/other;git init) # Could do this in other process
|
| 411 |
+
$ (cd /tmp/other;git config --bool core.bare true) # Need to tell git that /tmp/other is a bare repository so we can "push" to it
|
| 412 |
+
Initialized empty Git repository in /tmp/other/.git/
|
| 413 |
+
$ git remote add other /tmp/other # could be a URL over http/git
|
| 414 |
+
$ git push other main # push branch 'main' to remote repository 'other'
|
| 415 |
+
Counting objects: 11, done.
|
| 416 |
+
Delta compression using up to 2 threads.
|
| 417 |
+
Compressing objects: 100% (7/7), done.
|
| 418 |
+
Writing objects: 100% (11/11), 981 bytes, done.
|
| 419 |
+
Total 11 (delta 1), reused 0 (delta 0)
|
| 420 |
+
Unpacking objects: 100% (11/11), done.
|
| 421 |
+
To /tmp/other
|
| 422 |
+
* [new branch] main -> main
|
| 423 |
+
$ git push --all other # Push all branches to 'other'
|
| 424 |
+
Counting objects: 8, done.
|
| 425 |
+
Delta compression using up to 2 threads.
|
| 426 |
+
Compressing objects: 100% (3/3), done.
|
| 427 |
+
Writing objects: 100% (5/5), 567 bytes, done.
|
| 428 |
+
Total 5 (delta 0), reused 0 (delta 0)
|
| 429 |
+
Unpacking objects: 100% (5/5), done.
|
| 430 |
+
To /tmp/other
|
| 431 |
+
* [new branch] french -> french
|
| 432 |
+
* [new branch] web -> web
|
| 433 |
+
$ cd /tmp/other # Switch to 'other' repository. git commands now apply to this repository
|
| 434 |
+
$ git config --bool core.bare false # need to allow this repository to have checked out files
|
| 435 |
+
$ ls # Nothing to be seen, but it's there
|
| 436 |
+
$ git branch
|
| 437 |
+
french
|
| 438 |
+
* main
|
| 439 |
+
web
|
| 440 |
+
$ git checkout web # Get the contents of the 'web' branch in other
|
| 441 |
+
$ ls
|
| 442 |
+
README.txt index.html
|
| 443 |
+
$ echo '<h1>Git rocks!</h1>' >> index.html
|
| 444 |
+
$ git commit -a -m "Added Git Rocks!"
|
| 445 |
+
[web 510621a] Added Git Rocks
|
| 446 |
+
1 files changed, 1 insertions(+), 0 deletions(-)
|
| 447 |
+
$ cd /tmp/example # Back to first repo. git commands now apply to 'example' repository
|
| 448 |
+
$ git pull other web # Pull changes from 'other' repo 'web' branch
|
| 449 |
+
remote: Counting objects: 5, done.
|
| 450 |
+
remote: Compressing objects: 100% (3/3), done.
|
| 451 |
+
remote: Total 3 (delta 0), reused 0 (delta 0)
|
| 452 |
+
Unpacking objects: 100% (3/3), done.
|
| 453 |
+
From /tmp/other
|
| 454 |
+
* branch web -> FETCH_HEAD
|
| 455 |
+
Merge made by recursive.
|
| 456 |
+
index.html | 1 +
|
| 457 |
+
1 files changed, 1 insertions(+), 0 deletions(-)
|
| 458 |
+
$ git log --graph --oneline
|
| 459 |
+
* 146932f Merge branch 'web' of /tmp/other
|
| 460 |
+
|\
|
| 461 |
+
| * 510621a Added Git Rocks
|
| 462 |
+
* | e3de4de Merge branch 'web'
|
| 463 |
+
|\ \
|
| 464 |
+
| |/
|
| 465 |
+
| * d47e30c Added homepage
|
| 466 |
+
* | 9b1939a Updated README.txt
|
| 467 |
+
|/
|
| 468 |
+
* 0dd1f35 Added README.txt
|
| 469 |
+
</pre>
|
| 470 |
+
<h2 id="Rebasing_and_fast-forwarding">Rebasing and fast-forwarding</h2>
|
| 471 |
+
<p>Often, you'll work on a branch for a while and then want to commit it to the repository. You can do this at any point, but it's considered good practice to
|
| 472 |
+
<i>rebase</i> your local branch before doing so. For example, you can end up with multiple branches in the log (with <code>git log --graph --oneline</code>):
|
| 473 |
+
</p>
|
| 474 |
+
<pre>* f0fde4e Merge change I11dc6200
|
| 475 |
+
|\
|
| 476 |
+
| * 86dfb92 Mark the next version as 0.6
|
| 477 |
+
* | 0c8c04d Merge change I908e4c77
|
| 478 |
+
|\ \
|
| 479 |
+
| |/
|
| 480 |
+
|/|
|
| 481 |
+
| * 843dc8f Add support for logAllRefUpdates configuration parameter
|
| 482 |
+
* | 74ba6fc Remove TODO file and move to bugzilla
|
| 483 |
+
* | ba7c6e8 Fix SUBMITTING_PATCHES to follow the Eclipse IP process
|
| 484 |
+
* | c5e8589 Fix tabs-to-spaces in SUBMITTING_PATCHES
|
| 485 |
+
* | 677ca7b Update SUBMITTING_PATCHES to point to Contributor Guide
|
| 486 |
+
* | 8847865 Document protected members of RevObjectList
|
| 487 |
+
* | a0a0ce8 Make it possible to clear a PlotCommitList
|
| 488 |
+
* | 4a3870f Include description for missing bundle prereqs
|
| 489 |
+
|/
|
| 490 |
+
* 144b16d Cleanup MANIFEST.MF in JGit
|
| 491 |
+
</pre>
|
| 492 |
+
<p>What happened here was that two branches split off from change <code>144b16d</code>, ultimately driving another branch at <code>74ba6fc</code> and a few merges (at <code>0c8c04d</code> and <code>f0fde4e</code>). (You can see a similar effect in
|
| 493 |
+
<a href="http://code.google.com/p/wave-protocol/source/list" target="egit_external">Google Code's Hg view of Wave Protocol</a>.) Ultimately, whilst the DVCS can handle these long-running branches and subsequent merges, humans tend to prefer to see fewer branches in the final repository.
|
| 494 |
+
</p>
|
| 495 |
+
<p>A
|
| 496 |
+
<i>fast-forward</i> merge (in Git terms) is one which doesn't need any kind of merge operation. This usually happens when you are moving from an older branch to a newer branch on the same timeline; such as when updating to a newer version from a remote repository. These are essentially just moving the HEAD pointer further down the branch.
|
| 497 |
+
</p>
|
| 498 |
+
<p>A
|
| 499 |
+
<i>rebase</i> is uprooting the branch from the original commit, and re-writing history as if it had been done from the current point in time. For example, in the above Git trace, <code>1441b16d</code> to <code>843dc8f</code> to <code>0c8c04d</code> was only one commit off the main tree. Had the change been rebased on <code>74ba6fc</code>, then we would have only seen a single timeline across those commits. It's generally considered good practice to rebase changes prior to pushing to a remote tree to avoid these kind of fan-outs, but it's not necessary to do so. Furthermore, the rebase operation changes the <code>sha1</code> hashes of your tree, which can affect those who have forked your repository. Best practice is to frequently rebase your changes in your own local repository, but once they've been made public (by pushing to a shared repository) to avoid rebasing further.
|
| 500 |
+
</p>
|
| 501 |
+
<dl>
|
| 502 |
+
<dd>☞
|
| 503 |
+
<b>Rebasing replants your tree; but do it on local branches only</b>
|
| 504 |
+
</dd>
|
| 505 |
+
</dl><hr class="navigation-separator"/>
|
| 506 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 507 |
+
<tr>
|
| 508 |
+
<td style="width: 20%" align="left"></td>
|
| 509 |
+
<td style="width: 60%" align="center"></td>
|
| 510 |
+
<td style="width: 20%" align="right">
|
| 511 |
+
<a href="Updating-This-Document.html" title="Updating This Document">
|
| 512 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 513 |
+
</a>
|
| 514 |
+
</td>
|
| 515 |
+
</tr>
|
| 516 |
+
<tr>
|
| 517 |
+
<td style="width: 20%" align="left" valign="top"></td>
|
| 518 |
+
<td style="width: 60%" align="center"></td>
|
| 519 |
+
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
|
| 520 |
+
</tr>
|
| 521 |
+
</table>
|
| 522 |
+
</body>
|
| 523 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/Git_For_Eclipse_Users/Updating-This-Document.html
CHANGED
|
@@ -1,3 +1,55 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>Git for Eclipse Users - Updating This Document</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Updating This Document</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Git-For-Eclipse-Users.html" title="Git for Eclipse Users">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right"></td>
|
| 21 |
+
</tr>
|
| 22 |
+
<tr>
|
| 23 |
+
<td style="width: 20%" align="left" valign="top">Git for Eclipse Users</td>
|
| 24 |
+
<td style="width: 60%" align="center"></td>
|
| 25 |
+
<td style="width: 20%" align="right" valign="top"></td>
|
| 26 |
+
</tr>
|
| 27 |
+
</table><hr class="navigation-separator"/>
|
| 28 |
+
<h1 id="Updating_This_Document">Updating This Document</h1>
|
| 29 |
+
<p> This document is maintained in a collaborative wiki. If you wish to
|
| 30 |
+
update or modify this document please visit
|
| 31 |
+
|
| 32 |
+
<a href="https://wiki.eclipse.org/EGit/Git_For_Eclipse_Users" target="egit_external">https://wiki.eclipse.org/EGit/Git_For_Eclipse_Users</a>
|
| 33 |
+
</p><hr class="navigation-separator"/>
|
| 34 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 35 |
+
<tr>
|
| 36 |
+
<td style="width: 20%" align="left">
|
| 37 |
+
<a href="Git-For-Eclipse-Users.html" title="Git for Eclipse Users">
|
| 38 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 39 |
+
</a>
|
| 40 |
+
</td>
|
| 41 |
+
<td style="width: 60%" align="center">
|
| 42 |
+
<a href="Git-For-Eclipse-Users.html" title="Git for Eclipse Users">
|
| 43 |
+
<img alt="Git for Eclipse Users" border="0" src="../../images/home.gif"/>
|
| 44 |
+
</a>
|
| 45 |
+
</td>
|
| 46 |
+
<td style="width: 20%" align="right"></td>
|
| 47 |
+
</tr>
|
| 48 |
+
<tr>
|
| 49 |
+
<td style="width: 20%" align="left" valign="top">Git for Eclipse Users</td>
|
| 50 |
+
<td style="width: 60%" align="center"></td>
|
| 51 |
+
<td style="width: 20%" align="right" valign="top"></td>
|
| 52 |
+
</tr>
|
| 53 |
+
</table>
|
| 54 |
+
</body>
|
| 55 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/New_and_Noteworthy/6.8/6.8.html
CHANGED
|
@@ -1,3 +1,71 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit 6.8 New and Noteworthy</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">EGit 6.8 New and Noteworthy</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left"></td>
|
| 15 |
+
<td style="width: 60%" align="center"></td>
|
| 16 |
+
<td style="width: 20%" align="right">
|
| 17 |
+
<a href="Contributors.html" title="Contributors">
|
| 18 |
+
<img alt="Next" border="0" src="../../../images/next.gif"/>
|
| 19 |
+
</a>
|
| 20 |
+
</td>
|
| 21 |
+
</tr>
|
| 22 |
+
<tr>
|
| 23 |
+
<td style="width: 20%" align="left" valign="top"></td>
|
| 24 |
+
<td style="width: 60%" align="center"></td>
|
| 25 |
+
<td style="width: 20%" align="right" valign="top">Contributors</td>
|
| 26 |
+
</tr>
|
| 27 |
+
</table><hr class="navigation-separator"/>
|
| 28 |
+
<h1 id="EGit">EGit</h1>
|
| 29 |
+
<h2 id="Features">Features</h2>
|
| 30 |
+
<ul>
|
| 31 |
+
<li>
|
| 32 |
+
<a href="https://eclip.se/451508" target="egit_external">451508</a> DeleteBranchOperation: bulk delete branches for deleting multiple branches
|
| 33 |
+
</li>
|
| 34 |
+
<li>
|
| 35 |
+
<a href="https://eclip.se/342790" target="egit_external">342790</a> Include the Gerrit change ID footer if a revert is done in a repository for which including such a footer is configured
|
| 36 |
+
</li>
|
| 37 |
+
<li>
|
| 38 |
+
<a href="https://eclip.se/582380" target="egit_external">582380</a> CommitHelper: retrieve MERGE_MSG for resolved merge conflict when reverting a commit raises conflicts
|
| 39 |
+
</li>
|
| 40 |
+
</ul>
|
| 41 |
+
<h3 id="Build_and_Release_Engineering">Build and Release Engineering</h3>
|
| 42 |
+
<ul>
|
| 43 |
+
<li>
|
| 44 |
+
<a href="https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/3137" target="egit_external">Git repositories were migrated</a> to
|
| 45 |
+
<a href="https://eclipse.gerrithub.io/admin/repos/q/filter:eclipse" target="egit_external">GerritHub</a> including all review data. See the blog
|
| 46 |
+
<a href="https://gitenterprise.me/category/jgit-2/" target="egit_external">14 Years of JGit/EGit Code Reviews migrated to GerritHub</a>.
|
| 47 |
+
</li>
|
| 48 |
+
<li>Generate SBOMs using cyclonedx maven plugin</li>
|
| 49 |
+
</ul>
|
| 50 |
+
<h2 id="Other_Changes">Other Changes</h2>
|
| 51 |
+
<p>The complete list of new features and bug fixes is available in the
|
| 52 |
+
<a href="https://projects.eclipse.org/projects/technology.egit/releases/6.8.0/" target="egit_external">release notes</a>.
|
| 53 |
+
</p><hr class="navigation-separator"/>
|
| 54 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 55 |
+
<tr>
|
| 56 |
+
<td style="width: 20%" align="left"></td>
|
| 57 |
+
<td style="width: 60%" align="center"></td>
|
| 58 |
+
<td style="width: 20%" align="right">
|
| 59 |
+
<a href="Contributors.html" title="Contributors">
|
| 60 |
+
<img alt="Next" border="0" src="../../../images/next.gif"/>
|
| 61 |
+
</a>
|
| 62 |
+
</td>
|
| 63 |
+
</tr>
|
| 64 |
+
<tr>
|
| 65 |
+
<td style="width: 20%" align="left" valign="top"></td>
|
| 66 |
+
<td style="width: 60%" align="center"></td>
|
| 67 |
+
<td style="width: 20%" align="right" valign="top">Contributors</td>
|
| 68 |
+
</tr>
|
| 69 |
+
</table>
|
| 70 |
+
</body>
|
| 71 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/New_and_Noteworthy/6.8/Contributors.html
CHANGED
|
@@ -1,3 +1,64 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit 6.8 New and Noteworthy - Contributors</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Contributors</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="6.8.html" title="EGit 6.8 New and Noteworthy">
|
| 16 |
+
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="See-Also.html" title="See Also">
|
| 22 |
+
<img alt="Next" border="0" src="../../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">EGit 6.8 New and Noteworthy</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">See Also</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Contributors">Contributors</h1>
|
| 33 |
+
<p>The following 5 developers worked on this release:
|
| 34 |
+
Andrey Loskutov,
|
| 35 |
+
Jörg Kubitz,
|
| 36 |
+
Matthias Sohn,
|
| 37 |
+
Michael Keppler,
|
| 38 |
+
Thomas Wolf</p><hr class="navigation-separator"/>
|
| 39 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 40 |
+
<tr>
|
| 41 |
+
<td style="width: 20%" align="left">
|
| 42 |
+
<a href="6.8.html" title="EGit 6.8 New and Noteworthy">
|
| 43 |
+
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
|
| 44 |
+
</a>
|
| 45 |
+
</td>
|
| 46 |
+
<td style="width: 60%" align="center">
|
| 47 |
+
<a href="6.8.html" title="EGit 6.8 New and Noteworthy">
|
| 48 |
+
<img alt="EGit 6.8 New and Noteworthy" border="0" src="../../../images/home.gif"/>
|
| 49 |
+
</a>
|
| 50 |
+
</td>
|
| 51 |
+
<td style="width: 20%" align="right">
|
| 52 |
+
<a href="See-Also.html" title="See Also">
|
| 53 |
+
<img alt="Next" border="0" src="../../../images/next.gif"/>
|
| 54 |
+
</a>
|
| 55 |
+
</td>
|
| 56 |
+
</tr>
|
| 57 |
+
<tr>
|
| 58 |
+
<td style="width: 20%" align="left" valign="top">EGit 6.8 New and Noteworthy</td>
|
| 59 |
+
<td style="width: 60%" align="center"></td>
|
| 60 |
+
<td style="width: 20%" align="right" valign="top">See Also</td>
|
| 61 |
+
</tr>
|
| 62 |
+
</table>
|
| 63 |
+
</body>
|
| 64 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/New_and_Noteworthy/6.8/See-Also.html
CHANGED
|
@@ -1,3 +1,61 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit 6.8 New and Noteworthy - See Also</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">See Also</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="Contributors.html" title="Contributors">
|
| 16 |
+
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Updating-This-Document.html" title="Updating This Document">
|
| 22 |
+
<img alt="Next" border="0" src="../../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">Contributors</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="See_Also">See Also</h1>
|
| 33 |
+
<p>See also the
|
| 34 |
+
<a href="../../../JGit/New_and_Noteworthy/6.8/6.8.html" title="JGit/New_and_Noteworthy/6.8">new features in JGit</a> for additional information.
|
| 35 |
+
</p><hr class="navigation-separator"/>
|
| 36 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 37 |
+
<tr>
|
| 38 |
+
<td style="width: 20%" align="left">
|
| 39 |
+
<a href="Contributors.html" title="Contributors">
|
| 40 |
+
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
|
| 41 |
+
</a>
|
| 42 |
+
</td>
|
| 43 |
+
<td style="width: 60%" align="center">
|
| 44 |
+
<a href="6.8.html" title="EGit 6.8 New and Noteworthy">
|
| 45 |
+
<img alt="EGit 6.8 New and Noteworthy" border="0" src="../../../images/home.gif"/>
|
| 46 |
+
</a>
|
| 47 |
+
</td>
|
| 48 |
+
<td style="width: 20%" align="right">
|
| 49 |
+
<a href="Updating-This-Document.html" title="Updating This Document">
|
| 50 |
+
<img alt="Next" border="0" src="../../../images/next.gif"/>
|
| 51 |
+
</a>
|
| 52 |
+
</td>
|
| 53 |
+
</tr>
|
| 54 |
+
<tr>
|
| 55 |
+
<td style="width: 20%" align="left" valign="top">Contributors</td>
|
| 56 |
+
<td style="width: 60%" align="center"></td>
|
| 57 |
+
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
|
| 58 |
+
</tr>
|
| 59 |
+
</table>
|
| 60 |
+
</body>
|
| 61 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/New_and_Noteworthy/6.8/Updating-This-Document.html
CHANGED
|
@@ -1,3 +1,55 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit 6.8 New and Noteworthy - Updating This Document</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Updating This Document</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="See-Also.html" title="See Also">
|
| 16 |
+
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right"></td>
|
| 21 |
+
</tr>
|
| 22 |
+
<tr>
|
| 23 |
+
<td style="width: 20%" align="left" valign="top">See Also</td>
|
| 24 |
+
<td style="width: 60%" align="center"></td>
|
| 25 |
+
<td style="width: 20%" align="right" valign="top"></td>
|
| 26 |
+
</tr>
|
| 27 |
+
</table><hr class="navigation-separator"/>
|
| 28 |
+
<h1 id="Updating_This_Document">Updating This Document</h1>
|
| 29 |
+
<p> This document is maintained in a collaborative wiki. If you wish to
|
| 30 |
+
update or modify this document please visit
|
| 31 |
+
|
| 32 |
+
<a href="https://wiki.eclipse.org/EGit/New_and_Noteworthy/6.8" target="egit_external">https://wiki.eclipse.org/EGit/New_and_Noteworthy/6.8</a>
|
| 33 |
+
</p><hr class="navigation-separator"/>
|
| 34 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 35 |
+
<tr>
|
| 36 |
+
<td style="width: 20%" align="left">
|
| 37 |
+
<a href="See-Also.html" title="See Also">
|
| 38 |
+
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
|
| 39 |
+
</a>
|
| 40 |
+
</td>
|
| 41 |
+
<td style="width: 60%" align="center">
|
| 42 |
+
<a href="6.8.html" title="EGit 6.8 New and Noteworthy">
|
| 43 |
+
<img alt="EGit 6.8 New and Noteworthy" border="0" src="../../../images/home.gif"/>
|
| 44 |
+
</a>
|
| 45 |
+
</td>
|
| 46 |
+
<td style="width: 20%" align="right"></td>
|
| 47 |
+
</tr>
|
| 48 |
+
<tr>
|
| 49 |
+
<td style="width: 20%" align="left" valign="top">See Also</td>
|
| 50 |
+
<td style="width: 60%" align="center"></td>
|
| 51 |
+
<td style="width: 20%" align="right" valign="top"></td>
|
| 52 |
+
</tr>
|
| 53 |
+
</table>
|
| 54 |
+
</body>
|
| 55 |
+
</html>
|
Java开发环境安装/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/330/0/.cp/help/EGit/User_Guide/Concepts.html
CHANGED
|
@@ -1,3 +1,165 @@
|
|
| 1 |
-
version
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
| 2 |
+
<html xmlns="http://www.w3.org/1999/xhtml">
|
| 3 |
+
<head>
|
| 4 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
| 5 |
+
<title>EGit User Guide - Concepts</title>
|
| 6 |
+
<link type="text/css" rel="stylesheet" href="../../book.css"/>
|
| 7 |
+
</head>
|
| 8 |
+
<body>
|
| 9 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 10 |
+
<tr>
|
| 11 |
+
<th style="width: 100%" align="center" colspan="3">Concepts</th>
|
| 12 |
+
</tr>
|
| 13 |
+
<tr>
|
| 14 |
+
<td style="width: 20%" align="left">
|
| 15 |
+
<a href="User-Guide.html" title="EGit User Guide">
|
| 16 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 17 |
+
</a>
|
| 18 |
+
</td>
|
| 19 |
+
<td style="width: 60%" align="center"></td>
|
| 20 |
+
<td style="width: 20%" align="right">
|
| 21 |
+
<a href="Tasks.html" title="Tasks">
|
| 22 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 23 |
+
</a>
|
| 24 |
+
</td>
|
| 25 |
+
</tr>
|
| 26 |
+
<tr>
|
| 27 |
+
<td style="width: 20%" align="left" valign="top">EGit User Guide</td>
|
| 28 |
+
<td style="width: 60%" align="center"></td>
|
| 29 |
+
<td style="width: 20%" align="right" valign="top">Tasks</td>
|
| 30 |
+
</tr>
|
| 31 |
+
</table><hr class="navigation-separator"/>
|
| 32 |
+
<h1 id="Concepts">Concepts</h1>
|
| 33 |
+
<p>Git is built on a few simple and very powerful ideas. Knowing them helps to understand more easily how git works.</p>
|
| 34 |
+
<h2 id="Repository">Repository</h2>
|
| 35 |
+
<p>The Repository or Object Database stores all objects which make up the history of the project. All objects in this database are identified through a secure 20 byte
|
| 36 |
+
<a href="http://en.wikipedia.org/wiki/SHA-1" target="egit_external">SHA-1 hash</a> of the object content. This has several advantages:
|
| 37 |
+
</p>
|
| 38 |
+
<ul>
|
| 39 |
+
<li>comparing two objects boils down to comparing two SHA-1 hashes.</li>
|
| 40 |
+
<li>since object names are computed from the object content in the same way in every git repository, the same object will be stored under the same name in all repositories which happen to contain this object.</li>
|
| 41 |
+
<li>an object never changes once created (obvious since changing the contents means a new hash must be calculated and a new name assigned).</li>
|
| 42 |
+
<li>repository corruption can easily be detected by checking if the SHA-1 object name still is the secure hash of the object's content.</li>
|
| 43 |
+
</ul>
|
| 44 |
+
<p>Git has four object types :</p>
|
| 45 |
+
<ul>
|
| 46 |
+
<li>A
|
| 47 |
+
<b>Blob object</b> stores file content.
|
| 48 |
+
</li>
|
| 49 |
+
<li>A
|
| 50 |
+
<b>Tree object</b> stores the directory structure and contains
|
| 51 |
+
<b>Blob objects</b> and other
|
| 52 |
+
<b>Tree objects</b> together with their file system names and modes.
|
| 53 |
+
</li>
|
| 54 |
+
<li>A
|
| 55 |
+
<b>Commit object</b> represents a snapshot of the directory structure at the time of the commit and has a link to its predecessor
|
| 56 |
+
<b>Commit object</b> which form an acyclic graph of the repository revisions forming the repository history.
|
| 57 |
+
</li>
|
| 58 |
+
<li>A
|
| 59 |
+
<b>Tag object</b> is a symbolic named link to another repository object which contains the object's name and type. Optionally, it also contains information about who created the tag and other signing information.
|
| 60 |
+
</li>
|
| 61 |
+
</ul>
|
| 62 |
+
<p>The object database is stored in the <code>.git/objects</code> directory. Objects are either stored as loose objects or in a single-file packed format for efficient storage and transport.</p>
|
| 63 |
+
<p>
|
| 64 |
+
<b>Trust</b>
|
| 65 |
+
</p>
|
| 66 |
+
<p>Git provides a built-in trust chain through secure SHA-1 hashes which allows it to verify if objects obtained from a (potentially untrusted) source are correct and have not been modified since they have been created.</p>
|
| 67 |
+
<p>If you get the signed tag for e.g. a project release which you can verify with e.g. the tagger's (the project lead's) public signing key, git ensures that the chain of trust covers the following:</p>
|
| 68 |
+
<ul>
|
| 69 |
+
<li>the signed tag identifies a commit object.</li>
|
| 70 |
+
<li>the commit object represents exactly one project revision including its content and history.</li>
|
| 71 |
+
<li>the commit object contains the tree of blob objects and other tree objects representing the directory structure of the project revision.</li>
|
| 72 |
+
<li>the blob objects contain the file contents for this project revision.</li>
|
| 73 |
+
</ul>
|
| 74 |
+
<p>All of the involved object names can be checked for consistency using the SHA-1 algorithm to ensure the correctness of the project revision and that the entire history can be trusted.</p>
|
| 75 |
+
<h2 id="Index">Index</h2>
|
| 76 |
+
<p>The
|
| 77 |
+
<b>Git Index</b> is a binary file stored in the <code>.git/index</code> directory containing a sorted list of file names, file modes, and file meta data used to efficiently detect file modifications. It also contains the SHA-1 object names of blob objects.
|
| 78 |
+
</p>
|
| 79 |
+
<p>It has the following important properties:</p>
|
| 80 |
+
<ul>
|
| 81 |
+
<li>The index contains all information necessary to generate a single uniquely defined tree object. E.g. a commit operation generates this tree, stores it in the object database and associates it with the commit.</li>
|
| 82 |
+
<li>The index enables fast comparison of the tree it defines with the current working directory. This is achieved by storing additional meta data about the involved files in the index data.</li>
|
| 83 |
+
<li>The index can efficiently store information about merge conflicts between the trees involved in the merge so that for each pathname there is enough information about the involved trees to enable a three-way merge.</li>
|
| 84 |
+
</ul>
|
| 85 |
+
<h2 id="Branches">Branches</h2>
|
| 86 |
+
<p>A branch in Git is a named reference to a commit. There are two types of branches, namely "Local" and "Remote Tracking" branches which serve different purposes.</p>
|
| 87 |
+
<h3 id="Local_Branches">Local Branches</h3>
|
| 88 |
+
<p>Whenever a change to a (local) Repository is committed, a new commit object is created. Without any other means, it would be very difficult to keep track of the changes in the Repository, in particular when other commits are added to the Repository, for example due to an update from the remote Repository or when checking out another commit.</p>
|
| 89 |
+
<p>A local branch helps with this task by providing a (local) name by which the "current" commit can be found. When changes are committed to the local repository, the branch is automatically updated to point to the newly created commit.</p>
|
| 90 |
+
<p>In addition, it is possible to add a so-called upstream configuration to a local branch which can be helpful when synchronizing with a remote repository.</p>
|
| 91 |
+
<h3 id="Remote_Tracking_Branches">Remote Tracking Branches</h3>
|
| 92 |
+
<p>Remote tracking branches are created automatically when cloning and fetching from remote repositories. A remote tracking branch in the local repository always corresponds to a (local) branch in the remote repository. The name of such a branch follows certain conventions.</p>
|
| 93 |
+
<p>The remote tracking branch points to the same commit as the corresponding branch in the remote repository (at the time of the clone/fetch).</p>
|
| 94 |
+
<p>Remote tracking branches can be used for automated creation of upstream configuration for local branches.</p>
|
| 95 |
+
<h2 id="Working_Directory">Working Directory</h2>
|
| 96 |
+
<p>The working directory is the directory used to modify files for the next commit. By default it is located one level above the .git directory. Making a new commit typically involves the following steps:</p>
|
| 97 |
+
<ul>
|
| 98 |
+
<li>Check out the branch the new commit shall be based on. This changes the working directory so that it reflects the
|
| 99 |
+
<i>HEAD</i> revision of the branch.
|
| 100 |
+
</li>
|
| 101 |
+
<li>Do modifications in the working directory.</li>
|
| 102 |
+
<li>Tell git about these modifications (add modified files). This transfers the modified file contents into the object database and prepares the tree to be committed in the index.</li>
|
| 103 |
+
<li>Commit the tree prepared in the index into the object database.</li>
|
| 104 |
+
<li>The result is a new commit object and the
|
| 105 |
+
<i>HEAD</i> of the current branch moves to the new commit.
|
| 106 |
+
</li>
|
| 107 |
+
</ul>
|
| 108 |
+
<h2 id="Recording_Changes_in_the_Repository">Recording Changes in the Repository</h2>
|
| 109 |
+
<p>You start from a fresh checkout of a branch of a local repository. You want to do some changes and record snapshots of these changes in the repository whenever you reach a state you want to record.</p>
|
| 110 |
+
<p>Each file in the working directory can either be
|
| 111 |
+
<i>tracked</i> or
|
| 112 |
+
<i>untracked</i>:
|
| 113 |
+
</p>
|
| 114 |
+
<ul>
|
| 115 |
+
<li>
|
| 116 |
+
<b>Tracked</b> files are those which were in the last snapshot or files which have been newly staged into the
|
| 117 |
+
<i>index</i>. They can be
|
| 118 |
+
<i>unmodified</i>,
|
| 119 |
+
<i>modified</i>, or
|
| 120 |
+
<i>staged</i>.
|
| 121 |
+
</li>
|
| 122 |
+
<li>
|
| 123 |
+
<b>Untracked</b> files are all other files (they were not in the last snapshot and have not yet been added to the
|
| 124 |
+
<i>index</i>).
|
| 125 |
+
</li>
|
| 126 |
+
</ul>
|
| 127 |
+
<p>When you first clone a repository, all files in the working directory will be
|
| 128 |
+
<i>tracked</i> and
|
| 129 |
+
<i>unmodified</i> since they have been freshly checked out and you haven't started editing them yet.
|
| 130 |
+
</p>
|
| 131 |
+
<p>As you edit files, git will recognize they are
|
| 132 |
+
<i>modified</i> with respect to the last commit. You
|
| 133 |
+
<i>stage</i> the modified files into the index and then
|
| 134 |
+
<i>commit</i> the staged changes. The cycle can then repeat.
|
| 135 |
+
</p>
|
| 136 |
+
<p>This lifecycle is illustrated here:</p>
|
| 137 |
+
<p>
|
| 138 |
+
<img border="0" src="images/Egit-0.9-lifecycle-file.png"/>
|
| 139 |
+
</p><hr class="navigation-separator"/>
|
| 140 |
+
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
|
| 141 |
+
<tr>
|
| 142 |
+
<td style="width: 20%" align="left">
|
| 143 |
+
<a href="User-Guide.html" title="EGit User Guide">
|
| 144 |
+
<img alt="Previous" border="0" src="../../images/prev.gif"/>
|
| 145 |
+
</a>
|
| 146 |
+
</td>
|
| 147 |
+
<td style="width: 60%" align="center">
|
| 148 |
+
<a href="User-Guide.html" title="EGit User Guide">
|
| 149 |
+
<img alt="EGit User Guide" border="0" src="../../images/home.gif"/>
|
| 150 |
+
</a>
|
| 151 |
+
</td>
|
| 152 |
+
<td style="width: 20%" align="right">
|
| 153 |
+
<a href="Tasks.html" title="Tasks">
|
| 154 |
+
<img alt="Next" border="0" src="../../images/next.gif"/>
|
| 155 |
+
</a>
|
| 156 |
+
</td>
|
| 157 |
+
</tr>
|
| 158 |
+
<tr>
|
| 159 |
+
<td style="width: 20%" align="left" valign="top">EGit User Guide</td>
|
| 160 |
+
<td style="width: 60%" align="center"></td>
|
| 161 |
+
<td style="width: 20%" align="right" valign="top">Tasks</td>
|
| 162 |
+
</tr>
|
| 163 |
+
</table>
|
| 164 |
+
</body>
|
| 165 |
+
</html>
|