Change-Id: I763590a45d75f00a09097ab6f89581a3bbd3c797tags/v2.0.0.201206130900-r
@@ -26,6 +26,7 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", | |||
org.eclipse.jgit.http.server;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.http.server.glue;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.http.server.resolver;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.internal;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.junit;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.junit.http;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.lib;version="[2.0.0,2.1.0)", |
@@ -59,11 +59,11 @@ import javax.servlet.http.HttpServletRequest; | |||
import org.eclipse.jetty.servlet.DefaultServlet; | |||
import org.eclipse.jetty.servlet.ServletContextHandler; | |||
import org.eclipse.jetty.servlet.ServletHolder; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.NoRemoteRepositoryException; | |||
import org.eclipse.jgit.errors.RepositoryNotFoundException; | |||
import org.eclipse.jgit.errors.TransportException; | |||
import org.eclipse.jgit.http.server.GitServlet; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.junit.TestRepository; | |||
import org.eclipse.jgit.junit.http.AccessEvent; | |||
import org.eclipse.jgit.junit.http.AppServer; |
@@ -57,10 +57,10 @@ import javax.servlet.http.HttpServletRequest; | |||
import org.eclipse.jetty.servlet.ServletContextHandler; | |||
import org.eclipse.jetty.servlet.ServletHolder; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.RepositoryNotFoundException; | |||
import org.eclipse.jgit.http.server.GitServlet; | |||
import org.eclipse.jgit.http.server.GitSmartHttpTools; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.junit.TestRepository; | |||
import org.eclipse.jgit.junit.http.HttpTestCase; | |||
import org.eclipse.jgit.lib.Constants; |
@@ -73,11 +73,11 @@ import org.eclipse.jetty.servlet.FilterHolder; | |||
import org.eclipse.jetty.servlet.FilterMapping; | |||
import org.eclipse.jetty.servlet.ServletContextHandler; | |||
import org.eclipse.jetty.servlet.ServletHolder; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.RemoteRepositoryException; | |||
import org.eclipse.jgit.errors.RepositoryNotFoundException; | |||
import org.eclipse.jgit.errors.TransportException; | |||
import org.eclipse.jgit.http.server.GitServlet; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.junit.TestRepository; | |||
import org.eclipse.jgit.junit.TestRng; | |||
import org.eclipse.jgit.junit.http.AccessEvent; |
@@ -20,6 +20,7 @@ Import-Package: org.eclipse.jgit;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.fnmatch;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.http.server;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.ignore;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.internal;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.iplog;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.junit;version="[2.0.0,2.1.0)", | |||
org.eclipse.jgit.lib;version="[2.0.0,2.1.0)", |
@@ -49,8 +49,8 @@ import static org.junit.Assert.fail; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
@@ -43,10 +43,10 @@ | |||
package org.eclipse.jgit.nls; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.awtui.UIText; | |||
import org.eclipse.jgit.console.ConsoleText; | |||
import org.eclipse.jgit.http.server.HttpServerText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.iplog.IpLogText; | |||
import org.eclipse.jgit.pgm.CLIText; | |||
import org.junit.Before; |
@@ -52,7 +52,7 @@ import java.io.IOException; | |||
import java.io.InputStream; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.junit.JGitTestUtil; | |||
import org.junit.Test; | |||
@@ -57,8 +57,8 @@ import java.text.MessageFormat; | |||
import java.util.Arrays; | |||
import java.util.zip.Deflater; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.LargeObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.junit.JGitTestUtil; | |||
import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; | |||
import org.eclipse.jgit.junit.TestRepository; |
@@ -59,10 +59,10 @@ import java.io.FileReader; | |||
import java.io.IOException; | |||
import java.io.UnsupportedEncodingException; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.ConfigInvalidException; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.CommitBuilder; | |||
import org.eclipse.jgit.lib.Constants; |
@@ -60,9 +60,9 @@ import java.text.MessageFormat; | |||
import java.util.Arrays; | |||
import java.util.zip.DeflaterOutputStream; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.errors.LargeObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.junit.JGitTestUtil; | |||
import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; | |||
import org.eclipse.jgit.junit.TestRng; |
@@ -54,8 +54,8 @@ import java.io.IOException; | |||
import java.io.InputStream; | |||
import java.util.Arrays; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.junit.JGitTestUtil; | |||
import org.eclipse.jgit.junit.TestRng; | |||
import org.eclipse.jgit.lib.Constants; |
@@ -50,7 +50,6 @@ import static org.junit.Assert.fail; | |||
import java.io.File; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.Git; | |||
import org.eclipse.jgit.api.Status; | |||
import org.eclipse.jgit.api.SubmoduleAddCommand; | |||
@@ -59,6 +58,7 @@ import org.eclipse.jgit.dircache.DirCache; | |||
import org.eclipse.jgit.dircache.DirCacheEditor; | |||
import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit; | |||
import org.eclipse.jgit.dircache.DirCacheEntry; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.ConfigConstants; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.FileMode; |
@@ -60,8 +60,8 @@ import java.security.MessageDigest; | |||
import java.text.MessageFormat; | |||
import java.util.zip.Deflater; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.TooLargeObjectInPackException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.junit.JGitTestUtil; | |||
import org.eclipse.jgit.junit.TestRepository; | |||
import org.eclipse.jgit.lib.Constants; |
@@ -57,7 +57,7 @@ import java.io.IOException; | |||
import java.io.OutputStream; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.junit.Before; | |||
import org.junit.Test; |
@@ -15,6 +15,7 @@ Export-Package: org.eclipse.jgit;version="2.0.0", | |||
org.eclipse.jgit.events;version="2.0.0", | |||
org.eclipse.jgit.fnmatch;version="2.0.0", | |||
org.eclipse.jgit.ignore;version="2.0.0", | |||
org.eclipse.jgit.internal;version="2.0.0";x-internal:=true, | |||
org.eclipse.jgit.lib;version="2.0.0", | |||
org.eclipse.jgit.merge;version="2.0.0", | |||
org.eclipse.jgit.nls;version="2.0.0", |
@@ -48,7 +48,6 @@ import java.io.InputStream; | |||
import java.util.Collection; | |||
import java.util.LinkedList; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.NoFilepatternException; | |||
import org.eclipse.jgit.dircache.DirCache; | |||
@@ -56,6 +55,7 @@ import org.eclipse.jgit.dircache.DirCacheBuildIterator; | |||
import org.eclipse.jgit.dircache.DirCacheBuilder; | |||
import org.eclipse.jgit.dircache.DirCacheEntry; | |||
import org.eclipse.jgit.dircache.DirCacheIterator; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.lib.ObjectInserter; |
@@ -50,12 +50,12 @@ import java.text.MessageFormat; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
import org.eclipse.jgit.api.errors.PatchApplyException; | |||
import org.eclipse.jgit.api.errors.PatchFormatException; | |||
import org.eclipse.jgit.diff.DiffEntry.ChangeType; | |||
import org.eclipse.jgit.diff.RawText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.patch.FileHeader; | |||
import org.eclipse.jgit.patch.HunkHeader; |
@@ -49,7 +49,6 @@ import java.text.MessageFormat; | |||
import java.util.LinkedList; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.CheckoutResult.Status; | |||
import org.eclipse.jgit.api.errors.CheckoutConflictException; | |||
import org.eclipse.jgit.api.errors.InvalidRefNameException; | |||
@@ -63,6 +62,7 @@ import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit; | |||
import org.eclipse.jgit.dircache.DirCacheEntry; | |||
import org.eclipse.jgit.dircache.DirCacheIterator; | |||
import org.eclipse.jgit.errors.AmbiguousObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.FileMode; |
@@ -47,12 +47,12 @@ import java.text.MessageFormat; | |||
import java.util.LinkedList; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.MultipleParentsNotAllowedException; | |||
import org.eclipse.jgit.api.errors.NoHeadException; | |||
import org.eclipse.jgit.dircache.DirCacheCheckout; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; |
@@ -50,13 +50,13 @@ import java.util.ArrayList; | |||
import java.util.Collection; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.InvalidRemoteException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
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.JGitText; | |||
import org.eclipse.jgit.lib.ConfigConstants; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.NullProgressMonitor; |
@@ -49,7 +49,6 @@ import java.util.ArrayList; | |||
import java.util.LinkedList; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.NoFilepatternException; | |||
@@ -64,6 +63,7 @@ import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit; | |||
import org.eclipse.jgit.dircache.DirCacheEntry; | |||
import org.eclipse.jgit.dircache.DirCacheIterator; | |||
import org.eclipse.jgit.errors.UnmergedPathException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.CommitBuilder; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.FileMode; |
@@ -46,12 +46,12 @@ package org.eclipse.jgit.api; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.InvalidRefNameException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.RefAlreadyExistsException; | |||
import org.eclipse.jgit.api.errors.RefNotFoundException; | |||
import org.eclipse.jgit.errors.AmbiguousObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.ConfigConstants; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; |
@@ -50,10 +50,10 @@ import java.util.HashSet; | |||
import java.util.List; | |||
import java.util.Set; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.CannotDeleteCurrentBranchException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.NotMergedException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.ConfigConstants; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.Ref; |
@@ -49,8 +49,8 @@ import java.util.HashSet; | |||
import java.util.List; | |||
import java.util.Set; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Ref; | |||
import org.eclipse.jgit.lib.RefUpdate; | |||
import org.eclipse.jgit.lib.RefUpdate.Result; |
@@ -49,12 +49,12 @@ import java.io.IOException; | |||
import java.io.OutputStream; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
import org.eclipse.jgit.api.errors.NoHeadException; | |||
import org.eclipse.jgit.diff.DiffEntry; | |||
import org.eclipse.jgit.diff.DiffFormatter; | |||
import org.eclipse.jgit.dircache.DirCacheIterator; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.NullProgressMonitor; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectReader; |
@@ -47,12 +47,12 @@ import java.text.MessageFormat; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.InvalidRemoteException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.errors.NoRemoteRepositoryException; | |||
import org.eclipse.jgit.errors.NotSupportedException; | |||
import org.eclipse.jgit.errors.TransportException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.NullProgressMonitor; | |||
import org.eclipse.jgit.lib.ProgressMonitor; |
@@ -40,7 +40,7 @@ package org.eclipse.jgit.api; | |||
import java.text.MessageFormat; | |||
import java.util.concurrent.Callable; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Repository; | |||
/** |
@@ -47,11 +47,11 @@ import java.text.MessageFormat; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.NoHeadException; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; |
@@ -49,12 +49,12 @@ import java.util.Collection; | |||
import java.util.HashMap; | |||
import java.util.Map; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
import org.eclipse.jgit.api.errors.InvalidRemoteException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.errors.NotSupportedException; | |||
import org.eclipse.jgit.errors.TransportException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.Ref; | |||
import org.eclipse.jgit.lib.Repository; |
@@ -51,7 +51,6 @@ import java.util.LinkedList; | |||
import java.util.List; | |||
import java.util.Map; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.MergeResult.MergeStatus; | |||
import org.eclipse.jgit.api.errors.CheckoutConflictException; | |||
import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; | |||
@@ -61,6 +60,7 @@ import org.eclipse.jgit.api.errors.NoHeadException; | |||
import org.eclipse.jgit.api.errors.NoMessageException; | |||
import org.eclipse.jgit.api.errors.WrongRepositoryStateException; | |||
import org.eclipse.jgit.dircache.DirCacheCheckout; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; |
@@ -47,7 +47,7 @@ import java.text.MessageFormat; | |||
import java.util.HashMap; | |||
import java.util.Map; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.merge.MergeChunk; | |||
import org.eclipse.jgit.merge.MergeChunk.ConflictState; |
@@ -46,7 +46,6 @@ package org.eclipse.jgit.api; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.RebaseCommand.Operation; | |||
import org.eclipse.jgit.api.errors.CanceledException; | |||
import org.eclipse.jgit.api.errors.CheckoutConflictException; | |||
@@ -61,6 +60,7 @@ import org.eclipse.jgit.api.errors.NoHeadException; | |||
import org.eclipse.jgit.api.errors.NoMessageException; | |||
import org.eclipse.jgit.api.errors.RefNotFoundException; | |||
import org.eclipse.jgit.api.errors.WrongRepositoryStateException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Config; | |||
import org.eclipse.jgit.lib.ConfigConstants; |
@@ -50,11 +50,11 @@ import java.util.Collection; | |||
import java.util.Collections; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.InvalidRemoteException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.errors.NotSupportedException; | |||
import org.eclipse.jgit.errors.TransportException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.NullProgressMonitor; | |||
import org.eclipse.jgit.lib.ProgressMonitor; |
@@ -60,7 +60,6 @@ import java.util.HashMap; | |||
import java.util.List; | |||
import java.util.Map; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.RebaseResult.Status; | |||
import org.eclipse.jgit.api.errors.CheckoutConflictException; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
@@ -75,6 +74,7 @@ import org.eclipse.jgit.diff.DiffFormatter; | |||
import org.eclipse.jgit.dircache.DirCache; | |||
import org.eclipse.jgit.dircache.DirCacheCheckout; | |||
import org.eclipse.jgit.dircache.DirCacheIterator; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AbbreviatedObjectId; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Constants; |
@@ -46,8 +46,8 @@ import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import java.util.Collection; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.InvalidRefNameException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.storage.file.ReflogEntry; |
@@ -46,12 +46,12 @@ package org.eclipse.jgit.api; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.DetachedHeadException; | |||
import org.eclipse.jgit.api.errors.InvalidRefNameException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.RefAlreadyExistsException; | |||
import org.eclipse.jgit.api.errors.RefNotFoundException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.ConfigConstants; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; |
@@ -47,7 +47,6 @@ import java.text.MessageFormat; | |||
import java.util.Collection; | |||
import java.util.LinkedList; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.dircache.DirCache; | |||
import org.eclipse.jgit.dircache.DirCacheBuilder; | |||
@@ -55,6 +54,7 @@ import org.eclipse.jgit.dircache.DirCacheCheckout; | |||
import org.eclipse.jgit.dircache.DirCacheEditor; | |||
import org.eclipse.jgit.dircache.DirCacheEntry; | |||
import org.eclipse.jgit.dircache.DirCacheIterator; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.lib.ObjectId; |
@@ -48,13 +48,13 @@ import java.util.LinkedList; | |||
import java.util.List; | |||
import java.util.Map; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.MergeResult.MergeStatus; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
import org.eclipse.jgit.api.errors.MultipleParentsNotAllowedException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.NoHeadException; | |||
import org.eclipse.jgit.dircache.DirCacheCheckout; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; |
@@ -47,12 +47,12 @@ import java.io.IOException; | |||
import java.util.Collection; | |||
import java.util.LinkedList; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.NoFilepatternException; | |||
import org.eclipse.jgit.dircache.DirCache; | |||
import org.eclipse.jgit.dircache.DirCacheBuildIterator; | |||
import org.eclipse.jgit.dircache.DirCacheBuilder; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.lib.Repository; |
@@ -46,7 +46,6 @@ import java.io.File; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
import org.eclipse.jgit.api.errors.InvalidRefNameException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
@@ -56,6 +55,7 @@ import org.eclipse.jgit.dircache.DirCacheCheckout; | |||
import org.eclipse.jgit.dircache.DirCacheEditor; | |||
import org.eclipse.jgit.dircache.DirCacheEditor.DeletePath; | |||
import org.eclipse.jgit.dircache.DirCacheEntry; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectReader; |
@@ -48,7 +48,6 @@ import java.text.MessageFormat; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.ResetCommand.ResetType; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
@@ -59,6 +58,7 @@ import org.eclipse.jgit.dircache.DirCacheEditor.DeletePath; | |||
import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit; | |||
import org.eclipse.jgit.dircache.DirCacheEntry; | |||
import org.eclipse.jgit.dircache.DirCacheIterator; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.CommitBuilder; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.MutableObjectId; |
@@ -49,9 +49,9 @@ import java.util.Collection; | |||
import java.util.Collections; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.InvalidRefNameException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.revwalk.RevCommit; |
@@ -46,10 +46,10 @@ import java.io.File; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.NoFilepatternException; | |||
import org.eclipse.jgit.errors.ConfigInvalidException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.ConfigConstants; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.NullProgressMonitor; |
@@ -45,11 +45,11 @@ package org.eclipse.jgit.api; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; | |||
import org.eclipse.jgit.api.errors.InvalidTagNameException; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.api.errors.NoHeadException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectInserter; |
@@ -39,7 +39,7 @@ package org.eclipse.jgit.api.errors; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Ref; | |||
import org.eclipse.jgit.lib.RefUpdate; | |||
@@ -38,7 +38,7 @@ | |||
*/ | |||
package org.eclipse.jgit.api.errors; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Exception thrown when a command expected a non-detached {@code HEAD} |
@@ -37,7 +37,7 @@ | |||
*/ | |||
package org.eclipse.jgit.api.errors; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Thrown when branch deletion fails due to unmerged data |
@@ -45,7 +45,7 @@ package org.eclipse.jgit.api.errors; | |||
import java.text.MessageFormat; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.patch.FormatError; | |||
/** |
@@ -37,7 +37,7 @@ | |||
*/ | |||
package org.eclipse.jgit.api.errors; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Thrown when branch deletion fails due to unmerged data |
@@ -49,7 +49,6 @@ import java.io.IOException; | |||
import java.util.Collection; | |||
import java.util.Collections; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.blame.Candidate.BlobCandidate; | |||
import org.eclipse.jgit.blame.Candidate.ReverseCandidate; | |||
import org.eclipse.jgit.blame.ReverseWalk.ReverseCommit; | |||
@@ -61,6 +60,7 @@ import org.eclipse.jgit.diff.HistogramDiff; | |||
import org.eclipse.jgit.diff.RawText; | |||
import org.eclipse.jgit.diff.RawTextComparator; | |||
import org.eclipse.jgit.diff.RenameDetector; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.MutableObjectId; | |||
import org.eclipse.jgit.lib.ObjectId; |
@@ -45,7 +45,7 @@ package org.eclipse.jgit.diff; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Config; | |||
import org.eclipse.jgit.lib.Config.SectionParser; | |||
import org.eclipse.jgit.util.StringUtils; |
@@ -48,7 +48,7 @@ import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AbbreviatedObjectId; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.FileMode; |
@@ -62,7 +62,6 @@ import java.util.Collection; | |||
import java.util.Collections; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm; | |||
import org.eclipse.jgit.diff.DiffEntry.ChangeType; | |||
import org.eclipse.jgit.dircache.DirCacheIterator; | |||
@@ -70,6 +69,7 @@ import org.eclipse.jgit.errors.AmbiguousObjectException; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.errors.LargeObjectException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AbbreviatedObjectId; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.ConfigConstants; |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.diff; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Support {@link HistogramDiff} by computing occurrence counts of elements. |
@@ -46,7 +46,7 @@ package org.eclipse.jgit.diff; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.util.IntList; | |||
import org.eclipse.jgit.util.LongList; | |||
@@ -55,9 +55,9 @@ import java.util.Comparator; | |||
import java.util.HashMap; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.diff.DiffEntry.ChangeType; | |||
import org.eclipse.jgit.diff.SimilarityIndex.TableFullException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AbbreviatedObjectId; | |||
import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.lib.NullProgressMonitor; |
@@ -52,9 +52,9 @@ import java.util.Arrays; | |||
import java.util.BitSet; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.diff.DiffEntry.ChangeType; | |||
import org.eclipse.jgit.diff.SimilarityIndex.TableFullException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.lib.NullProgressMonitor; | |||
import org.eclipse.jgit.lib.ProgressMonitor; |
@@ -60,12 +60,12 @@ import java.text.MessageFormat; | |||
import java.util.Arrays; | |||
import java.util.Comparator; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.LockFailedException; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.errors.UnmergedPathException; | |||
import org.eclipse.jgit.events.IndexChangedEvent; | |||
import org.eclipse.jgit.events.IndexChangedListener; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectInserter; |
@@ -48,7 +48,7 @@ import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import java.util.Arrays; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.ObjectReader; | |||
import org.eclipse.jgit.treewalk.AbstractTreeIterator; |
@@ -52,12 +52,12 @@ import java.util.HashMap; | |||
import java.util.List; | |||
import java.util.Map; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.CheckoutConflictException; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | |||
import org.eclipse.jgit.errors.IndexWriteException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectLoader; |
@@ -51,7 +51,7 @@ import java.util.Collections; | |||
import java.util.Comparator; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
/** |
@@ -56,7 +56,7 @@ import java.security.MessageDigest; | |||
import java.text.MessageFormat; | |||
import java.util.Arrays; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.FileMode; |
@@ -47,7 +47,7 @@ import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import java.util.Collection; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AbbreviatedObjectId; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
@@ -48,7 +48,7 @@ package org.eclipse.jgit.errors; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Exception thrown if a conflict occurs during a merge checkout. |
@@ -48,7 +48,7 @@ import java.util.Collection; | |||
import java.util.Collections; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** An exception detailing multiple reasons for failure. */ | |||
public class CompoundException extends Exception { |
@@ -49,7 +49,7 @@ package org.eclipse.jgit.errors; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
@@ -47,7 +47,7 @@ package org.eclipse.jgit.errors; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Attempt to add an entry to a tree that already exists. |
@@ -49,7 +49,7 @@ package org.eclipse.jgit.errors; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
@@ -39,7 +39,7 @@ package org.eclipse.jgit.errors; | |||
import java.io.IOException; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Cannot write a modified index. This is a serious error that users need to be |
@@ -48,7 +48,7 @@ package org.eclipse.jgit.errors; | |||
import java.io.UnsupportedEncodingException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Thrown when an invalid object id is passed in as an argument. |
@@ -45,7 +45,7 @@ package org.eclipse.jgit.errors; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
@@ -46,7 +46,7 @@ import java.io.File; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* An exception occurring when a file cannot be locked |
@@ -46,7 +46,7 @@ package org.eclipse.jgit.errors; | |||
import java.util.Map; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.transport.URIish; | |||
@@ -49,7 +49,7 @@ package org.eclipse.jgit.errors; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AbbreviatedObjectId; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; |
@@ -48,7 +48,7 @@ package org.eclipse.jgit.errors; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Thrown when a pattern contains a character group which is open to the right |
@@ -43,7 +43,7 @@ | |||
package org.eclipse.jgit.errors; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Repository; | |||
/** |
@@ -47,7 +47,7 @@ import java.io.File; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** Thrown when a PackFile previously failed and is known to be unusable */ | |||
public class PackInvalidException extends IOException { |
@@ -46,7 +46,7 @@ package org.eclipse.jgit.errors; | |||
import java.io.File; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** Indicates a local repository does not exist. */ | |||
public class RepositoryNotFoundException extends TransportException { |
@@ -44,7 +44,7 @@ | |||
package org.eclipse.jgit.errors; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.revwalk.RevWalk; | |||
/** |
@@ -46,7 +46,7 @@ package org.eclipse.jgit.errors; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** Thrown when PackParser finds an object larger than a predefined limit */ | |||
public class TooLargeObjectInPackException extends IOException { |
@@ -46,8 +46,8 @@ package org.eclipse.jgit.errors; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.dircache.DirCacheEntry; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Indicates one or more paths in a DirCache have non-zero stages present. |
@@ -45,7 +45,7 @@ package org.eclipse.jgit.errors; | |||
import java.io.IOException; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** Indicates a ReceivePack failure while scanning the pack stream. */ | |||
public class UnpackException extends IOException { |
@@ -46,7 +46,7 @@ package org.eclipse.jgit.fnmatch; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
abstract class AbstractHead implements Head { | |||
private List<Head> newHeads = null; |
@@ -50,8 +50,8 @@ import java.util.List; | |||
import java.util.regex.Matcher; | |||
import java.util.regex.Pattern; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.InvalidPatternException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
final class GroupHead extends AbstractHead { | |||
private final List<CharacterPattern> characterClasses; |
@@ -41,7 +41,7 @@ | |||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
*/ | |||
package org.eclipse.jgit; | |||
package org.eclipse.jgit.internal; | |||
import org.eclipse.jgit.nls.NLS; | |||
import org.eclipse.jgit.nls.TranslationBundle; |
@@ -46,8 +46,8 @@ package org.eclipse.jgit.lib; | |||
import java.io.Serializable; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.InvalidObjectIdException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.util.NB; | |||
import org.eclipse.jgit.util.RawParseUtils; | |||
@@ -61,9 +61,9 @@ import java.util.Collection; | |||
import java.util.LinkedList; | |||
import java.util.List; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.ConfigInvalidException; | |||
import org.eclipse.jgit.errors.RepositoryNotFoundException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.RepositoryCache.FileKey; | |||
import org.eclipse.jgit.storage.file.FileBasedConfig; | |||
import org.eclipse.jgit.storage.file.FileRepository; |
@@ -49,10 +49,10 @@ import java.io.FileNotFoundException; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.ConfigInvalidException; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.revwalk.RevCommit; | |||
import org.eclipse.jgit.revwalk.RevTree; | |||
import org.eclipse.jgit.revwalk.RevWalk; |
@@ -64,12 +64,12 @@ import java.util.Set; | |||
import java.util.concurrent.ConcurrentHashMap; | |||
import java.util.concurrent.atomic.AtomicReference; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.ConfigInvalidException; | |||
import org.eclipse.jgit.events.ConfigChangedEvent; | |||
import org.eclipse.jgit.events.ConfigChangedListener; | |||
import org.eclipse.jgit.events.ListenerHandle; | |||
import org.eclipse.jgit.events.ListenerList; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.util.StringUtils; | |||
@@ -51,8 +51,8 @@ import java.security.MessageDigest; | |||
import java.security.NoSuchAlgorithmException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.util.MutableInteger; | |||
/** Misc. constants used throughout JGit. */ |
@@ -48,8 +48,8 @@ package org.eclipse.jgit.lib; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.InvalidObjectIdException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.util.NB; | |||
import org.eclipse.jgit.util.RawParseUtils; | |||
@@ -50,8 +50,8 @@ import static org.eclipse.jgit.util.RawParseUtils.parseBase10; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.util.MutableInteger; | |||
/** |
@@ -47,8 +47,8 @@ package org.eclipse.jgit.lib; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.revwalk.RevCommit; | |||
import org.eclipse.jgit.revwalk.RevObject; | |||
import org.eclipse.jgit.revwalk.RevWalk; |
@@ -62,7 +62,6 @@ import java.util.Map; | |||
import java.util.Set; | |||
import java.util.concurrent.atomic.AtomicInteger; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.dircache.DirCache; | |||
import org.eclipse.jgit.errors.AmbiguousObjectException; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
@@ -74,6 +73,7 @@ import org.eclipse.jgit.events.IndexChangedEvent; | |||
import org.eclipse.jgit.events.IndexChangedListener; | |||
import org.eclipse.jgit.events.ListenerList; | |||
import org.eclipse.jgit.events.RepositoryEvent; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.revwalk.RevBlob; | |||
import org.eclipse.jgit.revwalk.RevCommit; | |||
import org.eclipse.jgit.revwalk.RevObject; |
@@ -46,7 +46,7 @@ | |||
package org.eclipse.jgit.lib; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
/** | |||
* Important state of the repository that affects what can and cannot bed | |||
* done. This is things like unhandled conflicted merges and unfinished rebase. |
@@ -48,11 +48,11 @@ package org.eclipse.jgit.lib; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.errors.EntryExistsException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.errors.ObjectWritingException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.util.RawParseUtils; | |||
/** |
@@ -47,7 +47,7 @@ package org.eclipse.jgit.merge; | |||
import java.text.MessageFormat; | |||
import java.util.HashMap; | |||
import org.eclipse.jgit.JGitText; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Repository; | |||
/** |