summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added -crfl attribute for DiffFormatterReflowTest test dataConstantine Plotnikov2009-12-271-0/+3
| | | | | | | | | | | The test data is expected to have unix new lines by tests, but it is converted to crlf on Windows platform (with msys git). As result DiffFormatterReflowTest tests fail. To prevent this problem, crlf conversion is disbled for test data related to that test. Bug: 295077 Change-Id: I67d3ed543fcc38647041896146de12b1781ec6be Signed-off-by: Constantine Plotnikov <constantine.plotnikov@gmail.com>
* Merge change I5b232f67Code Review2009-12-221-2/+2
|\ | | | | | | | | * changes: Fix typo in ReceivePack.java
| * Fix typo in ReceivePack.javaNico Sallembien2009-12-221-2/+2
| | | | | | | | | | | | The comment indicates that a well-behaved client should not have sent an update for a ref that already exists, but this in a block that corresponds to a create command.
* | Don't crash if we try to load the config for a MockSystemReaderRobin Rosenberg2009-12-211-1/+8
| | | | | | | | | | | | | | | | | | Instead do nothing. For now, save() will fail and the config file is set to null, which may surprise some calling tests. Change-Id: I1c65f8b1131569da01b4ef33678d813565521fbb Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Use Tycho version 0.6.0Igor Fedorenko2009-12-201-18/+1
| | | | | | | | | | | | | | | | | | | | | | Changed Tycho version from 0.6.0-SNAPSHOT to 0.6.0 (i.e. release). SNAPSHOT versions are transient and should only be used for testing purposes only. Also removed now unnecessary <pluginRepositories/> element from JGit parent pom.xml file. Change-Id: Ie386b2dbcba43c1ccec10465978d12d6829c6150 Signed-off-by: Igor Fedorenko <igor@ifedorenko.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Method to get a 'humanish' name from a pathMykola Nikishov2009-12-193-8/+178
| | | | | | | | | | | | Change-Id: Iec0688232bd59d4626111d77633109918e8e1df3 Signed-off-by: Mykola Nikishov <mn@mn.com.ua> Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | Ignore target/ folder and compile.org.eclipse.jgit.xmlMykola Nikishov2009-12-121-0/+2
| | | | | | | | | | | | | | | | | | target/ is for Maven build output compile.org.eclipse.jgit.xml is generated on Export - Deployable Features Signed-off-by: Mykola Nikishov <mn@mn.com.ua> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I557a95792fd45c3cfe37098e057c1e70660b3308
* | Flipped jgit.core to manifest-first maven-3/tycho buildIgor Fedorenko2009-12-083-12/+110
|/ | | | | Change-Id: I6005134a45046d16e323a2f9b2815831cdbe15e0 Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
* Replace a hard-coded default remote's name with a constantMykola Nikishov2009-11-294-3/+8
| | | | Change-Id: I4e369382b8a83a5c0772462d1b176b1e23910ada
* tools/version.sh: Update embedded version numbers in build productsShawn O. Pearce2009-11-171-30/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | We can now use `tools/version.sh --release` to update the MANIFEST.MF and Maven POM files with the current version number of this project, so they appear in any build product created. The counterpart --snapshot option be used to reset files to use their natural *-SNAPSHOT and *.qualifier state during development. We use a simple Bourne shell script with Perl calls because we must edit both Maven pom.xml and OSGi bundle MANIFEST.MF in order to store the correct data for our parallel build systems. In the future we should use a native Java solution which relies upon JGit to compute the `git describe` portion. Until we tag our first official release a "tagged snapshot" can be made by creating an artifical annotated tag first: git tag -a -m "initial contribution" v0.5.1 046198cf5f21e5a63e8ec0ecde2ef3fe21db2eae tools/version.sh --release Resulting in a version string like "0.5.1.50-ge16af83". Change-Id: Ic2bbae75bf96fc8831324c62c2212131277f70e4 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Use a more specific Bugzilla URLShawn O. Pearce2009-11-041-1/+1
| | | | | | | | | | This URL filters the search results within the entire Eclipse.org Bugzilla server to only this that are open and pertain to our project. It also sets up the "File a new bug" link to send any new issue in our direction. Change-Id: I5d50a2e7d0b34efb386492aedfe28f4ae67f92bc Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Use JUnit 3.8.2 under CQ 3589Shawn O. Pearce2009-11-041-1/+2
| | | | | | | | | | | CQ 3589 was submitted to request permission to use JUnit 3.8.2 from Orbit. We don't redistribute JUnit but we compile against it and do redistribute a test support JAR (org.eclipse.jgit.junit) that would depend upon it if someone were to develop their own application code and also wish to write unit tests with JUnit. Change-Id: I23b1f23e064224363585ec2f5dd62a0b4d28fb5b Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Remove reference to branding pluginMatthias Sohn2009-11-041-2/+1
| | | | | | | | | | JGit does not contribute to the Eclipse UI hence it should not refer to a branding plugin. See discussion on egit-dev : http://dev.eclipse.org/mhonarc/lists/egit-dev/msg00304.html until http://dev.eclipse.org/mhonarc/lists/egit-dev/msg00306.html Change-Id: I9153dea60d9d1724662ca079f16528a36c295b5d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge changes ↵Code Review2009-11-0379-1158/+3162
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I057c782c,Idff096ce,Ic9be0280,I07014d1b,Id8a76ee7,I9080f3dd,I8c1a0eb8,Ibaf87bb5,I9e1f1f5a,I355e95fa * changes: Prompt for passwords from the console in jgit command line tools Move AWT based SSH authenticator to ui bundle Refactor the cached Authenticator data out of AwtAuthenticator Only import the sample data packs on tests that need them Move T0007_Index to exttst Refactor RepositoryTestCase to use LocalDiskRepository instead Create JUnit test utilities for JGit derived sources Delete obsolete JarLinkUtil Refactor our Maven build to be modular Switch pgm, test to proper plugin projects
| * Prompt for passwords from the console in jgit command line toolsShawn O. Pearce2009-11-0217-2/+882
| | | | | | | | | | | | | | | | | | | | If we are on a Java 6 JVM we should have the Console class available, unless the user has redirected /dev/null to stdin. When there is a console present we would prefer to use that for command line prompts as that is what the user expects from a command line tool. Change-Id: Ibaf87bb5540371d94d96d1b7e94ca002f752e5bd Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Move AWT based SSH authenticator to ui bundleShawn O. Pearce2009-11-024-117/+197
| | | | | | | | | | | | | | | | This way SWT based applications don't wind up loading this AWT based code when using SSH. Change-Id: I9080f3dd029c2a087e6b687480018997cc5c5d23 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Refactor the cached Authenticator data out of AwtAuthenticatorShawn O. Pearce2009-11-024-70/+139
| | | | | | | | | | | | | | | | | | | | This makes it easier to swap out authenticator implementations and yet still rely upon being able to configure at least one Authenticator instance in the JVM and program it with data obtained from outside of the user interface. Change-Id: I8c1a0eb8acee1d306f4c3b40a790b7fa0c3abb70 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Only import the sample data packs on tests that need themShawn O. Pearce2009-11-0216-40/+97
| | | | | | | | | | | | | | | | | | | | | | Not all of our test cases really require the sample data packs, and we are better off not using them because its hard to see exactly what condition a test is testing when looking only at the Java code. Clarify the dependency by only making the packs available when there is a real need for it. Change-Id: Id8a76ee7ee1f7efba585be4bed19a8fb5b3b3585 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Move T0007_Index to exttstShawn O. Pearce2009-11-021-18/+23
| | | | | | | | | | | | | | | | | | | | This test depends upon the external git binary, and this isn't really a pure Java test like our module tries to claim itself is. So we move it out to exttst with other tests that require additional external resources and/or executable code. Change-Id: Ic9be0280c8bb50a5768336c64de794eb0a492b3d Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Refactor RepositoryTestCase to use LocalDiskRepository insteadShawn O. Pearce2009-11-0211-359/+79
| | | | | | | | | | Change-Id: I07014d1b8cc2fab0761d644a12e4ae04f0adf3ef Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Create JUnit test utilities for JGit derived sourcesShawn O. Pearce2009-11-0214-0/+1081
| | | | | | | | | | | | | | | | | | | | The LocalDiskRepositoryTestCase class is derived from the current RepositoryTestCase code and is meant for application (or our own) tests to subclass and access temporary repositories on the local client disk. Change-Id: Idff096cea40a7b2b56a90fb5de179ba61ea3a0eb Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Delete obsolete JarLinkUtilShawn O. Pearce2009-11-021-212/+0
| | | | | | | | | | | | | | | | | | Since we are now using the maven-shade-plugin to flatten out our dependencies into a single stand-alone JAR we no longer need to use our own command line utility. Change-Id: I057c782cc66c44f11ed2ff2b4b4ca9cc82c7426a Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Refactor our Maven build to be modularShawn O. Pearce2009-11-0216-433/+702
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop our simple and stupid jgit.sh and instead rely upon Maven for the command line based build. Maven is relatively simple to download and install, and doesn't require the entire Eclipse IDE. To avoid too much refactoring of the current code we reuse the existing src/ directory within each plugin, and treat each of the existing OSGI bundles as one Maven artifact. The command line wrapper jgit.sh no longer works in the uncompiled state, as we don't know where to obtain our JSch or args4j from. Developers will now need to compile it with `mvn package`, or run our Main class from within an IDE which has the proper classpath. Bug: 291265 Change-Id: I355e95fa92fa7502651091d2b651be6917a26805 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Switch pgm, test to proper plugin projectsShawn O. Pearce2009-11-029-5/+60
| | | | | | | | | | | | | | | | This way we depend upon the MANIFEST.MF to define our classpath and our build will act more like any other OSGI bundle build. Change-Id: I9e1f1f5a0bccb0ab0e39e49b75fb400fea446619 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Merge change Ic1c8969bCode Review2009-11-031-1/+1
|\ \ | |/ |/| | | | | * changes: Use org.eclipse.egit branding plugin
| * Use org.eclipse.egit branding pluginMatthias Sohn2009-10-201-1/+1
| | | | | | | | | | | | | | | | We do not need two branding plugins for two related features and org.eclipse.jgit is not a branding plugin. Change-Id: Ic1c8969bbed89f693c7e11108d6baba013f71711 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Correct location of AmazonS3 command line clientShawn O. Pearce2009-10-311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This code belongs inside of the org.eclipse.jgit.pgm bundle so it is executable from the command line. In af5cb5ced938 ("Move AmazonS3 command line utility to jgit-pgm") I accidentally moved this class into the wrong directory, probably during some sort of rebase when I tried to pull this commit out of its original position in an abanonded Maven refactoring series. Change-Id: I19adafa87b70586dd44040e9dfce30f3d482ed28 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Move AWT UI code to new org.eclipse.jgit.ui bundleMykola Nikishov2009-10-3118-2/+469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new UI bundle contains the org.eclipse.jgit.awtui package, which was moved out of the org.eclipse.jgit bundle. org.eclipse.jgit.pgm depends on org.eclipse.jgit.ui, so we need to update the classpath and make_jgit.sh to include it. This move takes the awtui classes out of the Maven build, which means we are no longer able to distribute these classes to our downstream Maven customers. The entire Maven package structure needs to be overhauled so that Eclipse bundle matches 1:1 with the Maven artifact. Bug: https://bugs.eclipse.org/291124 Change-Id: Ibf1a9968387e3d11fdce54592f710ec4cc7f1ddb Signed-off-by: Mykola Nikishov <mn@mn.com.ua> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Don't create .git/remotes folders on initSasa Zivkov2009-10-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For historical reasons JGit was creating .git/remotes folder when initialization an empty repository. However, this folder is never used and the new Git repository format doesn't contain them. Removed the unnecessary remotes folder creation, it was removed from C Git in 75c384efb52d ("Do not create $GIT_DIR/remotes/ directory anymore") by Junio C Hamano on Dec 19 2006. C Git hasn't made it for almost 3 years. Change-Id: I5473f3676a3642afdf9aaac44b7e6319c6e170b9 Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Move pure IO utility functions to a utility class of its own.Robin Rosenberg2009-10-3120-200/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | According the javadoc, and implied by the name of the class, NB is about network byte order. The purpose of moving the IO only, and non-byte order related functions to another class is to make it easier for new contributors to understand that they can use these functions in general and it's also makes it easier to understand where to put new IO related utility functions Change-Id: I4a9f6b39d5564bc8a694b366e7ff3cc758c5181b Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Eclipse IDE: Automatically remove trailing whitespace on saveShawn O. Pearce2009-10-313-3/+159
| | | | | | | | | | | | | | | | | | | | | | Our project coding conventions do not want trailing whitespace at the end of a source code line. Configure Eclipse to automatically remove them when saving any Java source file. Change-Id: I9701366b3b1240879761b30556e6ff416e969e1d Reviewed-by: Mykola Nikishov <mn@mn.com.ua> Reviewed-by: Alex Blewitt <alex.blewitt@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Remove trailing whitespace at end of lineAlex Blewitt2009-10-31122-652/+652
| | | | | | | | | | | | | | | | | | As discussed on the egit-dev mailing list, we prefer not to have trailing whitespace in our source code. Correct all currently offending lines by trimming them. Change-Id: I002b1d1980071084c0bc53242c8f5900970e6845 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Correcting explanation of EDLMatthias Sohn2009-10-281-2/+3
|/ | | | | Change-Id: I2f65022df4e6fe9b1db87eb29e9b079543984298 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add gitignore to constantsMykola Nikishov2009-10-161-0/+3
| | | | | | | Bug: 291133 Change-Id: I24272d029cff446ffc80063870478577d628f338 Reviewed-by: Alex Blewitt <alex.blewitt@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Refactor org.eclipse.jgit.test to be a bundleChris Aniszczyk2009-10-165-2/+32
| | | | | | | This way dependencies are described by the MANIFEST.MF, and the same build tools can be used to compile the tests. Change-Id: I4dc926148410ecbadcf71b9474aeeb509691aa32
* Fix classpath to use jsch and args4j from orbitMatthias Sohn2009-10-122-2/+2
| | | | | | | All 3rd party dependencies must come from orbit to comply with Eclipse development process. Change-Id: Ia43892ab6d0169f8335c1a41b37e8c12e94cafe2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Make the default encoding when reading commits UTF-8Constantine Plotnikov2009-10-082-11/+10
| | | | | | | | | | | | | When reading commits the system default encoding was used if no encoding was specified in the commit. The patch modifies the test to add a check that commit message was encoded correctly (the test fails on old implementation if system encoding is not UTF-8) and fixes Commit.decode() method to use UTF-8 if encoding is not specified in the commit object. Change-Id: I27101da3c2eb6edd0c4a9e4c0523e48b286e3cd5 Signed-off-by: Constantine Plotnikov <constantine.plotnikov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Remove a duplicate test from T0003_BasicRobin Rosenberg2009-10-071-10/+0
| | | | | | | | | In the pre-historic commit 6d87484b4dee5671a38e64a8e4990dff40a4874f two tests became identical. Remove one of them. Change-Id: I6182ecd4db0162d87a5f4577005b2bf4d5e8c89f Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* Merge changes I282ee1c6,I5700ca48,Ic243544a,Ia2cce34d,I2fd81be2Code Review2009-10-0515-171/+530
|\ | | | | | | | | | | | | | | | | * changes: Move HttpSupport's configureHttpProxy to jgit-pgm Move AmazonS3 command line utility to jgit-pgm Move setupReflog test function to only test that cares Remove useless test005_todopack test Standardize the source code formatter for Eclipse
| * Move HttpSupport's configureHttpProxy to jgit-pgmShawn O. Pearce2009-10-052-50/+46
| | | | | | | | | | | | | | | | | | This is the last chunk of code in jgit-core which references the awtui package. Moving it to the only consumer in jgit-pgm allows us to move the awtui package over to the jgit-awtui module. Change-Id: I2fd81be2076117b2f2c5f8ed45de7f29272af6cf Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Move AmazonS3 command line utility to jgit-pgmShawn O. Pearce2009-10-055-66/+161
| | | | | | | | | | | | | | | | | | | | | | This removes one of the few remaining dependencies on AWTAuthenticator from the core library. For the most part the interface is identical to the prior main method. The jgit-pgm Main class already sets up the HTTP proxy and authenticator for us, so we don't need to do that in our new run method. Change-Id: Ia2cce34d34c97b88214a8bd8f2cc542845e19032 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Move setupReflog test function to only test that caresShawn O. Pearce2009-10-052-19/+22
| | | | | | | | | | | | | | | | Only one test class actually needs this function, so instead of us inheriting it down into every test, move it to that one class. Change-Id: I5700ca48df4177153f2b3861dec7c538c621e775 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Remove useless test005_todopack testShawn O. Pearce2009-10-051-28/+0
| | | | | | | | | | | | | | | | | | | | This test doesn't work because it requires a pack file which we have lost to the ages. We couldn't include it because the pack was actually a copy of the GPL'd C git.git project, and was there to test some sort of corner case that the test never documented properly. Change-Id: I282ee1c6a637a8654df93a3847507a6c60e4cfab Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Standardize the source code formatter for EclipseShawn O. Pearce2009-10-055-8/+301
| | | | | | | | | | | | | | | | | | We now supply an exported format description for anyone to import into their own workbench, and all projects reference this style in a consistent way. Change-Id: Ic243544a761ef2db29025a89ba6bb932a3a3ce34 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Mark JGit plugin as 0.6Shawn O. Pearce2009-10-052-18/+18
| | | | | | | | | | | | | | | | | | Our project plan calls for us to build 0.6 as the next version, but I forgot to also update the MANIFEST.MF for the plugin when I edited the Maven pom. Change-Id: Ic1a6c64374a4384a65a3dd0306adddfc73adac52 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Add org.eclipse.jgit-featureMykola Nikishov2009-10-054-0/+126
|/ | | | | | | [sp: Externalized all strings for translation] Change-Id: Ib3f6e58e9e1cbcbc41705b6e1be37a89ca38f1a9 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* Merge change I11dc6200Code Review2009-10-051-1/+1
|\ | | | | | | | | * changes: Mark the next version as 0.6
| * Mark the next version as 0.6Shawn O. Pearce2009-10-051-1/+1
| | | | | | | | | | | | | | Our project plan calls for us to build 0.6 as the next version. Change-Id: I11dc620009d83e5715f7f2c17bbc658cc6e49f20 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | Merge change I908e4c77Code Review2009-10-054-8/+145
|\ \ | |/ |/| | | | | * changes: Add support for logAllRefUpdates configuration parameter
| * Add support for logAllRefUpdates configuration parameterChristian Halstrick2009-10-024-8/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Honor the configuration parameter core.logAllRefUpdates when writing reflogs. Instead of writing reflog entries always only write reflogs if this parameter is set to true or if the corresponding file in the <git-dir>/logs directory already exists. In other words: if you are updating a ref and this parameter is set to false and there is no file corresponding to your ref in the <git-dir>/logs folder then no reflog will be written. This is a fix for the issue http://code.google.com/p/egit/issues/detail?id=4 Change-Id: I908e4c77e3630dc3223b2d2a47cb4534dbe4ed42 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 05:00:42 +0000