This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a change to branch master
in repository eclipse-egit.
from 96258d7 prepare for upload
adds 5abfaa7 Imported Upstream version 3.3.0
new 18c7573 Merge tag 'upstream/3.3.0'
new f00a7a2 Updated d/changelog with new upstream version
new fc89eaf Refreshed d/patches/use-distribution-jgit.patch
new 95aa27c Removed unused lintian overrides
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
debian/changelog | 8 +
debian/eclipse-egit.lintian-overrides | 2 -
debian/patches/use-distribution-jgit.patch | 4 +-
org.eclipse.egit-feature/feature.xml | 4 +-
org.eclipse.egit-feature/pom.xml | 2 +-
org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 22 +-
org.eclipse.egit.core.test/pom.xml | 2 +-
.../org/eclipse/egit/core/test/CommitUtilTest.java | 70 ++
.../core/test/op/SquashCommitsOperationTest.java | 103 +++
org.eclipse.egit.core/META-INF/MANIFEST.MF | 66 +-
org.eclipse.egit.core/pom.xml | 2 +-
.../src/org/eclipse/egit/core/CommitUtil.java | 61 ++
.../eclipse/egit/core/ContainerTreeIterator.java | 92 ++-
.../org/eclipse/egit/core/internal/CoreText.java | 3 +
.../eclipse/egit/core/internal/coretext.properties | 1 +
.../internal/indexdiff/IndexDiffCacheEntry.java | 5 +-
.../eclipse/egit/core/internal/job/JobUtil.java | 55 ++
.../internal/rebase/RebaseInteractivePlan.java | 120 +++-
.../egit/core/internal/util/ResourceUtil.java | 18 +
.../egit/core/op/SquashCommitsOperation.java | 131 ++++
org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit.doc/build-help.xml | 4 +-
.../help/EGit/New_and_Noteworthy/3.2/3.2.html | 116 ----
.../3.2/images/Egit-3.2-BlameImprovements.png | Bin 62444 -> 0 bytes
.../3.2/images/Egit-3.2-CreateBranchWizard.png | Bin 18069 -> 0 bytes
.../3.2/images/Egit-3.2-InteractiveRebaseView.png | Bin 20998 -> 0 bytes
.../3.2/images/Egit-3.2-PushBranchWizard.png | Bin 21712 -> 0 bytes
.../3.2/images/Egit-3.2-PushTagWizard.png | Bin 27094 -> 0 bytes
.../help/EGit/New_and_Noteworthy/3.3/3.3.html | 74 ++
.../New_and_Noteworthy/{3.2 => 3.3}/Bug-Fixes.html | 8 +-
.../Build-and-Release-Engineering.html | 19 +-
.../{3.2 => 3.3}/Contributors.html | 10 +-
.../GitHub-Connector.html} | 22 +-
.../{3.2 => 3.3}/Updating-This-Document.html | 8 +-
.../help/EGit/User_Guide/Tasks.html | 4 +
.../{3.2/3.2.html => 3.3/3.3.html} | 40 +-
.../New_and_Noteworthy/{3.2 => 3.3}/Bug-Fixes.html | 16 +-
.../{3.2 => 3.3}/Contributors.html | 10 +-
.../{3.2 => 3.3}/Updating-This-Document.html | 8 +-
org.eclipse.egit.doc/help/toc.xml | 37 +-
org.eclipse.egit.doc/pom.xml | 2 +-
org.eclipse.egit.mylyn-feature/feature.xml | 4 +-
org.eclipse.egit.mylyn-feature/pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit.mylyn.ui.test/pom.xml | 8 +-
org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 24 +-
org.eclipse.egit.mylyn.ui/pom.xml | 2 +-
org.eclipse.egit.repository/category.xml | 3 +
org.eclipse.egit.repository/pom.xml | 2 +-
org.eclipse.egit.source-feature/feature.xml | 2 +-
org.eclipse.egit.source-feature/pom.xml | 2 +-
org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit.target/egit-4.3.target | 14 +-
org.eclipse.egit.target/egit-4.4-staging.target | 10 +-
org.eclipse.egit.target/egit-4.4.target | 10 +-
org.eclipse.egit.target/pom.xml | 2 +-
org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 24 +-
org.eclipse.egit.ui.test/pom.xml | 6 +-
.../eclipse/egit/ui/internal/CommonUtilsTest.java | 7 +
.../ui/internal/push/PushBranchWizardTest.java | 40 +-
.../ui/internal/push/PushBranchWizardTester.java | 17 +-
.../configuration/GlobalConfigurationPageTest.java | 35 +-
.../ui/test/team/actions/CompareActionsTest.java | 29 +-
org.eclipse.egit.ui/META-INF/MANIFEST.MF | 166 ++---
org.eclipse.egit.ui/plugin.properties | 5 +-
org.eclipse.egit.ui/plugin.xml | 71 +-
org.eclipse.egit.ui/pom.xml | 2 +-
.../src/org/eclipse/egit/ui/Activator.java | 11 +-
.../src/org/eclipse/egit/ui/JobFamilies.java | 7 +-
.../egit/ui/PluginPreferenceInitializer.java | 4 +-
.../src/org/eclipse/egit/ui/UIPreferences.java | 2 +
.../org/eclipse/egit/ui/internal/CommonUtils.java | 7 +-
.../egit/ui/internal/ResourcePropertyTester.java | 8 +-
.../src/org/eclipse/egit/ui/internal/UIText.java | 68 +-
.../CleanActionHandler.java} | 22 +-
.../actions/DiscardChangesActionHandler.java | 5 +-
.../ui/internal/actions/MergeActionHandler.java | 5 +-
.../ui/internal/actions/ResetActionHandler.java | 3 +-
.../egit/ui/internal/actions/SwitchToMenu.java | 15 +-
.../egit/ui/internal/branch/BranchOperationUI.java | 25 +-
.../branch/CleanupUncomittedChangesDialog.java | 3 +-
.../ui/internal/clean/CleanRepositoryPage.java | 21 +
.../egit/ui/internal/clean/CleanWizard.java | 4 +
.../ui/internal/clone/AbstractGitCloneWizard.java | 5 +-
.../shared/AbstractRebaseCommandHandler.java | 8 +-
.../egit/ui/internal/commit/DiffViewer.java | 1 +
.../internal/commit/command/CherryPickHandler.java | 6 +-
.../ui/internal/commit/command/RevertHandler.java | 6 +-
.../ui/internal/commit/command/SquashHandler.java | 107 +++
.../egit/ui/internal/decorators/GitDocument.java | 33 +-
.../dialogs/BranchSelectionAndEditDialog.java | 21 +-
.../egit/ui/internal/dialogs/CompareTreeView.java | 766 ++++++++-------------
.../dialogs/SpellcheckableMessageArea.java | 1 +
.../ui/internal/fetch/FetchGerritChangePage.java | 7 +-
.../egit/ui/internal/fetch/FetchOperationUI.java | 7 +-
.../egit/ui/internal/fetch/FetchResultTable.java | 27 +-
.../egit/ui/internal/history/CommitGraphTable.java | 12 +
.../ui/internal/history/GenerateHistoryJob.java | 41 +-
.../egit/ui/internal/history/GitHistoryPage.java | 10 +
.../egit/ui/internal/history/SWTPlotRenderer.java | 15 +-
.../history/command/HistoryViewCommands.java | 5 +-
.../ui/internal/history/command/MergeHandler.java | 6 +-
.../ui/internal/history/command/ResetHandler.java | 2 +-
.../ui/internal/history/command/SquashHandler.java | 160 +++++
.../internal/preferences/AddConfigEntryDialog.java | 2 +-
...encePage.java => CommittingPreferencePage.java} | 28 +-
.../preferences/ConfigurationEditorComponent.java | 10 +-
.../preferences/HistoryPreferencePage.java | 2 +
.../egit/ui/internal/pull/PullOperationUI.java | 6 +-
.../egit/ui/internal/push/PushBranchPage.java | 73 +-
.../egit/ui/internal/push/PushBranchWizard.java | 5 +-
.../internal/rebase/CommitMessageEditorDialog.java | 7 +-
.../ui/internal/rebase/RebaseInteractiveView.java | 124 +++-
.../ui/internal/rebase/RebaseResultDialog.java | 11 +-
.../RepositoriesViewContentProvider.java | 3 +
.../repository/RepositorySearchDialog.java | 4 +-
.../tree/command/CreateBranchCommand.java | 35 -
.../repository/tree/command/MergeCommand.java | 6 +-
.../repository/tree/command/PasteCommand.java | 3 +
.../repository/tree/command/RemoveCommand.java | 8 +-
.../repository/tree/command/ResetCommand.java | 4 +-
.../repository/tree/command/StashApplyCommand.java | 6 +-
.../tree/command/SubmoduleAddCommand.java | 6 +-
.../tree/command/SubmoduleSyncCommand.java | 6 +-
.../tree/command/SubmoduleUpdateCommand.java | 6 +-
.../tree/command/SynchronizeCommand.java | 5 +-
.../egit/ui/internal/staging/StagingEntry.java | 32 +-
.../ui/internal/staging/StagingFolderEntry.java | 28 +-
.../egit/ui/internal/staging/StagingView.java | 67 +-
.../staging/StagingViewContentProvider.java | 152 ++--
.../egit/ui/internal/stash/StashCreateUI.java | 9 +-
.../internal/synchronize/GitModelSynchronize.java | 7 +-
.../internal/synchronize/SynchronizeFetchJob.java | 6 +-
.../org/eclipse/egit/ui/internal/uitext.properties | 38 +-
org.eclipse.egit/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit/pom.xml | 2 +-
pom.xml | 4 +-
137 files changed, 2492 insertions(+), 1313 deletions(-)
delete mode 100644 debian/eclipse-egit.lintian-overrides
create mode 100644
org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/CommitUtilTest.java
create mode 100644
org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/SquashCommitsOperationTest.java
create mode 100644
org.eclipse.egit.core/src/org/eclipse/egit/core/CommitUtil.java
create mode 100644
org.eclipse.egit.core/src/org/eclipse/egit/core/op/SquashCommitsOperation.java
delete mode 100644
org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/3.2.html
delete mode 100644
org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-BlameImprovements.png
delete mode 100644
org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-CreateBranchWizard.png
delete mode 100644
org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-InteractiveRebaseView.png
delete mode 100644
org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-PushBranchWizard.png
delete mode 100644
org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-PushTagWizard.png
create mode 100644
org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.3/3.3.html
rename org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/{3.2 =>
3.3}/Bug-Fixes.html (85%)
rename org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/{3.2 =>
3.3}/Build-and-Release-Engineering.html (77%)
rename org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/{3.2 =>
3.3}/Contributors.html (81%)
rename
org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/{3.2/GitHub-Connector-Features.html
=> 3.3/GitHub-Connector.html} (75%)
rename org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/{3.2 =>
3.3}/Updating-This-Document.html (87%)
rename org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/{3.2/3.2.html =>
3.3/3.3.html} (54%)
rename org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/{3.2 =>
3.3}/Bug-Fixes.html (75%)
rename org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/{3.2 =>
3.3}/Contributors.html (82%)
rename org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/{3.2 =>
3.3}/Updating-This-Document.html (87%)
rename
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/{repository/tree/command/CleanCommand.java
=> actions/CleanActionHandler.java} (65%)
create mode 100644
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/SquashHandler.java
create mode 100644
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/SquashHandler.java
rename
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/{CommitDialogPreferencePage.java
=> CommittingPreferencePage.java} (76%)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/eclipse-egit.git
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
