Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-12-17Qualify post 0.10.1 buildsstable-0.10Matthias Sohn18-108/+108
Change-Id: I87f6bacbb0e1b01f692bae4ccb7d47139d0d9272 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-17EGit 0.10.1v0.10.1Matthias Sohn18-108/+108
Change-Id: I704a092b79cf6280c862805ccec5336526e470ba Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-16Update EGit Documentation for 0.10Matthias Sohn286-3157/+2307
Also include JGit User Guide and New and Noteworthy 0.10. Used ImageOptim to reduce image sizes. Change-Id: I2232c3266bd89f7afbb14dd73c4465968cd62a32 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-14Merge "Do not put user to URI when using http / https" into stable-0.10Matthias Sohn1-4/+12
2010-12-14Do not put user to URI when using http / httpsJens Baumgart1-4/+12
Currently the repository selection page (used by clone wizard and other wizards) automatically puts a user entered in the user field to the URI. This is a security hole for http and https usage. Furthermore configuring http based push does not work because proxy servers often reject URLs with contained user. The automatic update of the URI field with the user was disabled for the protocols http and https. Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-12-14Fix cloning a repository with detached HEADStefan Lay9-52/+108
The clone wizard could not handle remote repositories where the HEAD is no branch. The SourceBranchPage threw an exception in the LabelProvider. When the user selected "HEAD" on the CloneDestinationPage the cloned repository was inconsistent. Furthermore it is now possible to use the CloneOperation with arbitrary Refs, not only with refs/heads/*. Bug: 326693 Change-Id: Ibd999956bbecee148dbfd4ceb997741c09e3f87e Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-13Overwrite getAncestor() in local and cache CompareInputDariusz Luksza2-0/+10
In some cases standard implementation of getAncestor() method in GitCompareInput return miss leading data. Therefore it should be overwritten in GitLocalCompareInput and GitCacheCompareInput and return the same value as getRight(). Bug: 331929 Change-Id: Ifcc040fd15f354afe8f10604a9f44e220f31f452 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2010-12-13Fix compare input for local changes nodes.Dariusz Luksza11-37/+295
GitModelBlob class was using compare() and hashCode() methods implementation from GitModelCommit, therefore in some cases Compare View was showing wrong files in comparison. It also fixes wrong headers in the compare editor. Bug: 326674 Change-Id: If42607deca500f3439c512382af0b13b01b90b3d Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2010-12-13Merge "Fix NPE in PushWizard"Chris Aniszczyk1-1/+1
2010-12-13Fix NPE in PushWizardJens Baumgart1-1/+1
NPE occurred when pushing to a configured remote. Bug: 332392 Change-Id: If31661f4f6a7829d4066ab9afcc8cb18f6925f76 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-12-13Do not try to delete an already deleted folderMariot Chauvin1-2/+5
Originally, the remove command tries to delete first the working directory (if repository has one) and then the metadata directory. However the metadata directory could be contained by the working directory and thus already deleted when the second deletion is called. In this case an IOException will be thrown, to indicate that the metadata directory could not be deleted. The correction simply checks that the metadata directory exists before trying to delete it. Bug: 332262 Change-Id: I6f49db1c8e730ab3c10d35e2af0e4dc81b5a223c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-10Fixed ignored presetUri in RepositorySelectionPageSimon Kaufmann1-1/+1
The repository selection page was ignoring the presetUri parameter if provided, so it was only possible to pre-fill the dialog by using the clipboard. Bug: 332315 Change-Id: I1eb4a7fa0629926db83101c33670b5eaec46361f
2010-12-09Merge "Add Skip and Continue to Rebase menu"Matthias Sohn11-76/+306
2010-12-09Add Skip and Continue to Rebase menuMathias Kinzler11-76/+306
This depends on JGit change http://egit.eclipse.org/r/#change,2081 which implements --skip and --continue in the corresponding JGit command. Skip is also added to the RebaseResultDialog. Change-Id: I4db94bc6306e28d1f0c43eb9840d38cc036c56da Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-12-09Merge "Commit Dialog: reset author if amend is deselected"Jens Baumgart1-1/+2
2010-12-09[findbugs] Do not ignore exceptional return valueMatthias Sohn15-203/+126
java.io.File.delete() reports failure as an exceptional return value false. Fix the code which silently ignored this exceptional return value. Also remove some duplicate deletion helper methods. This change depends on jgit change I430c77b5. Change-Id: I61508c944a88277929e5653ba78f5ad1973e4873 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-09Merge "Cleanup menus in Repositories View"Mathias Kinzler1-369/+419
2010-12-09EGit Build: use jetty 7.1.6Jens Baumgart1-1/+1
jetty 7.1.6 is used instead of 7.0.1 to get the same version as in the JGit build. Change-Id: Ide49083b7fcfd528bf998c38d2a12e1a67f066d0 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-12-09Commit Dialog: reset author if amend is deselectedEdwin Kempin1-1/+2
If in the commit dialag the amend option is selected the author field is automatically updated to the author of the previous commit. However if the amend option got deselected again the author of the previous commit stayed in the author field. With this change the author field is now reset to the original value if the amend option is deselected. Signed-off-by: Edwin Kempin <edwin.kempin@gmail.com>
2010-12-09Cleanup menus in Repositories ViewMatthias Sohn1-369/+419
Sort menus in the Repositories View reasonably and add some icons. Change-Id: If22ee0c90728c537e01a68c25e64ea0796834191 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-08Adapt egit to jgit change Idb176736Matthias Sohn7-28/+25
JGit change Idb176736fa0dc97af372f1d652a94ecc72fb457c changed handling of WorkingTreeOptions and filemode breaking the egit build. Change-Id: Iee407b7bfb3c65df5c3562b3bdabb5637f04b481 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-12-08Update DiscardChangesOperation usage of DirCacheCheckoutChris Aniszczyk1-1/+1
DirCacheCheckout.checkoutEntry() was modified. Change-Id: I56f634afaba354f91e1dd2e1eb88c9a8b6e59e7a Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2010-12-08Merge "Add icon for rebase command"Chris Aniszczyk2-0/+3
2010-12-08Add icon for rebase commandMatthias Sohn2-0/+3
Change-Id: I135df486ff8f73033341127d8c040c9df6b3d7d8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-08Merge "Fix EGit build"Chris Aniszczyk1-2/+1
2010-12-08Fix EGit buildJens Baumgart1-2/+1
JGit commit e3881de258b4db6a0d9284e6154a11f3c7eacf37 broke the build. Change-Id: I584fc1d34ce7fd294539c57770e8ab757428e513 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-12-08Implement UI Tests for http authenticationJens Baumgart7-71/+205
Implements a test for the clone wizard using http authentication. Depends on JGit Change I13bfc4c6c47e27d8f97d3e9752347d6d23e553d4 Change-Id: Ibe56d8e7352a121431e02ebeceab158267945843 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-12-08Merge "[historyView] Drop column in CommitFileDiffViewer"Matthias Sohn1-15/+0
2010-12-08Fix AdaptableFileTreeIteratorTestJens Baumgart1-1/+1
AdaptableFileTreeIteratorTest was broken by JGit change a02be9725c9f83f0a0280a9a1f00e8d484825885 Change-Id: Ice5d48dfbb132312d34ad234b2d3a1aa267daf26 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-12-08[historyView] Drop column in CommitFileDiffViewerMathias Kinzler1-15/+0
As suggested by Remy in bug 331183, show the file list without a column; this results in a better resize behavior and also saves some real estate for the (rather useless) header. Bug: 331183 Change-Id: If2b3e3e2cd1673a2e77986377e2b5f497efde3e1 Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-12-08Merge "Rebase Interoperability: do not auto-abort upon conflict"Matthias Sohn10-129/+334
2010-12-08Rebase Interoperability: do not auto-abort upon conflictMathias Kinzler10-129/+334
EGit now stops when a conflict is found during rebase and allows the user to manipulate the content; they can then switch to the command line to continue the rebase. The rebase result dialog also offers the options to abort the current rebase altogether or to open the merge tool to work out the conflicts. Change-Id: Ie694e09b45c43ee82254231d4f619fbe5510d5eb Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-12-07Merge "Stabilize GitCloneWizardTest"Chris Aniszczyk1-9/+12
2010-12-07Stabilize GitCloneWizardTestJens Baumgart1-9/+12
GitCloneWizardTest sometimes failed because the end of the clone operation was not await correctly. Change-Id: Iae8328c7ed7d582534859c6401dca3c52b3ddeec Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
2010-12-07Use abbreviate() instead of substring() on RevCommit nameDariusz Luksza2-2/+2
Change-Id: I4e72df0bee7860fca0ef84a415497bb7d6c70393 Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
2010-12-07Fix JDK 6 Usage of Arrays.copyOf()Mathias Kinzler1-2/+3
Change-Id: Ia9e6bf4d116131852f4fb876b3b6a95d27a0907d Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
2010-12-06Merge "[findbugs] Do not expose internal object representation"Chris Aniszczyk1-1/+2
2010-12-06Merge "Adapt to incompatible jgit change Idc5f097d"Chris Aniszczyk2-11/+13
2010-12-06Merge "[findbugs] Ensure closing writer in finally block"Chris Aniszczyk2-6/+16
2010-12-06Merge "[findbugs] Do not directly expose mutable static member"Chris Aniszczyk5-9/+13
2010-12-05[findbugs] Ensure closing writer in finally blockMatthias Sohn2-6/+16
Change-Id: Ifd117e7a6c567d5e1a34192bf3b6db9964606638 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-05[findbugs] Do not directly expose mutable static memberMatthias Sohn5-9/+13
Change-Id: I95625a14586f3c49601a7a8409c0d8c49d91920c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-05[findbugs] Do not expose internal object representationMatthias Sohn1-1/+2
To prevent callers to modify the internal representation of field modifiedContent return a copy of this data. Change-Id: Ie6a3fe5e9cf999ea8c90088b10a463fbae2258c3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-05[findbugs] Change type of userHomeConfig to FileBasedConfigMatthias Sohn1-9/+3
SystemReader.openUserConfig() returns FileBasedConfig hence there is no way how userHomeConfig could have a different type. This fixes FindBugs warning BC_VACUOUS_INSTANCEOF. Change-Id: Iedb4485da9326bf71d718fa8ed385f98e1aa31f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-05Adapt to incompatible jgit change Idc5f097dMatthias Sohn2-11/+13
The jgit change Idc5f097d removed the result id from CommitBuilder, TagBuilder, hence we obtain the object id from ObjectInserter now. Depends on jgit change Idc5f097d Change-Id: I621645a60b0b178fc72f7e3d6785bfe3458c7c3d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> cc: Shawn Pearce <spearce@spearce.org>
2010-12-03Merge "Fix variable naming issues in GitModelObjectContainer"Chris Aniszczyk8-28/+28
2010-12-03Merge "[findbugs] Use more efficient valueOf() instead of new Integer()"Chris Aniszczyk1-1/+1
2010-12-03[findbugs] Use IO.readFully to read file contentMatthias Sohn1-20/+11
This fixes dead store FindBugs warning for local bytes variable. Change-Id: I91faa6f7c9badb021023735162d1444c97d9711d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-03[findbugs] Use more efficient valueOf() instead of new Integer()Matthias Sohn1-1/+1
Missed this occurrence in previous commit. Change-Id: I0a84af9dc72feb83d3f16258496357126a2500a6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2010-12-03[findbugs] Silence FindBugs warning to implement CloneableMatthias Sohn1-0/+6
Change-Id: Ie479927c21b859155a01651d8be9e7d7bff78982 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top