]> source.dussan.org Git - jgit.git/log
jgit.git
14 years agoAdd performance tests for MyersDiff 87/87/5
Christian Halstrick [Mon, 19 Oct 2009 15:10:10 +0000 (17:10 +0200)]
Add performance tests for MyersDiff

Add some tests which make sure that the diff algorithm really behaves in the
promised O(N*D) manner. This tests compute diffs between multiple big chunks
of data, measure time for computing the diffs and fail if the measured times
are off O(N*D) by more than a factor 10

Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Change-Id: I8e1e0be60299472828718371b231f1d8a9dc21a7
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
15 years agoAdd javadoc comments, remove unused code, shift comments to correct place 53/53/1
Christian Halstrick [Fri, 9 Oct 2009 14:18:59 +0000 (16:18 +0200)]
Add javadoc comments, remove unused code, shift comments to correct place

This change only fixes warnings of the eclipse build regarding missing javadocs.
Some comments where just missing, so they have been added. Other comments where
at the wrong (from eclipse point of view) place, so eclipse was complaining.
Also two method which existed for debugging purposes have been removed to get
rid of Eclipse warngins about unused code.

15 years agoMerge change Iacb9082e into cq-diff
Code Review [Thu, 8 Oct 2009 22:45:20 +0000 (18:45 -0400)]
Merge change Iacb9082e into cq-diff

* changes:
  Fixed MyersDiff to be able to handle more than 100k

15 years agoFixed MyersDiff to be able to handle more than 100k 37/37/4
Christian Halstrick [Tue, 6 Oct 2009 14:21:39 +0000 (16:21 +0200)]
Fixed MyersDiff to be able to handle more than 100k

MyersDiff was crashing with ArrayIndexOutOfBoundsException when
diffing huge files. This was because the snake data (begin and
end position while processing chunks of the text) was sequeezed
into a single int. But with longer texts to diff these values
exceeded the range of java int values. It is fixed by squeezing
the two ints into a long and by adding the LongList helper
class.

Change-Id: Iacb9082e1b076e994d1486aa8e512342ad7432b3
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
15 years agoFix some warnings regarding unnecessary imports and accessing static methods 39/39/2
Christian Halstrick [Tue, 6 Oct 2009 09:16:31 +0000 (11:16 +0200)]
Fix some warnings regarding unnecessary imports and accessing static methods

My Galileo eclipse was complaining about unneeded import statements and
how static methods have been accessed in Diff.java. There was also one method
call which could be removed because he had no sideeffects and the return value
was not used. I fixed this so that there are no warnings anymore.

Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Change-Id: I48d7e01536aab1524140d72af574e3fd7149cd23

15 years agoAdd the "jgit diff" command 10/10/2
Johannes Schindelin [Thu, 3 Sep 2009 10:47:08 +0000 (12:47 +0200)]
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>
15 years agoPrepare RawText for diff-index and diff-files 09/9/2
Johannes Schindelin [Thu, 3 Sep 2009 10:47:01 +0000 (12:47 +0200)]
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>
15 years agoAdd a test class for Myers' diff algorithm 08/8/2
Johannes Schindelin [Thu, 3 Sep 2009 10:46:51 +0000 (12:46 +0200)]
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>
15 years agoAdd Myers' algorithm to generate diff scripts 07/7/2
Johannes Schindelin [Thu, 3 Sep 2009 10:46:41 +0000 (12:46 +0200)]
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>
15 years agoAdd set to IntList 06/6/2
Johannes Schindelin [Thu, 3 Sep 2009 10:46:31 +0000 (12:46 +0200)]
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>
15 years agoMerge changes I282ee1c6,I5700ca48,Ic243544a,Ia2cce34d,I2fd81be2
Code Review [Mon, 5 Oct 2009 21:29:56 +0000 (17:29 -0400)]
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

15 years agoMark JGit plugin as 0.6
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>
15 years agoAdd org.eclipse.jgit-feature
Mykola Nikishov [Fri, 2 Oct 2009 09:18:15 +0000 (12:18 +0300)]
Add org.eclipse.jgit-feature

[sp: Externalized all strings for translation]

Change-Id: Ib3f6e58e9e1cbcbc41705b6e1be37a89ca38f1a9
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
15 years agoMove HttpSupport's configureHttpProxy to jgit-pgm 33/33/3
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>
15 years agoMove AmazonS3 command line utility to jgit-pgm 32/32/3
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>
15 years agoMove setupReflog test function to only test that cares 18/18/3
Shawn O. Pearce [Sat, 3 Oct 2009 01:54:20 +0000 (18:54 -0700)]
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>
15 years agoRemove useless test005_todopack test 17/17/3
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>
15 years agoStandardize the source code formatter for Eclipse 23/23/3
Shawn O. Pearce [Mon, 5 Oct 2009 18:43:01 +0000 (11:43 -0700)]
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>
15 years agoMerge change I11dc6200
Code Review [Mon, 5 Oct 2009 19:13:57 +0000 (15:13 -0400)]
Merge change I11dc6200

* changes:
  Mark the next version as 0.6

15 years agoMark the next version as 0.6 24/24/2
Shawn O. Pearce [Mon, 5 Oct 2009 18:45:56 +0000 (11:45 -0700)]
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>
15 years agoMerge change I908e4c77
Code Review [Mon, 5 Oct 2009 14:06:24 +0000 (10:06 -0400)]
Merge change I908e4c77

* changes:
  Add support for logAllRefUpdates configuration parameter

15 years agoAdd support for logAllRefUpdates configuration parameter 03/3/2
Christian Halstrick [Thu, 1 Oct 2009 14:13:09 +0000 (16:13 +0200)]
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>
15 years agoRemove TODO file and move to bugzilla
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>
15 years agoFix SUBMITTING_PATCHES to follow the Eclipse IP process
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>
15 years agoFix tabs-to-spaces in SUBMITTING_PATCHES
Shawn O. Pearce [Fri, 2 Oct 2009 16:47:04 +0000 (09:47 -0700)]
Fix tabs-to-spaces in SUBMITTING_PATCHES

Change-Id: I1cf5b4355a147c39107c8b97e56108f482c96d8d
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
15 years agoUpdate SUBMITTING_PATCHES to point to Contributor Guide
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>
15 years agoDocument protected members of RevObjectList
Shawn O. Pearce [Fri, 2 Oct 2009 16:27:42 +0000 (09:27 -0700)]
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>
15 years agoMake it possible to clear a PlotCommitList 05/5/2
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>
15 years agoInclude description for missing bundle prereqs 04/4/1
Sasa Zivkov [Tue, 29 Sep 2009 14:03:40 +0000 (16:03 +0200)]
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>
15 years agoCleanup MANIFEST.MF in JGit
Chris Aniszczyk [Thu, 1 Oct 2009 21:12:50 +0000 (14:12 -0700)]
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>
15 years agoMark our one Eclipse plugin as in incubation status
Shawn O. Pearce [Wed, 30 Sep 2009 01:03:31 +0000 (18:03 -0700)]
Mark our one Eclipse plugin as in incubation status

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
15 years agoUtility to graft old JGit history onto repository
Shawn O. Pearce [Wed, 30 Sep 2009 00:00:29 +0000 (17:00 -0700)]
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>
15 years agoInitial JGit contribution to eclipse.org
Git Development Community [Tue, 29 Sep 2009 23:47:03 +0000 (16:47 -0700)]
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>