Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-09-28EGit v4.1.0.201509280440-rv4.1.0.201509280440-rMatthias Sohn38-39/+39
Change-Id: Icfa40a868fe197aaf761e0323af0fffbe9107a90 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-28Fix potential NPE in ReleaseStartOperation.findHead()Matthias Sohn1-1/+4
Change-Id: Ie189acbce9b0e3d99dab860b427e02ff3c1ba33c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-27Update documentation for 4.1Matthias Sohn22-299/+305
Change-Id: Ib99e39c12b09b2731faef591d323542b89b583ba Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-27Fixed potential NPE in GitFlowRepository::findHeadMax Hohenegger1-3/+9
- RevWalk::parseCommit cannot take null-argument - added nullable annotation and doc Change-Id: I92656928211c868d22291e1ade9fa21792101df6 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-09-27Fixed 'When on master branch, gitflow options are disabled.'Max Hohenegger4-49/+23
- retrieve head of correct branch instead of current one for start op - enable UI Bug: 473647 Change-Id: I32ef73ae29d3057c77a787b68bbf4798762e4294 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-09-26Properly handle GitURI exceptions on invalid URI'sAndrey Loskutov3-11/+31
Bug: 478464 Change-Id: I0f35f2789a69c40306e4bc208010b9bbd22cb154 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-26GitURI should not try to parse "path" part if it is missing in the URIAndrey Loskutov2-1/+14
Bug: 478464 Change-Id: I4c376c1d8df3a90ca5d59d8cfa36d2dbecab9772 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-09-23Allow saving feature finish options as defaultMax Hohenegger9-4/+130
- added checkbox to feature finish dialog - save defaults to preference store - re-store options from preference store - extended UI tests Bug: 478056 Change-Id: I232c338dab209dd0829f3fdb683b64441e22b7b0 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-09-22Fixed FindBugs warning: Inner class should be staticMax Hohenegger1-2/+2
Change-Id: I619511ff9d8681c49bee4bdf6282832703d1ffb3 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-09-22Refactored feature finish UI tests to reduce redundancyMax Hohenegger4-169/+123
Change-Id: I4f70f569736d171eddfc11088bb210939eede659 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-09-21Change usage of SubProgressMonitor to SubMonitor in org.eclipse.egit.uiPhilipp Bumann2-10/+14
SubProgressMonitor has bad performance characteristics and SubMonitor was offered 2007 as replacement for it. Platform recently deprecated SubProgressMonitor and continues to improve performance of SubMonitor For the ui.project packages. Other packages will be done in separate Gerrit reviews, planned for the Eclipse Hamburg Hackathon taking place right now. Bug: 477696 Change-Id: I38b3af64621ac2fe905d1f7065cf3cc8cd09d40e Signed-off-by: Philipp Bumann <bumannp@gmail.com>
2015-09-21Added support for keeping branch after Gitflow feature finishMax Hohenegger11-13/+189
- added new option to API - added checkbox to feature finish dialog - added tests and UI tests Bug: 477786 Change-Id: I4e58529378c976c83b7564e817db6f7be00d0cec Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-09-21Un-generified getAdapter() to keep Eclipse 3.8-4.4 source compatibilityAndrey Loskutov2-2/+2
Because we are still supporting older Eclipse versions, we should avoid compilation errors if compiling against older platforms. Change-Id: I8fcb7b8f9c5fc99c7695711add808fde4ccce8ff
2015-09-21Use save action to add missing @Override annotations on saveMatthias Sohn11-33/+99
Change-Id: I3c55808a0279ac10a23be40739306259091037d8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-20Merge "Obey hyperlink preferences in SpellcheckableMessageArea"Matthias Sohn6-69/+570
2015-09-20Obey hyperlink preferences in SpellcheckableMessageAreaThomas Wolf6-69/+570
and in CommitMessageViewer in git history. 1. Only open hyperlinks on direct click in read-only views; in editable views, this is too confusing and too often opens the hyperlink when the user just wants to set the caret. 2. Make the viewer react on changes in the general hyperlinking preferences. Both for the master switch and for individual contributed hyperlink detectors. 3. Ignore disabled hyperlink detectors in syntax coloring (by not storing them once and for all times in HyperlinkTokenScanner but getting them freshly from the viewer configuration for each run). 4. Always keep the special git history navigation links enabled in the CommitMessageViewer (KnownHyperlinksDetector). The JFace hyperlinking infrastructure actually only supports hyperlink detectors that either open on a specified modifier key combination, or on the default combination, which is the one the viewer sets, which is normally the one from the global preferences. If a viewer thus sets SWT.NONE to support direct hyperlinking, the global preferences will not take effect for hyperlink detectors that specify "default", which leads to a rather inconsistent interface, because hyperlinks are then only active when no key is pressed, but become inactive when the modifiers from the global preferences are pressed. We work around this by actually duplicating hyperlink detectors when the viewer specifies SWT.NONE. This ensures that hyperlinks can be opened (in read-only views) either by direct click or also when the modifier given by the global configuration is pressed. Bug: 411809 Change-Id: Icfcfe62b127370be36bced8b1430b764d31b75a6 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-20Consider initial selection in Reflog view.Tobias Baumann3-6/+37
SWTCommit is adaptable to an instance of type Repository so that ReflogView can show the repository after opening. Bug: 475836 Change-Id: I7ca51f2935ab082e9a3fab04a9b4c3bae093d224 Signed-off-by: Tobias Baumann <tobbaumann@gmail.com>
2015-09-18Add icon to Gitflow menu contributionsMax Hohenegger2-8/+13
Re-using icon from Bug 470626 for: - team sub-menu - history view menu - repository view menu Change-Id: I87ea38cdbfc19f71c215eab52cbdfd28ab76bf1e Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-09-17Merge "Add missing @Override annotations to all EGit bundles"Matthias Sohn157-0/+411
2015-09-17[historyView] Added "Focus On This File" menu for selected fileAndrey Loskutov4-3/+37
Selected file in commit files list have now new "Focus On This File" context menu, which focuses history view on the selection. This is a handy option to change the history view focus and also fixes issue with older Eclipse versions which do not have Show In -> History View entry. Bug: 440994 Change-Id: Id31c410e4df24e2959c094fb188ed69a4b04e818 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-09-17Add missing @Override annotations to all EGit bundlesLars Vogel157-0/+411
Bug: 477689 Change-Id: I490e6558db5133a60caf00af2b996feae0e2e832 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-17Focus file list in GitHistoryView when context menu is shownThomas Wolf1-0/+9
Force focus to CommitFileDiffViewer to ensure that the "Show In" submenu works. Bug: 477510 Change-Id: I4faddbda611d2f9d2cbf743b8ac6545dcb1e5e51 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2015-09-16Configure version of tycho-surefire-plugin in parent pom.xmlMatthias Sohn6-5/+5
This ensures we use the same version in all modules. Change-Id: I4521e8cf52a23465923efb0b3a2dadcb011611ee Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-16Pin tycho-surefire-plugin versionThomas Wolf1-0/+1
Maven build complains about missing version, see https://hudson.eclipse.org/egit/job/egit.gerrit/7609/consoleFull . Change-Id: I48a4f93b01c6db3051feaaec334e8310b8718ef6 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2015-09-16Improve performance of HyperlinkTokenScannerThomas Wolf1-12/+154
My initial implementation of this was too inefficient. It invoked the HyperlinkDetectors for every character, which effectively re-introduced bug 415537 and made editing long commit messages with only a few links a pain. Therefore, compute all hyperlinks on a line and cache them once computed. Use this cache while we're on that line, and re-compute it when the current position passes to a new line. Add an internal subclass of the standard URL hyperlink detector org.eclipse.jface.text.hyperlink.URLHyperlinkDetector because that one is only capable of finding hyperlinks at the start of the region. Others, like those from mylyn, do find all links in a region on their own. For an example commit message see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=415537 Change-Id: I464f321d5f5d62836d031615b0c6252a54ee893f Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-16Add a sort order to the unstaged changesDenis Zygann6-9/+180
Add a button to sort the unstaged changes in alphabetically order or in a grouping order(sort order: Untracked, Missing, Modified), which is also alphabetically sorted. Bug: 473919 Change-Id: Ic59dd8f8d5f621dacfd06063d11a954d311a3e95 Signed-off-by: Denis Zygann <d.zygann@web.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-16Always run preferences listener UI update code in UI threadAndrey Loskutov1-3/+9
Bug: 477634 Change-Id: I5028e0e555a42683caf824e7f0366060a7d8f01d Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-09-16Specify modal dialog style for results of "dry run" in push dialogAndrey Loskutov5-8/+17
Bug: 391182 Change-Id: Ia86cbf6b12ae94366eb38bd1d39f2bb571e8d48b Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-09-15Add missing .gitignore for o.e.egit.ui.importer.testsMatthias Sohn1-0/+3
Change-Id: Id64a1ca275841cb5f84328e814895314017d1b70 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-15Merge branch 'stable-4.0'Matthias Sohn31-265/+1053
* stable-4.0: Prepare 4.0.3-SNAPSHOT builds EGit v4.0.2.201509141540-r Don't use IPath.equals() since it is broken on Windows [Importer] More direct re-use of EasymportWizard Update build to final R20150821153341 Orbit repository for Mars.1 Fix "Import changed projects" triggered from filtered history Update com.jcraft.jsch to 0.1.53 Always supply repository to the compare input Change-Id: I4a07a16c51e578f0fd3631747a01ee2929919c46 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-14Prepare 4.0.3-SNAPSHOT buildsMatthias Sohn38-226/+226
Change-Id: I2ea733b08ad181311f78c88564c27056b085b3cd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-14EGit v4.0.2.201509141540-rMatthias Sohn38-39/+39
Change-Id: I826a9446e828277a25e2ab36e68210d56bc35b61 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-13Merge changes Ief5d8000,I18808837Matthias Sohn8-28/+220
* changes: Introduce new preference page for Staging view [scalability] Staging view should handle huge amount of entries
2015-09-13Don't use IPath.equals() since it is broken on WindowsAndrey Loskutov2-1/+47
C:\\test and c:\\test are different paths for IPath.equals(). So if we search for repositories, we cannot rely on it's implementation and should compare java.io.File instances instead. Cherry picked from commit fbb66bdb00b81fc817d9ecd4eed70d4e7d2b4a3e Bug: 475453 Change-Id: I87a57e02abb73f15e764653cf6b86774096c8e28 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-13Introduce new preference page for Staging viewAndrey Loskutov5-0/+71
Add new preference to configure the threshold for automatically disabling auto-expand and enabling compact tree mode if number of elements exceeds the threshold. Bug: 474064 Change-Id: Ief5d80004c03a76f046339818ee37b56fd70b5ae Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-13[scalability] Staging view should handle huge amount of entriesAndrey Loskutov3-28/+149
Automatically disable auto-expand and enable compact tree mode if number of elements exceeds 10000. A new preference is introduced for configuration of this value, UI for it will be added in the next commit. Bug: 474064 Change-Id: I18808837dbc26ecf98753b8cd8edd988728d574e Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-13Check for objects adaptable to IResource in ShowBlameActionHandlerThomas Wolf4-73/+370
Includes a new test. Some refactoring in LocalRepositoryTestCase to avoid having to duplicate test repo creation, and to reduce code duplication. Bug: 401156 Change-Id: Ib78d62f11d3a5a52c672bb192e8baba189c49829 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2015-09-13Don't use IPath.equals() since it is broken on WindowsAndrey Loskutov2-2/+46
C:\\test and c:\\test are different paths for IPath.equals(). So if we search for repositories, we cannot rely on it's implementation and should compare java.io.File instances instead. Bug: 475453 Change-Id: I9ec19dc3cc31b4717db5a6348cb84a9d4e7751ae Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-09-12Fixed NPE in StagingView if no repository is selectedAndrey Loskutov3-14/+28
This is a follow up on https://git.eclipse.org/r/54672. If Staging view was opened without selecting any repository, changing any preference in any of the Git preference pages caused NPE in IndexDiffCache.getIndexDiffCacheEntry(Repository). Marked currentRepository field as Nullable and fixed all other possible NPE places. Enabled org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion to show warnings if a value with unknown nullness is used where a NonNull value is required. Change-Id: Iab52940a67fe0205e16fa6bc5027948a4d819ff2 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
2015-09-11Add check for warnings and errors before commitPawel Nowak7-51/+410
- Add optional check for warnings and errors before commit which can be configured in preferences - Allow to configure if and when a warning should be displayed and if warnings/errors should block the commit - Add a flag to the staging view which allows to override blocking ad-hoc for the next commit Bug: 475559 Change-Id: I352c33d0fed1b610babda2992c6b1b211952dfb2 Signed-off-by: Pawel Nowak <siersciotluk@gmail.com> Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-11Minor clean ups in new CommitMessageViewerThomas Wolf5-114/+157
* Former inner class CommitMessageViewer.ObjectLink has become global class GitCommitReference. * On JFacePreference change, it suffices to update the view; the model is not affected. (CommitMessageViewer) * Reduce code duplication in CommitInfoBuilder. Change-Id: Idf9723d385fd07d2e26319af9874b5411f5620f6 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2015-09-11[Importer] More direct re-use of EasymportWizardMickael Istria22-35/+868
This changes reuses the EasymportWizard and its operations instead of re-using finer-grained operations and classes that may change in the future. With this change, all changes in the EasymportWizard will be cascaded to EasymportGitWizard without any integration, reducing maintenance effort and ensuring a better consistency. Change-Id: I0f3042a98edfc0b2357b6039356685771d869eb4 Signed-off-by: Mickael Istria <mistria@redhat.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-11Deprecate unused and obsolete methodsThomas Wolf1-2/+20
As the experience with SpellcheckableMessageArea has shown, doing syntax coloring directly in SWT is error-prone, especially in editable text viewers. These two methods are now unused within EGit and should not be used anymore. Change-Id: Ie17470740c0eaaa0ab6efd7afa581b71335199f9 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2015-09-10Rewrite CommitMessageViewer to use JFaceThomas Wolf6-251/+439
The goal is to get the commit message viewer in the git history view to use the same (configurable) hyperlink colors and other hyperlink infrastructure as the SpellcheckableMessageArea. This is complicated by two things: * custom hyperlinks to commits with custom opening, and * no clear model-view separation; getting the data from git, formatting, and coloring were all lumped together. Therefore, improve the model-view separation: * Get rid of hand-crafted SWT text range coloring. CommitInfoBuilder is restricted to getting the data from the repo, formatting, and returning semantic information (hyperlinks, header and footer ranges). It doesn't do syntax-coloring anymore. * CommitMessageViewer uses a partitioning on its document to split it logically into header, body, and footer. It also gets a custom hyperlink detector to deal with the custom commit hyperlinks. * GitHistoryPage uses a presentation reconciler with damager/repairers that know how to syntax-color each partition (and hyperlinks). * Made the HyperlinkTokenScanner a bit more flexible to rebuild the italicizing of Signed-off-by footer lines. Fixed a bug along the way (if "fill paragraphs" was on, it would put footer lines onto one line). Visually, there are no changes except the colors of hyperlinks, which now follow SpellcheckableMessageArea and are configurable. Bug: 340623 Change-Id: Ie1b5907110ba716d262e4b5773fed7e3a5150d0d Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-10Fixed: Specifying non-existing master does not abort initializationMax Hohenegger10-43/+337
- abort init operation if master is missing - added validator for missing master branch - ask user to create master branch - ask user to create initial commit if repository is empty - added control decorations to hint at source of problem - adjusted tests Bug: 475788 Change-Id: Ief9b1a361a3dce83358e7b84034bb6a477ec92e4 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-09-10Fixed Findbugs warning: Usage of known nullMax Hohenegger1-1/+1
- display SHA1 instead Change-Id: I8e561234a44988fd4bc4a449c8758df6255ef2b7 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu>
2015-09-09Fixed 'Merges do not appear to be using --no-ff flag'Max Hohenegger9-42/+148
- use non-ff for finish operations on features with multiple commits - extended tests Bug: 473639 Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu> Change-Id: I7a7c3a57a78930f95c0775f99eed2e99bf856544
2015-09-07Simplify hyperlink syntax coloring in SpellcheckableMessageAreaThomas Wolf4-128/+17
Turns out we don't need to use a special TextAttribute, and neither do we need a special damager/repairer. Works nicely out of the box. Change-Id: Id2f0d36f3c2018c047ad1f4cf65e148c960f236d Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2015-09-07Fixed 'Finishing a release is tagging develop branch instead of master'Max Hohenegger4-6/+11
Bug: 473646 Change-Id: I776d07e90b114335776f243e46b917c31fbeb7eb Signed-off-by: Max Hohenegger <eclipse@hohenegger.eu> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2015-09-07Use standard link colors in SpellcheckableMessageAreaThomas Wolf3-22/+62
There are at least three different color definitions for hyperlinks in Eclipse: JFacePreferences, EditorsUI, and a system hyperlink color. Use standard colors instead of hard-coded blue (0,0,255). Syntax-color hyperlinks using the JFace HYPERLINK color, and make the hyperlink presenter use the configured hyperlink color for editors. Both of these can be customized by the user through (already existing) preferences and thus can be adapted to the currently used theme. (Harmonizing the discrepancy between the JFace and the EditorsUI colors is bugs 199256/135224.) Change-Id: Id0d058018ee8f6fa2279371c3f5786a3dc24b690 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top