Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-06-14Qualify post-0.8.4 buildsstable-0.8Shawn O. Pearce16-17/+17
Change-Id: Ie2d1ab2a4a481652e46050269806161b894fddb5 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-06-14EGit 0.8.4v0.8.4Matthias Sohn16-49/+49
Created wrong tags for 0.8.3 hence creating another version. Change-Id: Ib850faa0f145bc01a50871921bba0a926b0a871e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-06-14EGit 0.8.3Matthias Sohn16-49/+49
Change-Id: I3bfc5e4396f10a3db6d138f8265e7ba79c0d1073 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-06-02Qualify post 0.8.1 buildsShawn O. Pearce16-49/+49
Change-Id: Ia99ef4fc864396a3369e0e99a6d3d0c62c00bbaf Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-06-02EGit 0.8.1v0.8.1Shawn O. Pearce16-49/+49
Change-Id: I3901b45d428dbf09427cb6c4abb1ad848474905e Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-06-02Update egit help for 0.8.0 from wikiMatthias Sohn30-278/+1084
Change-Id: I1bee00fc75f619e35dc64ccead61a507f58855a8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-06-02Show untracked files per default and remember last selectionStefan Lay2-20/+16
The old behaviour was not intuitive. Additionally many users want to see the untracked files. Bug: 314997 Change-Id: I87813befb7288f24d4144e09522bda2de5b38e97 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-06-02Import wizard does not remember last wizardMathias Kinzler2-1/+2
The page asking for the wizard to use does not remember the "last used" wizard if it was the "New Project" wizard. After fixing this, another issue was found: when the "New Project" wizard is selected initially, the tree should be disabled. Change-Id: I366d177908d90a7f26c46805bc84b00b4cdad2dd Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-06-02Missing Push URIMathias Kinzler1-2/+6
A "Remote" configuration should be usable for "Push" even if only a "Fetch" URI has been configured. Bug: 314573 Change-Id: I97e2d4c5991320fb8817cf27778b64e1496943ef Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-05-28Specify the Gerrit Code Review URL in our IP logShawn O. Pearce1-0/+3
This way the IP log record can link back to the actual change in Gerrit Code Review, improving the cross-linking. Change-Id: I05df1d9ba6f9d0411cf9e0c568a57fd3a54032a1 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-05-28Denote EGit consumes JGit in the project IP logShawn O. Pearce1-0/+5
Change-Id: I4eae7d73e01a4b94f6789af7c27d15595da733ba Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-05-28Update cache of IPzilla CQ 3905Shawn O. Pearce1-0/+6
Change-Id: Iad57647a71410aeb78bc864a56109d4d67138581 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2010-05-28RepositorySearchDialog: String ExternalizationMathias Kinzler3-1/+6
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-05-28Merge "Extract public class RepositoryCache from GitProjectData"Mathias Kinzler3-28/+77
2010-05-28Merge "Project org.eclipse.egit.doc does not need Java nature"Mathias Kinzler1-6/+0
2010-05-28Update EGit eclipse help from wikiMatthias Sohn131-1000/+2342
- Update "EGit user guide" from http://wiki.eclipse.org/EGit/User_Guide Also include additional git documentation: - "Git for Eclipse Users" from http://wiki.eclipse.org/EGit/Git_For_Eclipse_Users Remove the following wiki pages since they are specific to Eclipse foundation and not interesting for other Eclipse users: - "Git at Eclipse" from http://wiki.eclipse.org/Git - "Migrating to Git at Eclipse" from http://wiki.eclipse.org/Git/Migrating_to_Git Change-Id: I9a664f93910f1bd983786c57223296bceaee1c1a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-05-28Project org.eclipse.egit.doc does not need Java natureMatthias Sohn1-6/+0
This bundle only contains help content and no Java sources so far. Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-05-28Fix SWTBot test: Use ceiling directoryStefan Lay2-1/+11
The SharingWizardTest did not work in the maven build. The test assumes that no git repository is found above the test project. When the junit-workspace was located inside a git repository this condition was not fulfilled. This is fixed using a MockSystemReader and a ceiling directory. Change-Id: I25913a2709512e25c211a31d431514561259bf80 Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-05-27Extract public class RepositoryCache from GitProjectDataJens Baumgart3-28/+77
GitProjectData contains a cache for Repository instances. This cache is used for Reposiotry instances related to projects. Since there are also Repository instances with no related project (e.g. in RepositoriesView) the cache was moved to a public class RepositoryCache to enable sharing Repository instances even if there is no related project. Change-Id: I5526362279d87fd6f2651ee991bb08ea4cd65c2b Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-05-27Make dependency on wikitext bundles optionalMatthias Sohn1-2/+2
We only need the wikitext jars during maven build when updating the help content from the egit wiki. If these dependencies are not optional the installation of egit fails on Eclipse installations that do not have wikitext. Bug: 314707 Change-Id: Ic340f8ee268fea70c50be34c0072444734911290 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-05-27Fix RepositorySearchDialogMatthias Sohn1-110/+174
This fixes the following problems: 1) the filtered tree was rendered twice on the dialog 2) the search result was empty, even if the directory input field was prefilled with an existing directory Change-Id: I1df69ee15209f6a565bcdc8d553fe20f9ea159da Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-05-26Label texts should use sentence caseMatthias Sohn1-1/+1
Bug: 312100 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-05-26Add mnemonics to menusStefan Lay2-44/+44
Eclipse menus should be easily accessible by keyboard. Mnemonics help the user to directly access the desired menu item. Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-05-26Merge "Fix missing support for monitor == null"Chris Aniszczyk6-6/+42
2010-05-26Fix missing support for monitor == nullJens Baumgart6-6/+42
Fix implementors of IEGitOperation.execute: monitor == null is supported now. Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-05-26Merge "Use latest wikitext for help generation and add additional wikis"Chris Aniszczyk4-143/+62
2010-05-26Merge "Retrieve wikitext jars via OSGi dependencies and maven"Chris Aniszczyk6-5/+15
2010-05-26Fix JavaDoc in IEGitOperationJens Baumgart1-0/+3
Fix JavaDoc of method execute. Bug: 312768 Change-Id: I1f5f329881ce1951dedb566e9e0de01ff1f0973f Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-05-26Use latest wikitext for help generation and add additional wikisMatthias Sohn4-143/+62
With wikitext 1.3 the ant script can be simplified heavily. Also add additional wikis to be included in the EGit documentation. Change-Id: I3b9fb4bb65fe45d51fdd77e2356c0e722e10377c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-05-26Retrieve wikitext jars via OSGi dependencies and mavenMatthias Sohn6-5/+15
Previously the required wikitext binaries were committed into the repository. Instead we are now downloading them from the wikitext p2-repository during the build. Change-Id: I92fb710ad2e7c4d1099686176bdfe6845abd632a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-05-25Silence a javadoc diagnostic with Eclipse 3.4Robin Rosenberg1-3/+6
The FilteredCheckboxTree.getRefreshJobDelay method overrides a method in Eclipse 3.5, which means it does not require a javadoc. The project settings reflects and enforces this, which does not work with Eclipse 3.4 since getRefreshJobDelay is a new method there and the compiler flags this as an error. Since this is the only place where this is a problem we create a javadoc comment instead of relaxing the rules. Change-Id: I9861336bb7b81d398119d4355e0fe3d303c38b55 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2010-05-25Make FilteredCheckboxTree compatible with Eclipse 3.4Chris Aniszczyk1-1/+1
When we added FilteredCheckboxTree support to EGit, we broke compatibility with Eclipse 3.4 by calling a 3.5+ constructor on FilteredTree. The fix is to call the older constructor. Change-Id: I1d4ee2fcbf9863b4957f7369843c5a292a8dee93 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-05-25Merge "Improve JavaDoc of IEGitOperation"Chris Aniszczyk1-0/+5
2010-05-25Improve JavaDoc of IEGitOperationJens Baumgart1-0/+5
JavaDoc of method getSchedulingRule was extended. Bug: 312768 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-05-25Merge "Improve layout of tagging dialog"Chris Aniszczyk1-3/+3
2010-05-25Fix compare error by checking if blob is contained in commitStefan Lay4-205/+278
Opening compare editor on a deleted file in the file list of the History View caused a message to be logged. The reason was that the blob was not found in the commit. This patch makes use of code that was already available for other compare actions. To allow for reuse, a new class CompareUtils is introduced. Bug: 312852 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-05-24Improve layout of tagging dialogMatthias Sohn1-3/+3
Width of commit selection combo and consequently also the tagging dialog grew too large if there were commit messages with a long header line. Also commit selection combo didn't get enough vertical space when opened initially. Bug: 314053 Change-Id: Icd65e211968ed87acc3c0e936ac29239a994743a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-05-24Dialog improvements with TitleAreaDialogChris Aniszczyk4-14/+14
A few of the dialogs were improved by extending TitleAreaDialog instead of the vanilla JFace Dialog class. Change-Id: Iec1cf7668e687c0e0e86072bc2eb933d06709667 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-05-24Use a FilteredTree in BranchSelectionDialogChris Aniszczyk1-5/+8
To improve the usability of the branch selection dialog, we will add a filtered tree to help users navigate things. Bug: 314132 Change-Id: If1b9e2ab3a69c1d47d212eb089b644b4af269715 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-05-24Handle InvalidMergeHeadsExceptionChris Aniszczyk1-0/+3
Change-Id: Idfbaca9dd585dd837478c39ffd385c53980bf9f1 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-05-24'Label Decorations' preference page has conflicting mnemonicsChris Aniszczyk3-2/+10
Bug: 309609 Change-Id: I003fa85ecf1934a02e4b14ff6f788dd69cb11d24 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-05-24Add action to trigger (fast-forward) mergeStefan Lay15-175/+616
Add a new action to the team menu which opens a merge dialog where a branch can be selected. Currently jgit supports only fast-forward merges, therefore the action label is "Fast-forward merge..." In order to achieve better reuse the BranchSelectionDialog is refactored. Change-Id: I3a97d262fd4032d8cc045e94429608b49a937c0f Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-05-24RepositorySearchDialog improvementsChris Aniszczyk5-83/+523
The repository search dialog was improved to take advantage of a new FilteredCheckboxTree. The layout of the dialog itself was also improved. Change-Id: Icd3b3e5d5c6ae136c44b9e70c53d73e10759a0a4
2010-05-24Add tag icon for tags in tag list in CrateTagDialogDariusz Luksza1-1/+12
Adds tag icon for each tag that is in 'Existing tags' list in CreateTagDialog. Change-Id: Ib11cdcc7df976368fa64d6d26a5de339864cb57e Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2010-05-22Git Repostiories View: add context menu for fetch and push wizardsMathias Kinzler3-3/+48
This makes the fetch and push wizards available from the Git Repositories View. Change-Id: If8fb891ca4d4a79c00e4774ba0ef0382fee58654 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-05-21Perform commit in a JobStefan Lay6-219/+411
Put the commit logic into a new CommitOperation. Run the CommitOperation in a Job and report progress. Allow for canceling before the index is written to disk. Bug: 313858 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
2010-05-21Add new icons for track and untracking changes.Chris Aniszczyk3-2/+2
The old icons weren't representative enough of tracking. The icons were updated to use glasses to represent tracking. Change-Id: Ib6125cb9f3d730d08b5b2a2cb043a909675b1f8d Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-05-21Merge "Better icon for assume unchanged action"Chris Aniszczyk3-1/+1
2010-05-20Better icon for assume unchanged actionMatthias Sohn3-1/+1
A green plus doesn't imply that changes will not be considered. Also already provide the icon for the no-assume-unchanged action which isn't available yet. Change-Id: I61a3bcd8e77b375dc6a1cc7a85847527895c0167 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-05-20Merge "Git Label Decorations of "detached" HEAD"Chris Aniszczyk3-8/+241

Back to the top