Shawn O. Pearce [Mon, 28 Dec 2009 23:55:49 +0000 (15:55 -0800)]
Use Constants.OBJECT_ID_STRING_LENGTH instead of LEN * 2
A few locations were doing OBJECT_ID_LENGTH * 2 on their own, as
the old STR_LEN constant wasn't visible. Replace them with the
new public constant OBJECT_ID_STRING_LENGTH.
Change-Id: Id39bddb52de8c65bb097de042e9d4ed99598201f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Robin Rosenberg [Mon, 28 Dec 2009 15:54:43 +0000 (16:54 +0100)]
Get rid of a duplicate constant for SHA-1 length
Since Constants.OBJECT_ID_LENGTH is a compile time constant we
can be sure that it will always be inlined. The same goes for the
associated constant STR_LEN which is now refactored to the Constant
class and given a name better suited for wider use.
Change-Id: I03f52131e64edcd0aa74bbbf36e7d42faaf4a698 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Nico Sallembien [Tue, 22 Dec 2009 19:02:24 +0000 (11:02 -0800)]
Fix typo in ReceivePack.java
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.
Igor Fedorenko [Sat, 19 Dec 2009 00:06:38 +0000 (19:06 -0500)]
Use Tycho version 0.6.0
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>
Shawn O. Pearce [Tue, 17 Nov 2009 18:25:14 +0000 (10:25 -0800)]
tools/version.sh: Update embedded version numbers in build products
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:
Shawn O. Pearce [Wed, 4 Nov 2009 16:57:29 +0000 (08:57 -0800)]
Use a more specific Bugzilla URL
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>
Shawn O. Pearce [Wed, 4 Nov 2009 16:32:50 +0000 (08:32 -0800)]
Use JUnit 3.8.2 under CQ 3589
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>
Matthias Sohn [Wed, 4 Nov 2009 00:53:09 +0000 (01:53 +0100)]
Remove reference to branding plugin
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>
* 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
Shawn O. Pearce [Sun, 1 Nov 2009 02:39:18 +0000 (19:39 -0700)]
Prompt for passwords from the console in jgit command line tools
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>
Shawn O. Pearce [Sat, 3 Oct 2009 23:52:33 +0000 (16:52 -0700)]
Refactor the cached Authenticator data out of AwtAuthenticator
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>
Shawn O. Pearce [Sat, 3 Oct 2009 01:58:22 +0000 (18:58 -0700)]
Only import the sample data packs on tests that need them
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>
Shawn O. Pearce [Sat, 3 Oct 2009 01:07:24 +0000 (18:07 -0700)]
Move T0007_Index to exttst
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>
Shawn O. Pearce [Sat, 3 Oct 2009 01:08:56 +0000 (18:08 -0700)]
Create JUnit test utilities for JGit derived sources
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>
Shawn O. Pearce [Sat, 3 Oct 2009 00:12:37 +0000 (17:12 -0700)]
Delete obsolete JarLinkUtil
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>
Shawn O. Pearce [Sun, 1 Nov 2009 01:07:26 +0000 (18:07 -0700)]
Refactor our Maven build to be modular
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>
Shawn O. Pearce [Sun, 1 Nov 2009 00:11:29 +0000 (17:11 -0700)]
Correct location of AmazonS3 command line client
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>
Mykola Nikishov [Fri, 9 Oct 2009 18:57:59 +0000 (21:57 +0300)]
Move AWT UI code to new org.eclipse.jgit.ui bundle
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.
Sasa Zivkov [Fri, 9 Oct 2009 12:43:45 +0000 (14:43 +0200)]
Don't create .git/remotes folders on init
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>
Robin Rosenberg [Sat, 24 Oct 2009 09:48:04 +0000 (11:48 +0200)]
Move pure IO utility functions to a utility class of its own.
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>
Shawn O. Pearce [Sat, 31 Oct 2009 21:53:29 +0000 (14:53 -0700)]
Eclipse IDE: Automatically remove trailing whitespace on save
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>
Alex Blewitt [Mon, 19 Oct 2009 08:48:00 +0000 (09:48 +0100)]
Remove trailing whitespace at end of line
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>
Make the default encoding when reading commits UTF-8
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.
* 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
Shawn O. Pearce [Mon, 5 Oct 2009 21:17:16 +0000 (14:17 -0700)]
Mark JGit plugin as 0.6
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>
Shawn O. Pearce [Sat, 3 Oct 2009 22:53:24 +0000 (15:53 -0700)]
Move HttpSupport's configureHttpProxy to jgit-pgm
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>
Shawn O. Pearce [Sat, 3 Oct 2009 22:43:34 +0000 (15:43 -0700)]
Move AmazonS3 command line utility to jgit-pgm
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>
Shawn O. Pearce [Sat, 3 Oct 2009 02:01:04 +0000 (19:01 -0700)]
Remove useless test005_todopack test
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>
Add support for logAllRefUpdates configuration parameter
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>
Shawn O. Pearce [Fri, 2 Oct 2009 16:54:31 +0000 (09:54 -0700)]
Remove TODO file and move to bugzilla
There is no longer any value in keeping track of things we need to
implement in a file in the top level of the source code. Time has
proven we don't keep it current, as some of these features are
already implemented, and some are still being worked on.
Worse, many of these items were for the EGit plugin, which has no
relationship to JGit.
Change-Id: Iaa83491819518a1293810aafb566354bdc4b5e28 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Fri, 2 Oct 2009 16:50:48 +0000 (09:50 -0700)]
Fix SUBMITTING_PATCHES to follow the Eclipse IP process
I somehow missed that SUBMITTING_PATCHES referenced the older "send
to git mailing list by email" patch process we used for the first
few years of the JGit project's life. Now that we are hosted under
the Eclipse Foundation umbrella we need to follow their IP process
for all contributions.
Change-Id: Ia29b31746826ca5b914e0a1d108c2166ff64d268 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce [Fri, 2 Oct 2009 16:42:44 +0000 (09:42 -0700)]
Update SUBMITTING_PATCHES to point to Contributor Guide
The process is likely to change as we experiment with Gerrit Code
Review and learn the Eclipse IP process. Lets point the potential
contributor at a wiki that we can more easily keep up-to-date.
Change-Id: I99f7cb9edadd0f23024f59ec139dd1e35f5fbd3f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Jonas Fonseca [Sun, 20 Sep 2009 13:34:37 +0000 (09:34 -0400)]
Make it possible to clear a PlotCommitList
This allows SwingGraphPanes to be reused by simply clearing and
re-filling. Requires RevObjectList initialization to not call clear()
from its constructor, because this will lead PlotCommitList.clear()
to be called before all variables have been initialized.
Change-Id: I14a07124441b58cd88c67da088ba52ef9c30b043 Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This script can be executed by a developer to download and graft
on the old JGit history, from before we moved the project to the
eclipse.org namespace and the Eclipse Foundation servers.
Executing this script is only necessary if you need to run log or
blame past the migration boundary, and isn't always recommended when
it comes to pushing objects to a remote server. As mentioned in the
script, it is best to use a specialized repository with this graft,
not your main work repository.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Per CQ 3448 this is the initial contribution of the JGit project
to eclipse.org. It is derived from the historical JGit repository
at commit 3a2dd9921c8a08740a9e02c421469e5b1a9e47cb.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
projects / jgit.git / log