diff options
15 files changed, 317 insertions, 583 deletions
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml index 7eddf1a3d5..1cecfe5ea2 100644 --- a/org.eclipse.egit.doc/build-help.xml +++ b/org.eclipse.egit.doc/build-help.xml @@ -42,8 +42,8 @@ > <path name="EGit/User_Guide" title="EGit User Guide" /> <path name="JGit/User_Guide" title="JGit User Guide" /> - <path name="EGit/New_and_Noteworthy/4.9" title="EGit 4.9 New and Noteworthy" /> - <path name="JGit/New_and_Noteworthy/4.9" title="JGit 4.9 New and Noteworthy" /> + <path name="EGit/New_and_Noteworthy/4.11" title="EGit 4.11 New and Noteworthy" /> + <path name="JGit/New_and_Noteworthy/4.11" title="JGit 4.11 New and Noteworthy" /> <path name="EGit/Git_For_Eclipse_Users" title="Git for Eclipse Users" /> <path name="EGit/Contributor_Guide" title="EGit Contributor Guide" /> <stylesheet url="book.css" /> diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html index d043e6254c..59052f3156 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html @@ -36,7 +36,7 @@ <p>Prerequisites for the Maven build are</p> <ul> <li> - <a href="http://maven.apache.org/download.html" target="egit_external">at least Maven 3.0.0</a> + <a href="http://maven.apache.org/download.html" target="egit_external">at least Maven 3.5.2</a> </li> <li>see <a href="http://maven.apache.org/settings.html" target="egit_external">settings.xml reference</a> on how to do basic Maven configuration @@ -108,12 +108,12 @@ <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> org/eclipse/jgit/org.eclipse.jgit.repository/${JGIT_VERSION}/org.eclipse.jgit.repository-${JGIT_VERSION}.zip-unzip/ </pre> - <p>If you wan to build EGit for the specific Neon (4.6) platform, consider using the <code>egit-4.6</code> target platform:</p> - <pre>[~/src/egit] $ mvn -Dtarget-platform=egit-4.6 clean install + <p>If you wan to build EGit for the specific Photon (4.8) platform, consider using the <code>egit-4.8</code> target platform:</p> + <pre>[~/src/egit] $ mvn -Dtarget-platform=egit-4.8 clean install </pre> - <p>For EGit version 4.9, <code>egit-4.5</code> (Mars, Eclipse 4.5), <code>egit-4.6</code> (Neon, Eclipse 4.6), and <code>egit-4.7</code> (Oxygen, Eclipse 4.7) are available. In addition <code>egit-4.7-staging</code> refers to the Oxygen staging repository.</p> + <p>For EGit version 4.10, <code>egit-4.5</code> (Mars, Eclipse 4.5), <code>egit-4.6</code> (Neon, Eclipse 4.6), <code>egit-4.7</code> (Oxygen, Eclipse 4.7), and <code>egit-4.8</code> (Photon, Eclipse 4.8) are available. In addition <code>egit-4.8-staging</code> refers to the Photon staging repository.</p> <p>Upon a successful build, a p2 update site should be generated inside - <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. If you skip setting the system property <code>target-platform</code> the target platform for Eclipse 4.6 will be used. + <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.7. If you skip setting the system property <code>target-platform</code> the target platform for Eclipse 4.7 will be used. </p> <h2 id="JGit_Bazel_Build">JGit Bazel Build</h2> <p>Since Gerrit is built using @@ -159,16 +159,16 @@ <h2 id="Checking_for_JGit_API_Changes_using_API_Baseline">Checking for JGit API Changes using API Baseline</h2> <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> <ul> - <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.0</code>, find the p2 repository URLs + <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 <a href="http://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 </li> - <li>in Eclipse click "Preferences > Plug-In Development > API Baselines", click "Add Baseline..." and define a new baseline (e.g. egit-4.0) and point it to the local copy of the corresponding EGit p2 repository.</li> + <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> <li>the API tools will then raise warning/errors for all detected problems and provide quick fixes helping to resolve these problems</li> <li>see the <a href="http://wiki.eclipse.org/PDE/API_Tools/User_Guide" target="egit_external">PDE API Tools User Guide</a> for more details. </li> </ul> - <h2 id="Automated_Signing_and_Publishing">Automated Signing and Publishing</h2> + <h2 id="Signing_and_Publishing">Signing and Publishing</h2> <p>EGit and JGit builds running on the <a href="https://hudson.eclipse.org/egit/" target="egit_external">JGit/EGit Hudson</a> are automatically signed (using the @@ -186,18 +186,6 @@ latest stable branch: /home/data/httpd/download.eclipse.org/egit/updates-stable <i>download.eclipse.org</i> the maven profile <code>publish</code> must be enabled via the option <code>-P publish</code> in the egit build job. </li> </ul> - <h4 id="Signing_.28old_method.2C_replaced_by_automated_procedure.29">Signing (old method, replaced by automated procedure)</h4> - <p>To sign the EGit build, you need to have ssh access to build.eclipse.org and the ability to run - <b>/usr/bin/sign</b> - </p> - <p>At the moment, Chris Aniszczyk (caniszczyk) and Matthias Sohn (msohn) have signing privileges.</p> - <p>The first step is to ensure you're in a place you can sign on build.eclipse.org</p> - <pre>cd /home/data/httpd/download-staging.priv/commonBuild -</pre> - <p>Next you run the signing command (Usage: /usr/bin/sign <file> <mail|nomail> [outputDir]) on a zip of the EGit repo...</p> - <pre>sign egit-p2-repo.zip my@email.com /home/data/users/caniszczyk/egit-0.8 -</pre> - <p>After that, you can publish the zip that is generated with the signing information.</p> <h2 id="Contribution_to_Release_Train">Contribution to Release Train</h2> <p>The release train contribution for JGit and EGit is maintained in the git repository </p> <pre>ssh://git.eclipse.org/gitroot/simrel/org.eclipse.simrel.build.git diff --git a/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html b/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html index c3a0c7a34b..30bf98490a 100644 --- a/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html +++ b/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html @@ -494,7 +494,7 @@ $ git log --graph --oneline <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. </p> <p>A - <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>0c8c0fd</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. + <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. </p> <dl> <dd>☞ diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/4.11.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/4.11.html new file mode 100644 index 0000000000..32f21dcb4b --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/4.11.html @@ -0,0 +1,114 @@ +<?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"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>EGit 4.11 New and Noteworthy</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">EGit 4.11 New and Noteworthy</th> + </tr> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Contributors.html" title="Contributors"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Contributors</td> + </tr> + </table><hr class="navigation-separator"/> + <h1 id="EGit">EGit</h1> + <h2 id="Usability">Usability</h2> + <ul> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531328" target="egit_external">bug 531328</a>: Delete Repository dialog: use "Delete" instead of "OK" for button + </li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531431" target="egit_external">bug 531431</a>: Use "Close" instead of "Ok" on the confirmation button of FetchResultDialog + </li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531264" target="egit_external">bug 531264</a>: Discard Local Changes should use verbs if triggered from Staging View + </li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530685" target="egit_external">bug 530685</a>: Include local branch name in branch proposals of push branch wizard + </li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530685" target="egit_external">bug 530685</a>: Asynchronous content proposals for upstream refs in PushBranchPage + </li> + <li>Make the PushWizardDialog a NonBlockingWizardDialog</li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530757" target="egit_external">bug 530757</a>: Remove extra progress popup in PushBranchWizard + </li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=510945" target="egit_external">bug 510945</a>: Provide option to copy file names in staging view to clipboard + </li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530625" target="egit_external">bug 530625</a>: Select "ssh" protocol also for git-style URLs without scheme + </li> + <li>Avoid internal job being displayed in progress view</li> + </ul> + <h2 id="Performance_Improvements">Performance Improvements</h2> + <ul> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531948" target="egit_external">bug 531948</a>: Speed up getting the last commit that changed a file + </li> + </ul> + <h2 id="Bug_Fixes">Bug Fixes</h2> + <p> + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&resolution=DUPLICATE&classification=Technology&list_id=10006180&order=Importance&product=EGit&query_format=advanced&target_milestone=4.11" target="egit_external"> 15 Bugs and 2 enhancement requests</a> were closed + </p> + <ul> + <li>Fix CSS for dark theme [ + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531527" target="egit_external">https://bugs.eclipse.org/bugs/show_bug.cgi?id=531527</a>) + </li> + <li>{{bug bug 531527)</li> + <li>{{bug]: Prevent NPE in RefContentProposal.appendObjectSummary </li> + <li>Prevent MissingObjectException being logged in ref content proposal</li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=503198" target="egit_external">bug 503198</a>: Fix focus handling in GitHistoryPage + </li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530412" target="egit_external">bug 530412</a>: Fix wrongly used IExtension.getNamespaceIdentifier + </li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=521176" target="egit_external">bug 521176</a>: Fix non-modal PushResultDialog + </li> + <li> + <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=529950" target="egit_external">bug 529950</a>: More appealing layout on git project property page + </li> + </ul> + <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2> + <ul> + <li>Update orbit to S20180302171354 (photon) and R20180206163158 (oxygen)</li> + <li>Update tycho to 1.1.0</li> + <li>Upgrade gson to version 2.8.2 (used by JGit)</li> + <li>Upgrade commons-compress to 1.15 (used by JGit)</li> + <li>Add com.jcraft.jzlib 1.1.1 (CQ 15293, bug 529129)</li> + <li>Update API baselines in Oomph setup</li> + </ul><hr class="navigation-separator"/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Contributors.html" title="Contributors"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Contributors</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.9/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/Contributors.html index e4b356f0a8..6bef7ead19 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.9/Contributors.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/Contributors.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 4.9 New and Noteworthy - Contributors</title> + <title>EGit 4.11 New and Noteworthy - Contributors</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -12,7 +12,7 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="4.9.html" title="EGit 4.9 New and Noteworthy"> + <a href="4.11.html" title="EGit 4.11 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,33 +24,30 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">EGit 4.9 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 4.11 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> </table><hr class="navigation-separator"/> <h1 id="Contributors">Contributors</h1> - <p>The following 10 developers worked on this release:</p> - <p>Andreas Sewe, - David Weiser, + <p>The following 7 developers worked on this release:</p> + <p>Andrey Loskutov, Fabian Pfaff, - Karsten Thoms, + Jonas Hungershausen, Lars Vogel, - Martin Fleck, Matthias Sohn, Michael Keppler, - Stefan Rademacher, Thomas Wolf</p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="4.9.html" title="EGit 4.9 New and Noteworthy"> + <a href="4.11.html" title="EGit 4.11 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="4.9.html" title="EGit 4.9 New and Noteworthy"> - <img alt="EGit 4.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.11.html" title="EGit 4.11 New and Noteworthy"> + <img alt="EGit 4.11 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -60,7 +57,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">EGit 4.9 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 4.11 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.9/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/Updating-This-Document.html index 02586de9a7..e904259a97 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.9/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/Updating-This-Document.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 4.9 New and Noteworthy - Updating This Document</title> + <title>EGit 4.11 New and Noteworthy - Updating This Document</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -29,7 +29,7 @@ <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit - <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.9" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.9</a> + <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.11" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.11</a> </p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -39,8 +39,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="4.9.html" title="EGit 4.9 New and Noteworthy"> - <img alt="EGit 4.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.11.html" title="EGit 4.11 New and Noteworthy"> + <img alt="EGit 4.11 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"></td> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.9/4.9.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.9/4.9.html deleted file mode 100644 index ba26257501..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.9/4.9.html +++ /dev/null @@ -1,180 +0,0 @@ -<?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"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 4.9 New and Noteworthy</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">EGit 4.9 New and Noteworthy</th> - </tr> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Contributors.html" title="Contributors"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Contributors</td> - </tr> - </table><hr class="navigation-separator"/> - <h1 id="EGit">EGit</h1> - <h2 id="Features">Features</h2> - <ul> - <li>Adapt NetUtil.setSslVerification to honor http.<url>.sslVerify</li> - <li>Log warnings about invalid git config entries</li> - <li>Log warnings about invalid RefSpecs in git config files</li> - <li>Add ICommitMessageProvider2 for caret positioning in commit messages (Bug 516867)</li> - </ul> - <h2 id="Usability">Usability</h2> - <ul> - <li>Enable editing RefSpec on double click</li> - <li>Trim history search pattern</li> - <li>Added context actions 'Assume Unchanged' and 'Untrack' in staging view</li> - <li>Improve commit message validation & remove leading whitespace</li> - <li>Remove trailing whitespace from commit messages</li> - <li>Use verbs for button labels in UnmergedBranchDialog</li> - <li>Detached HEAD dialog should use verbs (close) instead of OK</li> - <li>Commit is not possible should use verbs instead of OK</li> - <li>Use verbs in RebaseResultDialog instead of OK - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518467" target="egit_external">bug 518467</a> - </li> - <li>New toolbar button to switch repositories in git views. This enables the user to quickly switch the staging view, the reflog view, the rebase interactive view, or the history view from one repository to another via a toolbar button with a drop-down menu listing all currently configured git repositories. (Bug 518607)</li> - <li>Add descriptive message to directory browsers</li> - <li>Set window title in smart import wizard</li> - <li>Make EGit text viewers react to font and color preference changes - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=484097" target="egit_external">bug 484097</a> - </li> - <li>Improve hard-wrapping in commit messages to properly show long URLs - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=519012" target="egit_external">bug 519012</a> - </li> - <li>FetchGerritChangePage: supply patch set number in the background - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518492" target="egit_external">bug 518492</a> - </li> - <li>FetchGerritChangePage: auto-supply highest patch set number - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518492" target="egit_external">bug 518492</a> - </li> - <li>Use "Check Out" for the default button in checkout confirmation dialog - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=511691" target="egit_external">bug 511691</a> - </li> - <li>Improve texts shown for the copy command</li> - <li>FetchGerritChangePage: also try to determine the patch set number - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518492" target="egit_external">bug 518492</a> - </li> - <li>FetchGerritChangePage: validate change ref a little more strictly</li> - <li>FetchGerritChangePage: validate change ref against advertised refs</li> - <li>FetchGerritChangePage: improve content assist - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518495" target="egit_external">bug 518495</a> - </li> - <li>Use verbs in PushResultDialog instead of OK - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518044" target="egit_external">bug 518044</a> - </li> - <li>Staging view: add toolbar buttons to stage/unstage all files - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518213" target="egit_external">bug 518213</a> - </li> - <li>Contextual actions in tooltips in staging view. If there are selected elements in the staged/unstaged viewers, provide quick access to the "Add to index"/"Remove from index" actions via a toolbar shown in a tooltip when the mouse pointer hovers over a selected element. - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=516969" target="egit_external">bug 516969</a> - </li> - <li>Change the icons for clone, add, and create repositories - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=347081" target="egit_external">bug 347081</a> - </li> - <li>Icon clean-up: use PNG, provide HiDPI versions, include SVG sources - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=517169" target="egit_external">bug 517169</a>, - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=517171" target="egit_external">bug 517171</a> - </li> - <li>Improve Decoration Support for ResourceMappings - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=498546" target="egit_external">bug 498546</a> - </li> - </ul> - <h2 id="Performance_Improvements">Performance Improvements</h2> - <ul> - <li>Reduce allocations in git decorator - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=500106" target="egit_external">bug 500106</a> - </li> - </ul> - <h2 id="Bug_Fixes">Bug Fixes</h2> - <p> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&resolution=DUPLICATE&classification=Technology&list_id=10006180&order=Importance&product=EGit&query_format=advanced&target_milestone=4.9.0" target="egit_external"> 30 Bugs and 7 enhancement requests</a> were closed - </p> - <ul> - <li>Fix NPE in ConnectProviderOperation - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=522423" target="egit_external">bug 522423</a> - </li> - <li>Fix NotHandledException for "org.eclipse.egit.ui.RepositoriesViewOpen" - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=521824" target="egit_external">bug 521824</a> - </li> - <li>Prevent NPE below RemoveOrDeleteRepositoryCommand - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=521826" target="egit_external">bug 521826</a> - </li> - <li>GitHistoryPage: search widget must not react to font changes</li> - <li>Update submodule nodes when submodule refs change - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=520694" target="egit_external">bug 520694</a> - </li> - <li>Correct listeners in IndexDiffCacheEntry - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=520694" target="egit_external">bug 520694</a> - </li> - <li>Prevent NPE in LaunchFinder - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=520033" target="egit_external">bug 520033</a> - </li> - <li>Adds mnemonic to "Select" button in the "Create Branch" Dialog - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=517776" target="egit_external">bug 517776</a> - </li> - <li>Ensure DiffFormatter is closed in CreatePatchOperation</li> - <li>Restrict resizing of the "Fetch from Gerrit" Dialog - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=519335" target="egit_external">bug 519335</a> - </li> - <li>Disable delete config section button in the configuration preference page for no selection</li> - <li>Reflog view: serialize asynchronous loading jobs - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=519431" target="egit_external">bug 519431</a> - </li> - <li>Fix alignment of buttons in git config preference pages</li> - <li>Git history: preference-based actions must run in the UI thread.</li> - <li>Fix history view showing only commit IDs sometimes - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=519104" target="egit_external">bug 519104</a> - </li> - <li>Correct synchronize info calculation for folders - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518646" target="egit_external">bug 518646</a> - </li> - <li>Staging View tooltips: work around bug 330384 on GTK - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=516969" target="egit_external">bug 516969</a> - </li> - <li>Fix the icon for the PullWithOptions command</li> - </ul> - <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2> - <ul> - <li>Add org.apache.commons.codec 1.9.0 to target platform</li> - <li>Update args4j to 2.33</li> - <li>Remove mylyn "latest" p2 repository from target platform</li> - <li>Remove easymport p2 repository from Mars target platform</li> - <li>Remove Mylyn wikitext from target platforms</li> - <li>Remove unnecessary runtime dependency on wikitext for doc bundle (Bug 519248)</li> - <li>Update Mylyn Wikitext update site URL</li> - <li>Oomph setup: include TPD and AnyEditTools</li> - <li>Update Oomph setup</li> - <li>Update mylyn github feature to require egit from same release</li> - </ul><hr class="navigation-separator"/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Contributors.html" title="Contributors"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Contributors</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html index 9417d9eff6..8bfbbdde60 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html @@ -283,9 +283,9 @@ <b>Remote name</b> - Define a name for the remote repository. The default is "origin". </li> </ul> - <p>The default root path for storing Git repositories can be configured in the preference + <p>The default root path for storing Git repositories can be configured in the Preference Menu - <b>Team > Git > Default Repository Folder</b> + <b>Window > Team > Git > Default Repository Folder</b> <br/> </p> @@ -748,7 +748,7 @@ <p>The Git label decorations can be switched on globally in the Preference Menu ( <b>Window > Preferences</b>) under <b>General > Appearance > Label Decorations</b>, and more detailed settings can be modified in Preferences under - <b>Team > Git > Label Decorations</b>. + <b>Window > Preferences > Team > Git > Label Decorations</b>. </p> <p>There are two different types of label decorations: text decorations and icon decorations.</p> <h4 id="Text_Decorations">Text Decorations</h4> @@ -2088,7 +2088,7 @@ Sein oder nicht sein <p>The "Git Repositories View" is the primary UI element to facilitate working with multiple Repositories simultaneously (i.e. within one Eclipse Workspace).</p> <p>This view can be opened using the menu path <br/> - <b>Windows > Show View > Other... > Git > Git Repositories</b> + <b>Window > Show View > Other... > Git > Git Repositories</b> </p> <p>It is also part of the "Git Repository Exploring" perspective available using menu path <br/> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html b/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html index 6e8d3ca893..89413ecaef 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/User-Guide.html @@ -34,6 +34,20 @@ <p>If you are coming from CVS, you can find common CVS workflows for Git <a href="http://wiki.eclipse.org/Platform-releng/Git_Workflows" title="Platform-releng/Git Workflows" target="egit_external">Platform-releng/Git Workflows</a>. </p> + <h3 id="The_Preferences_Dialog">The Preferences Dialog</h3> + <p>Many of the configurations you will make in Eclipse are found in the Preferences Dialog. + The Preferences Dialog is spawned, naturally enough, from a menu item labeled Preferences. + But the Preferences menu item is somewhat hard to find. + Preferences is located, not under the File or Edit menus, but under the Window menu.</p> + <ul> + <li>Click + <b>Window > Preferences</b> + </li> + </ul> + <p>Within the Preferences Dialog itself specific git options are also + <i>not</i> visible on the surface, but are found under the Team heading. You can also find the Git items in the Preferences Dialog by entering <code>git</code> as a filter string in the box where it, initially, says + <i>type filter text</i>. + </p> <h2 id="Basic_Tutorial:_Adding_a_project_to_version_control">Basic Tutorial: Adding a project to version control</h2> <h3 id="Configuration">Configuration</h3> <h4 id="Identifying_yourself">Identifying yourself</h4> @@ -50,7 +64,7 @@ </p> <ul> <li>Click - <b>Preferences > Team > Git > Configuration</b> + <b>Window > Preferences > Team > Git > Configuration</b> </li> <li>Click <b>New Entry</b> and enter the key value pairs <code>user.email</code> and <code>user.name</code> @@ -267,8 +281,8 @@ </p> <h3 id="Eclipse_SSH_Configuration">Eclipse SSH Configuration</h3> <ul> - <li>Open the Eclipse - <b>Preferences</b>. Navigate to and expand the Network Connections option and select SSH. Ensure that your SSH2 home is configured correctly (usually this is <tt>~/.ssh</tt>) and contains your SSH2 keys: + <li>Open the Eclipse Preference Dialog ( + <b>Window > Preferences</b>). Navigate to and expand the Network Connections option and select SSH. Ensure that your SSH2 home is configured correctly (usually this is <tt>~/.ssh</tt>) and contains your SSH2 keys: </li> </ul> <p> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/4.11.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/4.11.html new file mode 100644 index 0000000000..2efe2fa754 --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/4.11.html @@ -0,0 +1,129 @@ +<?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"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>JGit 4.11 New and Noteworthy</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">JGit 4.11 New and Noteworthy</th> + </tr> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Updating-This-Document.html" title="Updating This Document"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Updating This Document</td> + </tr> + </table><hr class="navigation-separator"/> + <h1 id="JGit">JGit</h1> + <h2 id="Features">Features</h2> + <ul> + <li>LFS: Enable LFS support for the CLI, better error handling</li> + <li>LFS: support merge/rebase/cherry-pick/diff/compare with LFS files</li> + <li>LFS: Dramatically improve checkout speed with SSH authentication</li> + <li>LFS: pre-push upload support</li> + <li>LFS: Add remote download to SmudgeFilter</li> + <li>Add ObjectIdSerializer</li> + <li>dfs: Try to avoid searching UNREACHABLE_GARBAGE during packing</li> + <li>RepoCommand: generate relative submodule URLs from absolute URLs.</li> + <li>RepoCommand: don't record new commit if tree did not change</li> + <li>RepoCommand: persist unreadable submodules in .gitmodules</li> + <li>Add negotiation statistics to PackStatistics</li> + <li>Basic submodule merge handling (bug 494551)</li> + <li>Add class to access WindowCache statistics</li> + <li>Progress reporting for checkout</li> + </ul> + <h2 id="Performance_Improvements">Performance Improvements</h2> + <ul> + <li>Add a minimum negotiation feature for fetch. Limits how many "have" lines the client sends. This feature is gated behind a "fetch.useminimalnegotiation" configuration flag, which defaults to false.</li> + <li>GC: Replace Files methods with File alternatives</li> + </ul> + <h2 id="Fixes">Fixes</h2> + <p> + <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&list_id=10006180&order=Importance&product=JGit&query_format=advanced&resolution=FIXED&resolution=DUPLICATE&target_milestone=4.11" target="egit_external"> 1 enhancement requests and 7 bugs</a> were closed + </p> + <ul> + <li>Fix DiffFormatter for diffs against working tree with autocrlf=true (bug 530106)</li> + <li>Fix processing of gitignore negations (bug 409664)</li> + <li>PathMatcher: fix handling of **/</li> + <li>Don't subclass ThreadLocal to avoid memory leak in NLS (bug 449321)</li> + <li>Set context classloader to null in WorkQueue (bug 517107)</li> + <li>Fix ssh host name handling for Jsch (bug 531118)</li> + <li>Fix that Jsch overrides the port in the URI with the one in ~/.ssh/config</li> + <li>InitCommand: Don't leave Repository open after Git is closed</li> + <li>MergedReftable to skip shadowed refs in same reftable</li> + <li>Fix CleanCommand not to throw FileNotFoundExceptions (bug 514434)</li> + <li>GC: Remove empty references folders</li> + <li>Close RevWalk in BranchTrackingStatus.of() (bug 530757)</li> + <li>Fix index blob for merges with CRLF translations (bug 499615)</li> + <li>Honor CRLF settings when writing merge results (bug 499615)</li> + <li>Minor improvements in git config file inclusions</li> + <li>Enforce DFS blockLimit is a multiple of blockSize</li> + <li>Skip broken symbolic ref in DfsReftableDatabase</li> + <li>Revert handling of ssh IdentityFile to pre-4.9 behavior (bug 529173)</li> + <li>RefDirectory#hasLooseRef: Fix stream resource leak reported by error-prone</li> + <li>Ensure DirectoryStream is closed promptly</li> + <li>Fix file handle leak in FetchCommand#fetchSubmodules (bug 526494)</li> + <li>Skip unborn branches in UploadPack</li> + <li>TransportLocal should reuse FS from source repo</li> + </ul> + <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2> + <ul> + <li>Upgrade spotbugs-maven-plugin to 3.1.2</li> + <li>Update orbit to S20180302171354 (photon) and R20180206163158 (oxygen)</li> + <li>Update tycho to 1.1.0</li> + <li>Bazel: Support building with Java 9</li> + <li>Update tycho to 1.1.0</li> + <li>Upgrade gson to version 2.8.2</li> + <li>Upgrade commons-compress to 1.15</li> + <li>Upgrade error_prone_core to 2.2.0</li> + <li>Upgrade Spotbugs to 3.1.1</li> + <li>Add com.jcraft.jzlib 1.1.1 (bug 529129)</li> + </ul> + <h2 id="Contributors">Contributors</h2> + <p>The following 17 contributors worked on this release:</p> + <p>Christian Halstrick, + Dave Borowitz, + David Ostrovsky, + David Pursehouse, + David Turner, + Han-Wen Nienhuys, + Hector Caballero, + Marc Strapetz, + Markus Duft, + Matthias Sohn, + Michael Keppler, + Minh Thai, + Shawn Pearce, + Terry Parker, + Thomas Wolf, + Tim Hosey, + Zhen Chen</p><hr class="navigation-separator"/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Updating-This-Document.html" title="Updating This Document"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Updating This Document</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/Updating-This-Document.html index a7bb3c5d4d..31758be6d2 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/Updating-This-Document.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 4.9 New and Noteworthy - Updating This Document</title> + <title>JGit 4.11 New and Noteworthy - Updating This Document</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -12,7 +12,7 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="Contributors.html" title="Contributors"> + <a href="4.11.html" title="JGit 4.11 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -20,7 +20,7 @@ <td style="width: 20%" align="right"></td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Contributors</td> + <td style="width: 20%" align="left" valign="top">JGit 4.11 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top"></td> </tr> @@ -29,24 +29,24 @@ <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit - <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.9" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.9</a> + <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.11" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.11</a> </p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="Contributors.html" title="Contributors"> + <a href="4.11.html" title="JGit 4.11 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="4.9.html" title="JGit 4.9 New and Noteworthy"> - <img alt="JGit 4.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="4.11.html" title="JGit 4.11 New and Noteworthy"> + <img alt="JGit 4.11 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"></td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">Contributors</td> + <td style="width: 20%" align="left" valign="top">JGit 4.11 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top"></td> </tr> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/4.9.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/4.9.html deleted file mode 100644 index cc69fea658..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/4.9.html +++ /dev/null @@ -1,121 +0,0 @@ -<?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"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 4.9 New and Noteworthy</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">JGit 4.9 New and Noteworthy</th> - </tr> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Bug-Fixes.html" title="Bug Fixes"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Bug Fixes</td> - </tr> - </table><hr class="navigation-separator"/> - <h1 id="JGit">JGit</h1> - <h2 id="Features">Features</h2> - <ul> - <li>Implement atomic BatchRefUpdates for RefDirectory. The existing packed-refs file provides a mechanism for implementing atomic multi-ref updates without any changes to the on-disk format or lockfile protocol. We just need to make sure that there are no loose refs involved in the transaction, which we can achieve by packing the refs while holding locks on all loose refs. Full details of the algorithm are in the PackedBatchRefUpdate javadoc.</li> - <li>reftable: new ref storage format. Some repositories contain a lot of references (e.g. android at 866k, rails at 31k). The reftable format provides: - <ul> - <li>Near constant time lookup for any single reference, even when the repository is cold and not in process or kernel cache.</li> - <li>Near constant time verification a SHA-1 is referred to by at least one reference (for allow-tip-sha1-in-want).</li> - <li>Efficient lookup of an entire namespace, such as `refs/tags/`.</li> - <li>Support atomic push `O(size_of_update)` operations.</li> - <li>Combine reflog storage with ref storage.</li> - </ul> - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=470318" target="egit_external">bug 470318</a> - Fetch submodule repo before resolving commits - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=374703" target="egit_external">bug 374703</a> - Handle SSL handshake failures in TransportHttp, use CredentialsProvider to inform the user - </li> - <li>Support http.<url>.* configs</li> - <li>Add BlobObjectChecker</li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=520978" target="egit_external">bug 520978</a> - Improve getting typed values from a Config to enable handling invalid configuration options - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=496170" target="egit_external">bug 496170</a> - Support most %-token substitutions in OpenSshConfig - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=490939" target="egit_external">bug 490939</a> - Let Jsch know about ~/.ssh/config. Ensure the Jsch instance used knows about ~/.ssh/config. This enables Jsch to honor more user configurations, in particular also the UserKnownHostsFile configuration, or additional identities given via multiple IdentityFile entries. - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=465167" target="egit_external">bug 465167</a> - Add support to follow HTTP redirects - <ul> - <li>Implement config setting http.followRedirects</li> - <li>Number of redirects followed can be limited by http.maxRedirects (default 5)</li> - </ul> - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=500106" target="egit_external">bug 500106</a> - Send a detailed event on working tree modifications to provide the foundations for better file change tracking - </li> - <li>Add dfs fsck implementation</li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=517128" target="egit_external">bug 517128</a> - Support -merge attribute in binary macro. The merger is now able to react to the use of the merge attribute. The value unset and the custom value 'binary' are handled (-merge and merge=binary) - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518377" target="egit_external">bug 518377</a> - Support --match functionality in DescribeCommand - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=517847" target="egit_external">bug 517847</a> - Allow to programmatically set FastForwardMode for PullCommand - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=474174" target="egit_external">bug 474174</a> - Add support for config option "pull.ff" - </li> - <li>Add a new singlePack option to PackConfig. If set, "singlePack" will create a single GC pack file for all objects reachable from refs/*. If not set, the GC pack will contain object reachable from refs/heads/* and refs/tags/*, and the GC_REST pack will contain all other reachable objects.</li> - <li>fetch: Accept any SHA-1 on left hand side of refspec</li> - </ul> - <h2 id="JGit_Command_Line">JGit Command Line</h2> - <ul> - <li>Added API to TextBuiltin for piped usage.</li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518377" target="egit_external">bug 518377</a> - Add --match option for `jgit describe` to CLI - </li> - </ul> - <h2 id="Performance_Improvements">Performance Improvements</h2> - <ul> - <li>ReceivePack: clear advertised .haves if application changes refs to avoid over-advertising ".have" lines</li> - <li>Reftable: see above</li> - </ul> - <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2> - <ul> - <li>Upgrade Maven compiler plugins</li> - <li>Add org.apache.commons.codec 1.9.0 to target platform</li> - <li>Update args4j to 2.33 (CQ: 11068)</li> - <li>Update Oxygen Orbit p2 repository to R20170516192513</li> - <li>Replace findbugs by spotbugs</li> - </ul><hr class="navigation-separator"/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Bug-Fixes.html" title="Bug Fixes"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Bug Fixes</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/Bug-Fixes.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/Bug-Fixes.html deleted file mode 100644 index 07a63ccee1..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/Bug-Fixes.html +++ /dev/null @@ -1,125 +0,0 @@ -<?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"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 4.9 New and Noteworthy - Bug Fixes</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Bug Fixes</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="4.9.html" title="JGit 4.9 New and Noteworthy"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Contributors.html" title="Contributors"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">JGit 4.9 New and Noteworthy</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Contributors</td> - </tr> - </table><hr class="navigation-separator"/> - <h1 id="Bug_Fixes">Bug Fixes</h1> - <p> - <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&list_id=10006180&order=Importance&product=JGit&query_format=advanced&resolution=FIXED&resolution=DUPLICATE&target_milestone=4.9" target="egit_external"> 2 enhancement requests and 23 bugs</a> were closed - </p> - <ul> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=521296" target="egit_external">bug 521296</a> - Fix missing RefsChangedEvent when packed refs are used - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=376369" target="egit_external">bug 376369</a> - Fix Daemon.stop() to actually stop the listener thread - </li> - <li>Remove workaround for bug in Java's ReferenceQueue which was fixed in Java 8. - <b>Minimum Java version 8-b100:</b> JGit 4.9 removes a - <a href="https://git.eclipse.org/r/#/c/104245/" target="egit_external">workaround</a> for a - <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6837858" target="egit_external">bug</a> in ReferenceQueue of Sun's Java 5, 6, 7 implementation. This bug was fixed in - <a href="http://hg.openjdk.java.net/jdk8/jdk8/jdk/rev/858c75eb83b5" target="egit_external">JDK 8-b100</a> hence this is the minimum supported Java version for JGit 4.9. - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=508801" target="egit_external">bug 508801</a> - Don't assume name = path in .gitmodules - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=515325" target="egit_external">bug 515325</a> - FetchCommand: pass on CredentialsProvider to submodule fetches - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=520920" target="egit_external">bug 520920</a> - Exclude file matching: fix backtracking on match failures after "**" - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=508568" target="egit_external">bug 508568</a> - Fix path pattern matching to work also for gitattributes - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=429625" target="egit_external">bug 429625</a> - Ignore invalid TagOpt values - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=519883" target="egit_external">bug 519883</a> - Fix default directory used to clone when setDirectory wasn't called - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=513043" target="egit_external">bug 513043</a> - Do authentication re-tries on HTTP POST - </li> - <li>Fix exception handling for opening bitmap index files</li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=393170" target="egit_external">bug 393170</a> - Do not apply pushInsteadOf to existing pushUris - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=520702" target="egit_external">bug 520702</a> - Record submodule paths with untracked changes as FileMode.GITLINK - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=520910" target="egit_external">bug 520910</a> - Ensure EOL stream type is DIRECT when -text attribute is present. Otherwise fancy combinations of attributes (binary or -text in combination with crlf or eol) may result in the corruption of binary data. - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=520677" target="egit_external">bug 520677</a> - Use relative paths for attribute rule matching - </li> - <li>Treat RawText of binary data as file with one single line. This avoids executing mergeAlgorithm.merge on binary data, which is unlikely to be useful.</li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=510685" target="egit_external">bug 510685</a> - Fix committing empty commits - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=519887" target="egit_external">bug 519887</a> - Fix JGit set core.fileMode to false by default instead of true for non Windows OS. - </li> - <li>Fix matching ignores and attributes pattern of form a/b/**.</li> - <li>Fix deleting symrefs</li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=518377" target="egit_external">bug 518377</a> - Fix bug in multiple tag handling on DescribeCommand - </li> - <li> - <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=393170" target="egit_external">bug 393170</a> - pushInsteadOf configuration is ignored by EGit. - <b>Note:</b> Up to now JGit mistakenly applied pushInsteadOf also to existing pushUris. If some repositories had relied on this mis-feature, pushes may newly suddenly fail (the uncritical case; the config just needs to be fixed) or even still succeed but push to unexpected places, namely to the non-rewritten pushUrls (the critical case). - </li> - </ul><hr class="navigation-separator"/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="4.9.html" title="JGit 4.9 New and Noteworthy"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="4.9.html" title="JGit 4.9 New and Noteworthy"> - <img alt="JGit 4.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Contributors.html" title="Contributors"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">JGit 4.9 New and Noteworthy</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Contributors</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/Contributors.html deleted file mode 100644 index 7131540ad4..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.9/Contributors.html +++ /dev/null @@ -1,80 +0,0 @@ -<?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"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 4.9 New and Noteworthy - Contributors</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">Contributors</th> - </tr> - <tr> - <td style="width: 20%" align="left"> - <a href="Bug-Fixes.html" title="Bug Fixes"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Updating-This-Document.html" title="Updating This Document"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Bug Fixes</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Updating This Document</td> - </tr> - </table><hr class="navigation-separator"/> - <h1 id="Contributors">Contributors</h1> - <p>The following 21 developers worked on this release of JGit :</p> - <p>Changcheng Xiao, - Christian Halstrick, - Dave Borowitz, - David Pursehouse, - David Turner, - Dmitry Pavlenko, - Han-Wen Nienhuys, - Joan Goyeau, - Jonathan Nieder, - Masaya Suzuki, - Mathieu Cartaud, - Matthias Sohn, - Mattias Neuling, - Michael FIG, - Ned Twigg, - Oliver Lockwood, - Robin Stocker, - Shawn Pearce, - Terry Parker, - Thomas Wolf, - Zhen Chen</p><hr class="navigation-separator"/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"> - <a href="Bug-Fixes.html" title="Bug Fixes"> - <img alt="Previous" border="0" src="../../../images/prev.gif"/> - </a> - </td> - <td style="width: 60%" align="center"> - <a href="4.9.html" title="JGit 4.9 New and Noteworthy"> - <img alt="JGit 4.9 New and Noteworthy" border="0" src="../../../images/home.gif"/> - </a> - </td> - <td style="width: 20%" align="right"> - <a href="Updating-This-Document.html" title="Updating This Document"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top">Bug Fixes</td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Updating This Document</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml index b93ccf799f..245763cde4 100644 --- a/org.eclipse.egit.doc/help/toc.xml +++ b/org.eclipse.egit.doc/help/toc.xml @@ -2,7 +2,9 @@ <toc topic="help/EGit/User_Guide/User-Guide.html" label="EGit Documentation"> <topic href="help/EGit/User_Guide/User-Guide.html" label="EGit User Guide"> <topic href="help/EGit/User_Guide/User-Guide.html" label="Getting Started"> - <topic href="help/EGit/User_Guide/User-Guide.html#Overview" label="Overview"></topic> + <topic href="help/EGit/User_Guide/User-Guide.html#Overview" label="Overview"> + <topic href="help/EGit/User_Guide/User-Guide.html#The_Preferences_Dialog" label="The Preferences Dialog"></topic> + </topic> <topic href="help/EGit/User_Guide/User-Guide.html#Basic_Tutorial:_Adding_a_project_to_version_control" label="Basic Tutorial: Adding a project to version control"> <topic href="help/EGit/User_Guide/User-Guide.html#Configuration" label="Configuration"> <topic href="help/EGit/User_Guide/User-Guide.html#Identifying_yourself" label="Identifying yourself"></topic> @@ -443,27 +445,25 @@ </topic> <topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/4.9/4.9.html" label="EGit 4.9 New and Noteworthy"> - <topic href="help/EGit/New_and_Noteworthy/4.9/4.9.html" label="EGit"> - <topic href="help/EGit/New_and_Noteworthy/4.9/4.9.html#Features" label="Features"></topic> - <topic href="help/EGit/New_and_Noteworthy/4.9/4.9.html#Usability" label="Usability"></topic> - <topic href="help/EGit/New_and_Noteworthy/4.9/4.9.html#Performance_Improvements" label="Performance Improvements"></topic> - <topic href="help/EGit/New_and_Noteworthy/4.9/4.9.html#Bug_Fixes" label="Bug Fixes"></topic> - <topic href="help/EGit/New_and_Noteworthy/4.9/4.9.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html" label="EGit 4.11 New and Noteworthy"> + <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html" label="EGit"> + <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html#Usability" label="Usability"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html#Performance_Improvements" label="Performance Improvements"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html#Bug_Fixes" label="Bug Fixes"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/4.9/Contributors.html" label="Contributors"></topic> - <topic href="help/EGit/New_and_Noteworthy/4.9/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.11/Contributors.html" label="Contributors"></topic> + <topic href="help/EGit/New_and_Noteworthy/4.11/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/4.9/4.9.html" label="JGit 4.9 New and Noteworthy"> - <topic href="help/JGit/New_and_Noteworthy/4.9/4.9.html" label="JGit"> - <topic href="help/JGit/New_and_Noteworthy/4.9/4.9.html#Features" label="Features"></topic> - <topic href="help/JGit/New_and_Noteworthy/4.9/4.9.html#JGit_Command_Line" label="JGit Command Line"></topic> - <topic href="help/JGit/New_and_Noteworthy/4.9/4.9.html#Performance_Improvements" label="Performance Improvements"></topic> - <topic href="help/JGit/New_and_Noteworthy/4.9/4.9.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html" label="JGit 4.11 New and Noteworthy"> + <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html" label="JGit"> + <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html#Features" label="Features"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html#Performance_Improvements" label="Performance Improvements"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html#Fixes" label="Fixes"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html#Contributors" label="Contributors"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/4.9/Bug-Fixes.html" label="Bug Fixes"></topic> - <topic href="help/JGit/New_and_Noteworthy/4.9/Contributors.html" label="Contributors"></topic> - <topic href="help/JGit/New_and_Noteworthy/4.9/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/JGit/New_and_Noteworthy/4.11/Updating-This-Document.html" label="Updating This Document"></topic> </topic> <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Git for Eclipse Users"> <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Centralised version control systems"></topic> @@ -509,9 +509,7 @@ <topic href="help/EGit/Contributor_Guide/Builds.html#JGit_Bazel_Build" label="JGit Bazel Build"></topic> <topic href="help/EGit/Contributor_Guide/Builds.html#FindBugs_and_PMD" label="FindBugs and PMD"></topic> <topic href="help/EGit/Contributor_Guide/Builds.html#Checking_for_JGit_API_Changes_using_API_Baseline" label="Checking for JGit API Changes using API Baseline"></topic> - <topic href="help/EGit/Contributor_Guide/Builds.html#Automated_Signing_and_Publishing" label="Automated Signing and Publishing"> - <topic href="help/EGit/Contributor_Guide/Builds.html#Signing_.28old_method.2C_replaced_by_automated_procedure.29" label="Signing (old method, replaced by automated procedure)"></topic> - </topic> + <topic href="help/EGit/Contributor_Guide/Builds.html#Signing_and_Publishing" label="Signing and Publishing"></topic> <topic href="help/EGit/Contributor_Guide/Builds.html#Contribution_to_Release_Train" label="Contribution to Release Train"></topic> </topic> <topic href="help/EGit/Contributor_Guide/Documentation.html" label="Documentation"> |