From f32b8612433e499090c76ded014dd5e94322b786 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Mon, 18 Mar 2013 07:44:48 -0700 Subject: JGit 3.0: move internal classes into an internal subpackage This breaks all existing callers once. Applications are not supposed to build against the internal storage API unless they can accept API churn and make necessary updates as versions change. Change-Id: I2ab1327c202ef2003565e1b0770a583970e432e9 --- org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java | 2 +- org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java | 7 +------ org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java | 2 +- org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reflog.java | 2 +- org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/Gc.java | 4 ++-- .../src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java | 2 +- .../src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java | 12 ++++++------ 7 files changed, 13 insertions(+), 18 deletions(-) (limited to 'org.eclipse.jgit.pgm/src') diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java index 898203da29..81ea387ddf 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java @@ -52,6 +52,7 @@ import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheCheckout; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; @@ -59,7 +60,6 @@ import org.eclipse.jgit.lib.TextProgressMonitor; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.file.FileBasedConfig; -import org.eclipse.jgit.storage.file.FileRepository; import org.eclipse.jgit.transport.FetchResult; import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RemoteConfig; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java index 8087efe7d4..a5096b0e21 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java @@ -51,7 +51,6 @@ import java.util.List; import java.util.concurrent.Executors; import org.eclipse.jgit.storage.file.FileBasedConfig; -import org.eclipse.jgit.storage.file.WindowCache; import org.eclipse.jgit.storage.file.WindowCacheConfig; import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.transport.DaemonClient; @@ -111,11 +110,7 @@ class Daemon extends TextBuiltin { FileBasedConfig cfg = new FileBasedConfig(configFile, FS.DETECTED); cfg.load(); - - WindowCacheConfig wcc = new WindowCacheConfig(); - wcc.fromConfig(cfg); - WindowCache.reconfigure(wcc); - + new WindowCacheConfig().fromConfig(cfg).install(); packConfig.fromConfig(cfg); } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java index 4585650395..731ef01a35 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java @@ -46,9 +46,9 @@ package org.eclipse.jgit.pgm; import java.io.BufferedInputStream; +import org.eclipse.jgit.internal.storage.file.ObjectDirectoryPackParser; import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.TextProgressMonitor; -import org.eclipse.jgit.storage.file.ObjectDirectoryPackParser; import org.eclipse.jgit.transport.PackParser; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reflog.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reflog.java index 4ac7ade537..e2797bd5a0 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reflog.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reflog.java @@ -46,10 +46,10 @@ import java.util.Collection; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.ReflogCommand; +import org.eclipse.jgit.internal.storage.file.ReflogEntry; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.storage.file.ReflogEntry; import org.kohsuke.args4j.Argument; @Command(common = true, usage = "usage_manageReflogInformation") diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/Gc.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/Gc.java index 656a97cb16..615d50f224 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/Gc.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/Gc.java @@ -43,10 +43,10 @@ package org.eclipse.jgit.pgm.debug; +import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.internal.storage.file.GC; import org.eclipse.jgit.lib.TextProgressMonitor; import org.eclipse.jgit.pgm.TextBuiltin; -import org.eclipse.jgit.storage.file.FileRepository; -import org.eclipse.jgit.storage.file.GC; class Gc extends TextBuiltin { @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java index 7f1e332ff9..4b0ab88df6 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java @@ -58,6 +58,7 @@ import java.util.Map; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.ObjectWritingException; +import org.eclipse.jgit.internal.storage.file.LockFile; import org.eclipse.jgit.lib.CommitBuilder; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; @@ -72,7 +73,6 @@ import org.eclipse.jgit.lib.TextProgressMonitor; import org.eclipse.jgit.pgm.CLIText; import org.eclipse.jgit.pgm.TextBuiltin; import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.storage.file.LockFile; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java index 837ca2cb1f..26ad931896 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java @@ -51,18 +51,18 @@ import java.util.zip.InflaterInputStream; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.StoredObjectRepresentationNotAvailableException; +import org.eclipse.jgit.internal.storage.pack.BinaryDelta; +import org.eclipse.jgit.internal.storage.pack.ObjectReuseAsIs; +import org.eclipse.jgit.internal.storage.pack.ObjectToPack; +import org.eclipse.jgit.internal.storage.pack.PackOutputStream; +import org.eclipse.jgit.internal.storage.pack.PackWriter; +import org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation; import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.pgm.TextBuiltin; import org.eclipse.jgit.revwalk.RevObject; import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.storage.pack.BinaryDelta; -import org.eclipse.jgit.storage.pack.ObjectReuseAsIs; -import org.eclipse.jgit.storage.pack.ObjectToPack; -import org.eclipse.jgit.storage.pack.PackOutputStream; -import org.eclipse.jgit.storage.pack.PackWriter; -import org.eclipse.jgit.storage.pack.StoredObjectRepresentation; import org.eclipse.jgit.util.TemporaryBuffer; import org.kohsuke.args4j.Argument; -- cgit v1.2.3