Commit Graph

9778 Commits

Author SHA1 Message Date
Johannes Schindelin a3aa43ecb1 Add the "jgit diff" command
This commit contains fixes provided by Christian Halstrick.

Bug: 291083
Eclipse-CQ: 3559
Change-Id: If8d187e70a51f31040f99098489e513791dc6415
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-10-06 07:43:29 -07:00
Johannes Schindelin e34865b88b Prepare RawText for diff-index and diff-files
Bug: 291083
Eclipse-CQ: 3559
Change-Id: Ia02f346a96b5f1e24f8bc9676bd428b968a41222
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-10-06 07:43:25 -07:00
Johannes Schindelin 1a03c864a6 Add a test class for Myers' diff algorithm
Bug: 291083
Eclipse-CQ: 3559
Change-Id: I5a10946637438052e7596489b9f9de3a0c6b2066
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-10-06 07:43:21 -07:00
Johannes Schindelin d8a3b4eb31 Add Myers' algorithm to generate diff scripts
Myers' algorithm is the standard way to generate diff scripts in
an efficient manner (especially memory-wise).

The source contains extensive documentation about the principal
ideas of the algorithm.

Bug: 291083
Eclipse-CQ: 3559
Change-Id: Id873e7c2c204692cb4a1a05d24b733154b9ed49c
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-10-06 07:43:16 -07:00
Johannes Schindelin 9c056fcace Add set to IntList
Some applications may wish to modify an int list.

Bug: 291083
Eclipse-CQ: 3559
Change-Id: Iea871443ec661230aec92397229f1eda6c74216f
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-10-06 07:42:49 -07:00
Code Review 6e1571d5b9 Merge changes I282ee1c6,I5700ca48,Ic243544a,Ia2cce34d,I2fd81be2
* 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
2009-10-05 17:29:56 -04:00
Shawn O. Pearce 9b48eb940a 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>
2009-10-05 14:17:16 -07:00
Mykola Nikishov 956b12403d Add org.eclipse.jgit-feature
[sp: Externalized all strings for translation]

Change-Id: Ib3f6e58e9e1cbcbc41705b6e1be37a89ca38f1a9
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-10-05 14:03:08 -07:00
Shawn O. Pearce 41e4b2fed4 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>
2009-10-05 12:17:11 -07:00
Shawn O. Pearce 8d5510d51c 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>
2009-10-05 12:17:11 -07:00
Shawn O. Pearce 3ce8c91e75 Move setupReflog test function to only test that cares
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>
2009-10-05 12:17:11 -07:00
Shawn O. Pearce 1640812b89 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>
2009-10-05 12:17:11 -07:00
Shawn O. Pearce add24f2a36 Standardize the source code formatter for Eclipse
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>
2009-10-05 12:17:11 -07:00
Code Review 3fc3be3c2a Merge change I11dc6200
* changes:
  Mark the next version as 0.6
2009-10-05 15:13:57 -04:00
Shawn O. Pearce 50288b18f3 Mark the next version as 0.6
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>
2009-10-05 11:46:49 -07:00
Code Review 720734983b Merge change I908e4c77
* changes:
  Add support for logAllRefUpdates configuration parameter
2009-10-05 10:06:24 -04:00
Christian Halstrick ffc8b42957 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>
2009-10-02 20:49:15 +02:00
Shawn O. Pearce f5871e16d4 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>
2009-10-02 09:54:31 -07:00
Shawn O. Pearce f4964358b3 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>
2009-10-02 09:50:48 -07:00
Shawn O. Pearce 31603c06d0 Fix tabs-to-spaces in SUBMITTING_PATCHES
Change-Id: I1cf5b4355a147c39107c8b97e56108f482c96d8d
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-10-02 09:47:04 -07:00
Shawn O. Pearce e300e2be6e 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>
2009-10-02 09:42:44 -07:00
Shawn O. Pearce 6828372f3e Document protected members of RevObjectList
Recently Eclipse started complaining about undocumented protected
members here, so lets document them to make the errors go away.

Change-Id: Ia3bc9fa69854953db5dc9a982821a2f3abe8d05a
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-10-02 09:27:42 -07:00
Jonas Fonseca 36b0dcf6cb 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>
2009-10-01 16:57:32 -07:00
Sasa Zivkov 96690904f5 Include description for missing bundle prereqs
When throwing MissingBundlePrerequisiteException we
also include the short description, if available, of
each missing object.

This is the fix for the following issue:
http://code.google.com/p/egit/issues/detail?id=25

Change-Id: I5d45aec7873af76a12170d9a500626a7264f2c42
Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-10-01 16:41:43 -07:00
Chris Aniszczyk 4cfc7baf9e Cleanup MANIFEST.MF in JGit
- We shouldn't be re-exporting bundles, JSch in this case.
  Instead used a Import-Package clause.

- Some packages weren't exported.  In Eclipse we have a policy to
  export all the packages in a bundle

- Exporting version numbers on the export packages.

Bug: 291108
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-10-01 14:12:50 -07:00
Shawn O. Pearce 5f7b89cac5 Mark our one Eclipse plugin as in incubation status
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2009-09-29 18:03:31 -07:00
Shawn O. Pearce baba6a3c28 Utility to graft old JGit history onto repository
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>
2009-09-29 17:03:34 -07:00
Git Development Community 1a6964c827 Initial JGit contribution to eclipse.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>
2009-09-29 16:47:03 -07:00