Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.egit.core
AgeCommit message (Collapse)AuthorFilesLines
2011-05-13Commit Dialog: enable diff for non workspace filesJens Baumgart3-2/+100
Showing the diff for a file in the Commit Dialog now also works for non workspace files. Change-Id: Iec2c848f9da6b00eb34c5376627dd529b2815c88 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2011-05-12[sync] Add 'Push' action into sync-view toolbarDariusz Luksza1-14/+46
Adds a 'Push' button into Synchronize view toolbar. This action is enabled when only one repository is being synchronized and when one of specified branch is remote branch. Bug: 326635 Change-Id: Ib70cf7e177c35d511e9f91356065b49294826f52 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2011-05-12Allow committing non workspace changesJens Baumgart1-118/+127
The commit process is now based on files instead of resources. It is possible to commit changes on files that do not belong to the workspace. The commit dialog commits the changes of one single repository. Displaying diffs in the commit dialog for non workspace files needs to be implemented in a follow-up commit. Bug: 329061 Bug: 302349 Change-Id: Ib5f0bb2a6d86000683415b100702a0b322efd032 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2011-05-06Add Replace With HEAD, commit, and ref menu actionsKevin Sawicki1-20/+26
Bug: 326638 Change-Id: I0beef8da40c8e0c194f61678000f0b65bd6598b9 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2011-05-03Present reset in the reflog like C Git does nowadaysRobin Rosenberg1-2/+1
Confirmed for v1.7.4.1 Change-Id: Iaa5d4f290379642d4c4b4312bad228c40c74b51e Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-05-03Qualify post-0.12 buildsMatthias Sohn2-25/+25
Change-Id: I4aa59d44e38caa46fbbfc60c6f75a7adeedb49d6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-05-02Merge branch 'stable-0.12'Matthias Sohn2-25/+25
* stable-0.12: EGit 0.12.1 UI blocked while opening menu Fix combo box in repo configuration page Fix broken link in documentation Update documentation for 0.12
2011-05-02EGit 0.12.1v0.12.1stable-0.12Matthias Sohn2-25/+25
Change-Id: Ie9275bd979d2a85eb05eb7b28e23e1bfb8be08ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-04-27Fix NullPointer when cloning empty repositoryStefan Lay1-1/+2
Bug: 342386 Change-Id: I5d7580175f01c5b7a9a2dc96e22b07994b0b84f8 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2011-04-25Allow delete multiple branches at onceDariusz Luksza1-17/+48
Adds possibility of deleting multiple branches into 'Branch Delete' dialog available in project's context menu under Team -> Advanced -> Delete Branch... action Bug: 343673 Change-Id: I5bb656d2f4ead2159a5f7e1e9a548e10c6212538 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2011-04-21Merge branch 'stable-0.12'Matthias Sohn5-51/+56
* stable-0.12: Identify yourself dialog only needed if UserConfig is implicit Auto-select all not yet imported projects on import Refactoring Branch operations (5): improve icons and menu labels Refactoring Branch operations (4): more cleanup Refactoring Branch operations (3): cleanup Refactoring Branch operations (2): specific dialogs Refactoring Branch operations (1): simplify Branch operations Simplify labels on configure gerrit page Enhance Change-Id configuration Make running static checks configurable in maven build Sort list of repositories in configuration editor Fix the labels for the dialog used for configuring the source repo
2011-04-20Refactoring Branch operations (2): specific dialogsMathias Kinzler1-2/+1
This adds some dialogs to be used for checkout and deletion of branches which are used in the Team->Switch To...->New branch... and Team->Switch To...->Other... Menu actions. New Branch... will first call a dialog to select the base (branch, tag, Reference) and then start the usual wizard with the selected base as parameter. Other... will open a dialog to select a branch, tag, or Reference for checking out. Upon "Ok", the Ref is checked out. With this, users can use specific, simplified UIs for the very common operations of branch creation and checkout instead of having to use the generic BranchSelectionDialog which offers too many actions. Change-Id: I10b2a80c002b38e645a9869267d533bdb09432d3 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-04-20Refactoring Branch operations (1): simplify Branch operationsMathias Kinzler3-41/+9
This exposes static methods to create the BranchOperationUI instead of specific constructors which should make usage for the consumers easier. Both BranchOperation and BranchOperationUI take String as argument which is to be used for Ref name and Commit ID as well (JGit takes care of the rest). Change-Id: Ifae9d6c900ef2c8dc115916b2bdb59cc566a8278 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-04-20Enhance Change-Id configurationStefan Lay1-0/+46
Replace Change-Id preference by git configuration parameter "gerrit.createchangeid" to allow for more flexible configuration. Automatically enable gerrit.createchangeid from Gerrit configuration page in clone wizard. Depends on JGit change I22fc46dff6cc5dfd975f6e82161d265781778cde. Change-Id: I66ef6ac34e1340d473091b4923213b3768d8010c Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-04-20[sync] Only supervise resources of type FILE.Kevin Sawicki1-2/+2
This corrects issues where folders are marked as incoming or outgoing when they really contain children of both kinds. Bug: 324604 Change-Id: Ib25bf43721ef4cc87dba33aa01909e50a4cbef48 Signed-off-by: Kevin Sawicki <kevin@github.com>
2011-04-18Make running static checks configurable in maven buildMatthias Sohn1-8/+0
In order to run the static checks, e.g. against indigo run: mvn -P platform-indigo,static-checks clean install Change-Id: I39e5adbd305a5f393267adf5609e62f9ad254b6f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-04-13Add Page for Gerrit push configuration to Clone WizardStefan Lay2-1/+102
If fetch URI used for cloning is using HTTP(S) we choose the same protocol for pushing, Gerrit's path prefix for smart HTTP is handled automatically. Otherwise SSH protocol is proposed for pushing changes to the Gerrit review queue. Change-Id: I187479cdc233843bed2522ef7408f702a51255fc Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-04-06Enable cherry-pick conflict resolutionRobin Stocker3-0/+19
When a cherry-pick fails due to conflicts, the user has to resolve the situation. With this change, the repository is set to the "Conflicts" state and the merge tool is enabled. Also, the original commit message and author is preset in the commit dialog. The message includes a "Conflicts" section as in C git. This depends on JGit change I947967fdc2f1d55016c95106b104c2afcc9797a1. Bug: 339092 Change-Id: I5c5b98c98cf8deefa27de6cb94afa189a2cba218 Signed-off-by: Robin Stocker <robin@nibor.org>
2011-04-06Use JGit CloneCommandStefan Lay1-131/+22
Change-Id: I4817e5a6f54bce498ab925bd548c313ab8c70906 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2011-04-05[sync] Enable Workspace model by defaultDariusz Luksza1-3/+10
According to discussion we had in bug 326767 I've decided to activate Workspace model by default instead of Git Change Set model. This commit also fixes an issue in GitResourceVariantTreeSubscriber.members method which was causing misleading results in Workspace model. Additionally this change includes also UI tests cases for both Workspace and Git Change Set models. Common parts were moved into AbstractSynchronizeViewTest. Bug: 326767 Change-Id: I48417cbf6d99c50f0495bf38093dae2ed33b6df2 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-04-05Proper result dialog when pulling from multiple RepositoriesMathias Kinzler3-21/+59
The dialog presents a list of Repositories and an overview about fetch and update (merge/rebase) results for each Repository. Users can drill down and see detailed information (i.e. the "normal" PullResultDialog) by selecting a line in the list and hitting a "Details" button. This also enables pull for multiple Repositories in the Git Repositories View. Bug: 340780 Change-Id: I8d4aaf3f3f0b5f47cf0db50b4588a2676bb8ccc2 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2011-04-04Never ignore project nodesPhilipp Thun1-2/+2
With this change project nodes are no longer ignored (Team.isIgnoredHint). This affects the decoration of resources as well as entries in a ContainerTreeIterator. Bug: 336744 Change-Id: I2e559b1c59a268956a92808b2cb68d9d90547eb0 Signed-off-by: Philipp Thun <philipp.thun@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-03-31Check for trailing newline before writing to .gitignore file.Kevin Sawicki1-3/+35
IgnoreOperation wrote entries to the .gitignore file without checking if the file currently had a trailing newline which would cause entries to get written on the same line as other entries for files that were missing a trailing newline. Added unit test to IgnoreOperationTest for this case. Bug: 339419 Change-Id: I422ec5e92e3fcfea0d8bf6d3bfaf38245e505733 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2011-03-30Change ref parameter of CloneOperation to StringRobin Stocker1-13/+16
The parameter is used for specifying what branch should be checked out after fetch. Before this change, it was of type Ref. But a Ref is not really right here, as a Ref should point to a valid object id, and the ids aren't generally known before a clone. This lead users of CloneOperation to passing a Ref with only a name set, and no object id (using a anonymous Ref subclass or passing null as object id). Before the parameter was a Ref, it already was a String, but one could only specify a short branch name (e.g. "master"), not a full ref name ("refs/heads/master"). With this change, it's still the full ref name, just as a String. Bug: 338603 Change-Id: I420059e7eda4b3bbbf335557217bc89f11c27abd Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2011-03-28FindBugs: cleanup Egit CoreMathias Kinzler5-11/+22
Change-Id: Ieaf30d6e3e2e5ba264e0be8ec11d186d93e16bde Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-03-24Show failures during rebase to the userPhilipp Thun1-1/+1
This change fixes a bug that happened when rebasing while there are uncommitted changes; this error situation was neither detected correctly nor presented to the user in an understandable manner. Change-Id: I08d16ce08e8373f0d17a1fdbe759888c99e1f251 Signed-off-by: Philipp Thun <philipp.thun@sap.com>
2011-03-22[sync] Improve performance after commit 6c5e2ea0Dariusz Luksza1-21/+43
It appears that new implementation of GitResourceVariantTreeSubscriber.isSupervised(IResource) introduce an performance issues in synchronize view. This change moves part of logic from isSupervised method into members(IResource). In this approach we don't include ignored resources in list members therefore we don't need to check that resource isn't ignored in isSupervised() method. Bug: 323839 Change-Id: I7bca756cbcd6dae2909e49ad618f980222b7869e Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2011-03-22Replace Change-ID place holder in commit message of merge commitsJens Baumgart1-1/+3
Bug: 336791 Change-Id: I283a65c3468165b4444dcbf4d091cb4269884860 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2011-03-21Fix broken externalized stringsMatthias Sohn2-16/+0
Change-Id: I4db0991f4fcf1ec8bf8da4c6cfcb3bcc0f94c5fa Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-03-17CommitOperation: use JGit Commit CommandJens Baumgart3-285/+120
The usages of the deprecated GitIndex class were replaced by using the JGit CommitCommand. Depends on JGit change http://egit.eclipse.org/r/#change,2760 Change-Id: Ibd0e883bb6c82c42d1b3bd08743dd7d050e95291 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com> Signed-off-by: Philipp Thun <philipp.thun@sap.com>
2011-03-17Prepare for JGit change I85726413790fc87721271c482f6636f81baf8b82Mathias Kinzler1-2/+8
Repository.mapTree() is to be removed from JGit; this removes the last usage of this method in EGit. Change-Id: I526d037561b1cc6c7432253d40de5f9b6992d754 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2011-03-15Merge "[sync] Don't show ignored files in Workspace model"Chris Aniszczyk4-15/+48
2011-03-15Replace 'occured' by 'occurred'Philipp Thun5-10/+10
This change fixes a common typo. Signed-off-by: Philipp Thun <philipp.thun@sap.com>
2011-03-14[sync] Don't show ignored files in Workspace modelDariusz Luksza4-15/+48
It appears that after performance improvements in synchronize view ignored files was shown in Workspace model. This change adds also an test case for checking that ignored files doesn't show in Git Change Set and Workspace models. Bug: 322454 Change-Id: Iecd37a15ddf5eb04303f4daa6d6016112b9eea43 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2011-03-08Fix Build after JGit change 9013e9e99Stefan Lay1-1/+1
Change-Id: I48b61df5575a9351c415bc6f9860d9e12eae233d
2011-03-07Respect ignore rules in info/exclude and core.excludesfileMatthias Sohn1-0/+5
ContainerTreeIterator missed to initialize the root iterator loading the ignore rules defined in .git/info/exclude and the file defined by the configuration parameter core.excludesfile. Bug: 328101 Bug: 328428 Change-Id: I4c64ef13f5579bbbda637e64911b558070289d8f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2011-03-02Merge "ContainerTreeIterator: remove caching of file length"Chris Aniszczyk1-66/+3
2011-03-02ContainerTreeIterator: remove caching of file lengthJens Baumgart1-66/+3
Caching of file length was introduced with commit c03562f2202231d55e84eb761bb1462fd69a584a. Outdated cache entries are removed in a resource change listener. It can happen that the resource change listener is not called (see bug 338667, CompareActionsTest broken on Ubuntu). Thus the caching mechanism was removed. Change-Id: I59352ed87241ea5163d49fa944ffedecebc63f4f Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2011-03-02Fix NPE when cloning an empty repositoryStefan Lay1-2/+4
Bug: 337522 Change-Id: I3ad378139a2daf704364fe82a53c9905e0512108 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2011-02-26[sync] Fix resource out of sync exceptionDariusz Luksza1-8/+12
Bug: 335000 Change-Id: I9442db2e5f0127464aa04224deb7a66e17249f88 Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-25Fix NPE when comitting file added in index and deleted in worktreeRobin Rosenberg1-2/+2
Change-Id: I9d3b54a2eb32b8ad1f579b25dea5d36013322ec1 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-25Remove redundant initialization of GitProjectDataPhilipp Thun2-2/+16
This change adds a static 'add()' method to GitProjectData in order to put a project data object into the cache that has been created using the constructor. This change affects the ConnectProviderOperation. Previously for each newly imported project GitProjectData was initialized twice. Change-Id: Id3df0345167dd2cb51f3ffca336f74c21868ab45 Signed-off-by: Philipp Thun <philipp.thun@sap.com>
2011-02-24[sync] Don't use String.isEmpty()Dariusz Luksza1-2/+2
Bug: 338069 Change-Id: I24d4ce92c2a563629552fe9b44a00ff1925fa2c8 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2011-02-23[sync] Fix NPE when synchronizing empty repositoryDariusz Luksza1-3/+15
Synchronization fails with NPE when it was launched on empty repository. Test case for this issue were added. Also there were made some changes in all test cases to improve theirs reliability. Bug: 337540 Change-Id: Ie904980c9a7cf6f4495219ef99514083e72b6bbc Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2011-02-18Fixed a problem when committing mode changesChristian Halstrick1-0/+8
When HEAD and index contained a regular file (a file with the executable bit not set) and in the working tree the associated file was modified to be an executable file then EGit had a bug while committing this mode change. In EGits commit operation the index was updated and the tree for the commit got prepared. The index was updated correctly but the tree to be commited always contained a regular file. After the Commit operation we had different entries for this file in index and HEAD. This commit fixes this by explicitly checking for executable-bit in the associated index-entry and setting the new TreeEntry accordingly. Bug: 307560 Change-Id: I73303c6de368c2029903a0f9231acd0d0ed9e496 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
2011-02-15Implement commit action in Repositories ViewJens Baumgart2-0/+42
The UI logic in CommitActionHandler was made reusable and moved to a new class CommitUI. A commit action was provided in Repositories View based on CommitUI. Change-Id: Ida0eb6188f7502ec4494229886fe5dd043673c8a Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2011-02-12Qualify post 0.11 buildsMatthias Sohn2-25/+25
Change-Id: I662fc8356fb977f9866950590f1141821aa7e9e4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-12Merge branch 'stable-0.11'Matthias Sohn3-29/+33
2011-02-12Qualify post 0.11.1 buildsMatthias Sohn2-25/+25
Change-Id: Ied2f3e54740ec11c77219db3f83cf26d033173c5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-02-11EGit 0.11.1v0.11.1Matthias Sohn2-25/+25
Change-Id: Icad36cf005cf517ce852ad83e85e40e900fd6039 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top