Change-Id: I7c545d06b1bced678c020fab9af1382bc4416b6e Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>tags/v4.6.0.201612231935-r
@@ -54,9 +54,9 @@ import org.apache.tools.ant.types.resources.Union; | |||
import org.eclipse.jgit.api.AddCommand; | |||
import org.eclipse.jgit.api.Git; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
import org.eclipse.jgit.storage.file.FileRepositoryBuilder; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.lib.RepositoryCache; | |||
import org.eclipse.jgit.storage.file.FileRepositoryBuilder; | |||
import org.eclipse.jgit.util.FS; | |||
/** |
@@ -43,15 +43,15 @@ | |||
package org.eclipse.jgit.http.server; | |||
import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; | |||
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; | |||
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; | |||
import static org.eclipse.jgit.http.server.ServletUtils.ATTRIBUTE_HANDLER; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_SIDE_BAND_64K; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND_64K; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_SIDE_BAND_64K; | |||
import static org.eclipse.jgit.transport.SideBandOutputStream.CH_ERROR; | |||
import static org.eclipse.jgit.transport.SideBandOutputStream.SMALL_BUF; | |||
import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; | |||
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; | |||
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.IOException; |
@@ -43,6 +43,8 @@ | |||
package org.eclipse.jgit.http.server.glue; | |||
import static java.lang.Integer.valueOf; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
@@ -53,8 +55,6 @@ import javax.servlet.ServletException; | |||
import javax.servlet.ServletRequest; | |||
import javax.servlet.ServletResponse; | |||
import static java.lang.Integer.valueOf; | |||
import org.eclipse.jgit.http.server.HttpServerText; | |||
/** |
@@ -47,8 +47,8 @@ import javax.servlet.http.HttpServletRequest; | |||
import org.eclipse.jgit.http.server.GitServlet; | |||
import org.eclipse.jgit.lib.Config; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.lib.Config.SectionParser; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; | |||
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; | |||
@@ -46,9 +46,9 @@ package org.eclipse.jgit.http.server.resolver; | |||
import javax.servlet.http.HttpServletRequest; | |||
import org.eclipse.jgit.lib.Config; | |||
import org.eclipse.jgit.lib.Config.SectionParser; | |||
import org.eclipse.jgit.lib.PersonIdent; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.lib.Config.SectionParser; | |||
import org.eclipse.jgit.transport.ReceivePack; | |||
import org.eclipse.jgit.transport.resolver.ReceivePackFactory; | |||
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; |
@@ -46,8 +46,8 @@ package org.eclipse.jgit.http.server.resolver; | |||
import javax.servlet.http.HttpServletRequest; | |||
import org.eclipse.jgit.lib.Config; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.lib.Config.SectionParser; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.transport.UploadPack; | |||
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; | |||
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; |
@@ -43,11 +43,11 @@ | |||
package org.eclipse.jgit.http.server; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertTrue; | |||
import static org.eclipse.jgit.http.server.ClientVersionUtil.hasPushStatusBug; | |||
import static org.eclipse.jgit.http.server.ClientVersionUtil.invalidVersion; | |||
import static org.eclipse.jgit.http.server.ClientVersionUtil.parseVersion; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertTrue; | |||
import org.junit.Assert; | |||
import org.junit.Test; |
@@ -50,12 +50,21 @@ import static org.junit.Assert.fail; | |||
import java.io.File; | |||
import java.io.IOException; | |||
import java.util.*; | |||
import java.util.ArrayList; | |||
import java.util.Collections; | |||
import java.util.HashMap; | |||
import java.util.List; | |||
import java.util.Map; | |||
import java.util.TreeSet; | |||
import org.eclipse.jgit.dircache.DirCache; | |||
import org.eclipse.jgit.dircache.DirCacheEntry; | |||
import org.eclipse.jgit.internal.storage.file.FileRepository; | |||
import org.eclipse.jgit.lib.*; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.PersonIdent; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.lib.RepositoryCache; | |||
import org.eclipse.jgit.storage.file.FileBasedConfig; | |||
import org.eclipse.jgit.storage.file.WindowCacheConfig; | |||
import org.eclipse.jgit.util.FS; |
@@ -44,8 +44,8 @@ package org.eclipse.jgit.lfs.server; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.apache.http.HttpStatus.SC_FORBIDDEN; | |||
import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR; | |||
import static org.apache.http.HttpStatus.SC_INSUFFICIENT_STORAGE; | |||
import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR; | |||
import static org.apache.http.HttpStatus.SC_NOT_FOUND; | |||
import static org.apache.http.HttpStatus.SC_OK; | |||
import static org.apache.http.HttpStatus.SC_SERVICE_UNAVAILABLE; |
@@ -46,7 +46,6 @@ import static org.junit.Assert.assertNull; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.File; | |||
import java.io.IOException; | |||
import java.io.PrintWriter; | |||
import java.util.ArrayList; |
@@ -42,13 +42,14 @@ | |||
*/ | |||
package org.eclipse.jgit.pgm; | |||
import org.eclipse.jgit.api.Git; | |||
import org.eclipse.jgit.lib.CLIRepositoryTestCase; | |||
import org.junit.Test; | |||
import static org.eclipse.jgit.junit.JGitTestUtil.check; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertTrue; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertTrue; | |||
import org.eclipse.jgit.api.Git; | |||
import org.eclipse.jgit.lib.CLIRepositoryTestCase; | |||
import org.junit.Test; | |||
public class CleanTest extends CLIRepositoryTestCase { | |||
@Test |
@@ -42,7 +42,10 @@ | |||
*/ | |||
package org.eclipse.jgit.pgm; | |||
import static org.junit.Assert.*; | |||
import static org.junit.Assert.assertArrayEquals; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertTrue; | |||
import org.eclipse.jgit.api.Git; | |||
import org.eclipse.jgit.lib.CLIRepositoryTestCase; |
@@ -49,9 +49,8 @@ import java.net.Authenticator; | |||
import java.net.PasswordAuthentication; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.util.CachedAuthenticator; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.util.CachedAuthenticator; | |||
/** | |||
* Basic network prompt for username/password when using the console. |
@@ -48,14 +48,13 @@ package org.eclipse.jgit.console; | |||
import java.io.Console; | |||
import org.eclipse.jgit.errors.UnsupportedCredentialItem; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.transport.ChainingCredentialsProvider; | |||
import org.eclipse.jgit.transport.CredentialItem; | |||
import org.eclipse.jgit.transport.CredentialsProvider; | |||
import org.eclipse.jgit.transport.NetRCCredentialsProvider; | |||
import org.eclipse.jgit.transport.URIish; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
/** | |||
* Interacts with the user during authentication by using the text console. | |||
* |
@@ -52,7 +52,6 @@ import org.eclipse.jgit.api.Git; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
import org.eclipse.jgit.archive.ArchiveFormats; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.pgm.TextBuiltin; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.Option; |
@@ -47,14 +47,14 @@ package org.eclipse.jgit.pgm; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.Option; | |||
import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; | |||
import org.eclipse.jgit.treewalk.AbstractTreeIterator; | |||
import org.eclipse.jgit.treewalk.TreeWalk; | |||
import org.eclipse.jgit.treewalk.filter.AndTreeFilter; | |||
import org.eclipse.jgit.treewalk.filter.TreeFilter; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.Option; | |||
@Command(usage = "usage_ShowDiffTree") | |||
class DiffTree extends TextBuiltin { |
@@ -49,8 +49,8 @@ import java.util.Map; | |||
import org.eclipse.jgit.api.Git; | |||
import org.eclipse.jgit.api.MergeCommand; | |||
import org.eclipse.jgit.api.MergeResult; | |||
import org.eclipse.jgit.api.MergeCommand.FastForwardMode; | |||
import org.eclipse.jgit.api.MergeResult; | |||
import org.eclipse.jgit.api.errors.CheckoutConflictException; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Constants; |
@@ -47,10 +47,10 @@ package org.eclipse.jgit.pgm; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.Option; | |||
import org.eclipse.jgit.revwalk.RevCommit; | |||
import org.eclipse.jgit.revwalk.filter.RevFilter; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.Option; | |||
@Command(usage = "usage_MergeBase") | |||
class MergeBase extends TextBuiltin { |
@@ -51,13 +51,13 @@ import java.util.ArrayList; | |||
import java.util.List; | |||
import java.util.Map; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.Option; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.Ref; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.pgm.opt.CmdLineParser; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.Option; | |||
@Command(usage = "usage_RevParse") | |||
class RevParse extends TextBuiltin { |
@@ -49,8 +49,6 @@ import java.util.EnumSet; | |||
import java.util.List; | |||
import java.util.Map; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.Option; | |||
import org.eclipse.jgit.diff.DiffConfig; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | |||
import org.eclipse.jgit.lib.Constants; | |||
@@ -73,6 +71,8 @@ import org.eclipse.jgit.revwalk.filter.MessageRevFilter; | |||
import org.eclipse.jgit.revwalk.filter.RevFilter; | |||
import org.eclipse.jgit.treewalk.filter.AndTreeFilter; | |||
import org.eclipse.jgit.treewalk.filter.TreeFilter; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.Option; | |||
abstract class RevWalkTextBuiltin extends TextBuiltin { | |||
RevWalk walk; |
@@ -59,10 +59,10 @@ import org.eclipse.jgit.lib.IndexDiff.StageState; | |||
import org.eclipse.jgit.lib.Ref; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.pgm.opt.UntrackedFilesHandler; | |||
import org.kohsuke.args4j.Argument; | |||
import org.kohsuke.args4j.Option; | |||
import org.kohsuke.args4j.spi.RestOfArgumentsHandler; | |||
import org.eclipse.jgit.pgm.opt.UntrackedFilesHandler; | |||
/** | |||
* Status command |
@@ -64,8 +64,8 @@ import org.eclipse.jetty.servlet.ServletHolder; | |||
import org.eclipse.jgit.errors.ConfigInvalidException; | |||
import org.eclipse.jgit.lfs.server.LargeFileRepository; | |||
import org.eclipse.jgit.lfs.server.LfsProtocolServlet; | |||
import org.eclipse.jgit.lfs.server.fs.FileLfsServlet; | |||
import org.eclipse.jgit.lfs.server.fs.FileLfsRepository; | |||
import org.eclipse.jgit.lfs.server.fs.FileLfsServlet; | |||
import org.eclipse.jgit.lfs.server.s3.S3Config; | |||
import org.eclipse.jgit.lfs.server.s3.S3Repository; | |||
import org.eclipse.jgit.pgm.Command; |
@@ -48,12 +48,6 @@ import java.io.File; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.CmdLineParser; | |||
import org.kohsuke.args4j.OptionDef; | |||
import org.kohsuke.args4j.spi.OptionHandler; | |||
import org.kohsuke.args4j.spi.Parameters; | |||
import org.kohsuke.args4j.spi.Setter; | |||
import org.eclipse.jgit.dircache.DirCache; | |||
import org.eclipse.jgit.dircache.DirCacheIterator; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | |||
@@ -66,6 +60,12 @@ import org.eclipse.jgit.treewalk.CanonicalTreeParser; | |||
import org.eclipse.jgit.treewalk.FileTreeIterator; | |||
import org.eclipse.jgit.treewalk.WorkingTreeOptions; | |||
import org.eclipse.jgit.util.FS; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.CmdLineParser; | |||
import org.kohsuke.args4j.OptionDef; | |||
import org.kohsuke.args4j.spi.OptionHandler; | |||
import org.kohsuke.args4j.spi.Parameters; | |||
import org.kohsuke.args4j.spi.Setter; | |||
/** | |||
* Custom argument handler {@link AbstractTreeIterator} from string values. |
@@ -47,14 +47,14 @@ package org.eclipse.jgit.pgm.opt; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.CmdLineParser; | |||
import org.kohsuke.args4j.OptionDef; | |||
import org.kohsuke.args4j.spi.OptionHandler; | |||
import org.kohsuke.args4j.spi.Parameters; | |||
import org.kohsuke.args4j.spi.Setter; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
/** | |||
* Custom argument handler {@link ObjectId} from string values. |
@@ -46,6 +46,10 @@ package org.eclipse.jgit.pgm.opt; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.treewalk.filter.PathFilter; | |||
import org.eclipse.jgit.treewalk.filter.PathFilterGroup; | |||
import org.eclipse.jgit.treewalk.filter.TreeFilter; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.CmdLineParser; | |||
import org.kohsuke.args4j.Option; | |||
@@ -53,10 +57,6 @@ import org.kohsuke.args4j.OptionDef; | |||
import org.kohsuke.args4j.spi.OptionHandler; | |||
import org.kohsuke.args4j.spi.Parameters; | |||
import org.kohsuke.args4j.spi.Setter; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.treewalk.filter.PathFilter; | |||
import org.eclipse.jgit.treewalk.filter.PathFilterGroup; | |||
import org.eclipse.jgit.treewalk.filter.TreeFilter; | |||
/** | |||
* Create a {@link TreeFilter} to patch math names. |
@@ -43,14 +43,14 @@ | |||
package org.eclipse.jgit.pgm.opt; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.transport.RefSpec; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.CmdLineParser; | |||
import org.kohsuke.args4j.OptionDef; | |||
import org.kohsuke.args4j.spi.OptionHandler; | |||
import org.kohsuke.args4j.spi.Parameters; | |||
import org.kohsuke.args4j.spi.Setter; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.transport.RefSpec; | |||
/** | |||
* Custom argument handler {@link RefSpec} from string values. |
@@ -47,18 +47,18 @@ package org.eclipse.jgit.pgm.opt; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.CmdLineParser; | |||
import org.kohsuke.args4j.OptionDef; | |||
import org.kohsuke.args4j.spi.OptionHandler; | |||
import org.kohsuke.args4j.spi.Parameters; | |||
import org.kohsuke.args4j.spi.Setter; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.revwalk.RevCommit; | |||
import org.eclipse.jgit.revwalk.RevFlag; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.CmdLineParser; | |||
import org.kohsuke.args4j.OptionDef; | |||
import org.kohsuke.args4j.spi.OptionHandler; | |||
import org.kohsuke.args4j.spi.Parameters; | |||
import org.kohsuke.args4j.spi.Setter; | |||
/** | |||
* Custom argument handler {@link RevCommit} from string values. |
@@ -47,17 +47,17 @@ package org.eclipse.jgit.pgm.opt; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.revwalk.RevTree; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.CmdLineParser; | |||
import org.kohsuke.args4j.OptionDef; | |||
import org.kohsuke.args4j.spi.OptionHandler; | |||
import org.kohsuke.args4j.spi.Parameters; | |||
import org.kohsuke.args4j.spi.Setter; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.eclipse.jgit.revwalk.RevTree; | |||
/** | |||
* Custom argument handler {@link RevTree} from string values. |
@@ -45,16 +45,16 @@ package org.eclipse.jgit.pgm.opt; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.pgm.CommandCatalog; | |||
import org.eclipse.jgit.pgm.CommandRef; | |||
import org.eclipse.jgit.pgm.TextBuiltin; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
import org.kohsuke.args4j.CmdLineException; | |||
import org.kohsuke.args4j.CmdLineParser; | |||
import org.kohsuke.args4j.OptionDef; | |||
import org.kohsuke.args4j.spi.OptionHandler; | |||
import org.kohsuke.args4j.spi.Parameters; | |||
import org.kohsuke.args4j.spi.Setter; | |||
import org.eclipse.jgit.pgm.CommandCatalog; | |||
import org.eclipse.jgit.pgm.CommandRef; | |||
import org.eclipse.jgit.pgm.TextBuiltin; | |||
import org.eclipse.jgit.pgm.internal.CLIText; | |||
/** | |||
* Custom Argument handler for jgit command selection. |
@@ -42,10 +42,10 @@ | |||
*/ | |||
package org.eclipse.jgit.api; | |||
import static org.eclipse.jgit.lib.Constants.DOT_GIT_MODULES; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertTrue; | |||
import static org.eclipse.jgit.lib.Constants.DOT_GIT_MODULES; | |||
import java.io.File; | |||
import java.util.Set; |
@@ -43,10 +43,10 @@ | |||
package org.eclipse.jgit.api; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertNotEquals; | |||
import static org.junit.Assert.assertNotNull; | |||
import static org.junit.Assert.assertNull; | |||
import static org.junit.Assert.assertTrue; | |||
import static org.junit.Assert.assertNotEquals; | |||
import static org.junit.Assert.fail; | |||
import java.io.File; |
@@ -42,8 +42,12 @@ | |||
package org.eclipse.jgit.api; | |||
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.AUTO_CRLF; | |||
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.AUTO_LF; | |||
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.DIRECT; | |||
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.TEXT_CRLF; | |||
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.TEXT_LF; | |||
import static org.junit.Assert.assertArrayEquals; | |||
import static org.eclipse.jgit.lib.CoreConfig.EolStreamType.*; | |||
import java.io.ByteArrayInputStream; | |||
import java.io.ByteArrayOutputStream; |
@@ -43,6 +43,7 @@ | |||
package org.eclipse.jgit.api; | |||
import static org.junit.Assert.assertEquals; | |||
import java.util.List; | |||
import org.eclipse.jgit.junit.RepositoryTestCase; |
@@ -42,8 +42,8 @@ | |||
*/ | |||
package org.eclipse.jgit.gitrepo; | |||
import static org.junit.Assert.assertTrue; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.junit.Assert.assertTrue; | |||
import java.io.ByteArrayInputStream; | |||
import java.util.HashSet; |
@@ -60,9 +60,6 @@ import java.util.Collection; | |||
import java.util.List; | |||
import org.eclipse.jgit.errors.AmbiguousObjectException; | |||
import org.eclipse.jgit.internal.storage.file.FileRepository; | |||
import org.eclipse.jgit.internal.storage.file.PackIndexWriter; | |||
import org.eclipse.jgit.internal.storage.file.PackIndexWriterV2; | |||
import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; | |||
import org.eclipse.jgit.junit.TestRepository; | |||
import org.eclipse.jgit.lib.AbbreviatedObjectId; |
@@ -51,7 +51,6 @@ import java.io.IOException; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.eclipse.jgit.internal.storage.file.FileSnapshot; | |||
import org.eclipse.jgit.util.FileUtils; | |||
import org.junit.After; | |||
import org.junit.Before; |
@@ -46,11 +46,10 @@ package org.eclipse.jgit.internal.storage.file; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertTrue; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
import org.eclipse.jgit.internal.storage.file.InflatingBitSet; | |||
import org.junit.Test; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
public class InflatingBitSetTest { | |||
@Test |
@@ -49,7 +49,6 @@ import static org.junit.Assert.fail; | |||
import org.eclipse.jgit.api.Git; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.errors.LockFailedException; | |||
import org.eclipse.jgit.internal.storage.file.LockFile; | |||
import org.eclipse.jgit.junit.RepositoryTestCase; | |||
import org.eclipse.jgit.revwalk.RevCommit; | |||
import org.junit.Test; |
@@ -49,7 +49,6 @@ import java.util.concurrent.ExecutorService; | |||
import java.util.concurrent.Executors; | |||
import java.util.concurrent.Future; | |||
import org.eclipse.jgit.internal.storage.file.ObjectDirectory; | |||
import org.eclipse.jgit.junit.RepositoryTestCase; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; |
@@ -52,7 +52,6 @@ import java.util.Iterator; | |||
import java.util.NoSuchElementException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.internal.storage.file.PackIndex; | |||
import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; | |||
import org.eclipse.jgit.junit.RepositoryTestCase; | |||
import org.junit.Test; |
@@ -50,8 +50,6 @@ import static org.junit.Assert.assertTrue; | |||
import static org.junit.Assert.fail; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.internal.storage.file.PackIndex; | |||
import org.eclipse.jgit.internal.storage.file.PackReverseIndex; | |||
import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; | |||
import org.eclipse.jgit.junit.JGitTestUtil; | |||
import org.eclipse.jgit.junit.RepositoryTestCase; |
@@ -43,13 +43,13 @@ | |||
package org.eclipse.jgit.internal.storage.file; | |||
import static org.eclipse.jgit.internal.storage.pack.PackWriter.NONE; | |||
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertNotNull; | |||
import static org.junit.Assert.assertTrue; | |||
import static org.junit.Assert.fail; | |||
import static org.eclipse.jgit.internal.storage.pack.PackWriter.NONE; | |||
import java.io.ByteArrayInputStream; | |||
import java.io.ByteArrayOutputStream; | |||
@@ -75,8 +75,8 @@ import org.eclipse.jgit.lib.NullProgressMonitor; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectIdSet; | |||
import org.eclipse.jgit.lib.ObjectInserter; | |||
import org.eclipse.jgit.lib.Sets; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.lib.Sets; | |||
import org.eclipse.jgit.revwalk.DepthWalk; | |||
import org.eclipse.jgit.revwalk.ObjectWalk; | |||
import org.eclipse.jgit.revwalk.RevBlob; |
@@ -73,8 +73,8 @@ import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; | |||
import org.eclipse.jgit.junit.TestRepository; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.BatchRefUpdate; | |||
import org.eclipse.jgit.lib.ProgressMonitor; | |||
import org.eclipse.jgit.lib.NullProgressMonitor; | |||
import org.eclipse.jgit.lib.ProgressMonitor; | |||
import org.eclipse.jgit.lib.Ref; | |||
import org.eclipse.jgit.lib.Ref.Storage; | |||
import org.eclipse.jgit.lib.RefDatabase; |
@@ -51,9 +51,6 @@ import static org.junit.Assert.assertTrue; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.IOException; | |||
import org.eclipse.jgit.internal.storage.pack.BinaryDelta; | |||
import org.eclipse.jgit.internal.storage.pack.DeltaEncoder; | |||
import org.eclipse.jgit.internal.storage.pack.DeltaIndex; | |||
import org.eclipse.jgit.junit.JGitTestUtil; | |||
import org.eclipse.jgit.junit.TestRng; | |||
import org.eclipse.jgit.lib.Constants; |
@@ -55,8 +55,6 @@ import java.util.Set; | |||
import org.eclipse.jgit.internal.storage.file.GcTestCase; | |||
import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder; | |||
import org.eclipse.jgit.internal.storage.pack.ObjectToPack; | |||
import org.eclipse.jgit.internal.storage.pack.PackWriterBitmapPreparer; | |||
import org.eclipse.jgit.internal.storage.pack.PackWriterBitmapPreparer.BitmapCommit; | |||
import org.eclipse.jgit.junit.TestRepository.BranchBuilder; | |||
import org.eclipse.jgit.junit.TestRepository.CommitBuilder; |
@@ -48,6 +48,7 @@ import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.fail; | |||
import java.io.UnsupportedEncodingException; | |||
import org.junit.Test; | |||
public class ConstantsEncodingTest { |
@@ -50,7 +50,6 @@ import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertTrue; | |||
import org.eclipse.jgit.errors.InvalidObjectIdException; | |||
import org.junit.Test; | |||
public class ObjectIdTest { |
@@ -50,9 +50,9 @@ import java.util.Arrays; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectIdRef; | |||
import org.eclipse.jgit.lib.Ref; | |||
import org.eclipse.jgit.lib.SymbolicRef; | |||
import org.eclipse.jgit.lib.Ref.Storage; | |||
import org.eclipse.jgit.lib.RefUpdate; | |||
import org.eclipse.jgit.lib.SymbolicRef; | |||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; | |||
import org.junit.Before; | |||
import org.junit.Test; |
@@ -44,7 +44,6 @@ | |||
package org.eclipse.jgit.patch; | |||
import static java.lang.Integer.valueOf; | |||
import static java.lang.Long.valueOf; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertSame; | |||
import static org.junit.Assert.assertTrue; |
@@ -48,6 +48,7 @@ import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertNotNull; | |||
import static org.junit.Assert.assertNull; | |||
import static org.junit.Assert.assertTrue; | |||
import java.io.IOException; | |||
import java.util.List; | |||
@@ -46,22 +46,20 @@ package org.eclipse.jgit.revwalk; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertTrue; | |||
import org.junit.After; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
import java.io.IOException; | |||
import java.util.Set; | |||
import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; | |||
import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; | |||
import org.eclipse.jgit.junit.TestRepository; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Sets; | |||
import org.eclipse.jgit.revwalk.ObjectWalk; | |||
import org.eclipse.jgit.revwalk.filter.MessageRevFilter; | |||
import org.eclipse.jgit.revwalk.filter.NotRevFilter; | |||
import org.eclipse.jgit.revwalk.filter.ObjectFilter; | |||
import java.io.IOException; | |||
import java.util.Set; | |||
import org.junit.After; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
public class ObjectWalkFilterTest { | |||
private TestRepository<InMemoryRepository> tr; |
@@ -44,7 +44,6 @@ | |||
package org.eclipse.jgit.transport; | |||
import static java.lang.Integer.valueOf; | |||
import static java.lang.Long.valueOf; | |||
import static org.eclipse.jgit.transport.SideBandOutputStream.CH_DATA; | |||
import static org.eclipse.jgit.transport.SideBandOutputStream.CH_ERROR; | |||
import static org.eclipse.jgit.transport.SideBandOutputStream.CH_PROGRESS; |
@@ -42,17 +42,16 @@ | |||
*/ | |||
package org.eclipse.jgit.util; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.eclipse.jgit.util.RelativeDateFormatter.YEAR_IN_MILLIS; | |||
import static org.eclipse.jgit.util.RelativeDateFormatter.SECOND_IN_MILLIS; | |||
import static org.eclipse.jgit.util.RelativeDateFormatter.MINUTE_IN_MILLIS; | |||
import static org.eclipse.jgit.util.RelativeDateFormatter.HOUR_IN_MILLIS; | |||
import static org.eclipse.jgit.util.RelativeDateFormatter.DAY_IN_MILLIS; | |||
import static org.eclipse.jgit.util.RelativeDateFormatter.HOUR_IN_MILLIS; | |||
import static org.eclipse.jgit.util.RelativeDateFormatter.MINUTE_IN_MILLIS; | |||
import static org.eclipse.jgit.util.RelativeDateFormatter.SECOND_IN_MILLIS; | |||
import static org.eclipse.jgit.util.RelativeDateFormatter.YEAR_IN_MILLIS; | |||
import static org.junit.Assert.assertEquals; | |||
import java.util.Date; | |||
import org.eclipse.jgit.junit.MockSystemReader; | |||
import org.eclipse.jgit.util.RelativeDateFormatter; | |||
import org.junit.After; | |||
import org.junit.Before; | |||
import org.junit.Test; |
@@ -61,9 +61,9 @@ import org.eclipse.jgit.diff.RawTextComparator; | |||
import org.eclipse.jgit.dircache.DirCache; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.CoreConfig.AutoCRLF; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.lib.CoreConfig.AutoCRLF; | |||
import org.eclipse.jgit.treewalk.WorkingTreeOptions; | |||
import org.eclipse.jgit.util.IO; | |||
import org.eclipse.jgit.util.io.AutoLFInputStream; |
@@ -54,9 +54,9 @@ import org.eclipse.jgit.errors.ConfigInvalidException; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.submodule.SubmoduleWalk; | |||
import org.eclipse.jgit.submodule.SubmoduleStatus; | |||
import org.eclipse.jgit.submodule.SubmoduleStatusType; | |||
import org.eclipse.jgit.submodule.SubmoduleWalk; | |||
import org.eclipse.jgit.treewalk.filter.PathFilterGroup; | |||
/** |
@@ -1,7 +1,5 @@ | |||
package org.eclipse.jgit.api.errors; | |||
import org.eclipse.jgit.api.errors.GitAPIException; | |||
/** | |||
* Thrown from StashApplyCommand when stash apply fails | |||
*/ |
@@ -54,8 +54,8 @@ import org.eclipse.jgit.lib.FileMode; | |||
import org.eclipse.jgit.treewalk.AbstractTreeIterator; | |||
import org.eclipse.jgit.treewalk.CanonicalTreeParser; | |||
import org.eclipse.jgit.treewalk.TreeWalk; | |||
import org.eclipse.jgit.treewalk.WorkingTreeIterator; | |||
import org.eclipse.jgit.treewalk.TreeWalk.OperationType; | |||
import org.eclipse.jgit.treewalk.WorkingTreeIterator; | |||
/** | |||
* The attributes handler knows how to retrieve, parse and merge attributes from |
@@ -42,10 +42,11 @@ | |||
*/ | |||
package org.eclipse.jgit.ignore; | |||
import static org.eclipse.jgit.ignore.internal.IMatcher.NO_MATCH; | |||
import static org.eclipse.jgit.ignore.internal.Strings.isDirectoryPattern; | |||
import static org.eclipse.jgit.ignore.internal.Strings.stripTrailing; | |||
import static org.eclipse.jgit.ignore.internal.Strings.stripTrailingWhitespace; | |||
import static org.eclipse.jgit.ignore.internal.Strings.isDirectoryPattern; | |||
import static org.eclipse.jgit.ignore.internal.IMatcher.NO_MATCH; | |||
import org.eclipse.jgit.errors.InvalidPatternException; | |||
import org.eclipse.jgit.ignore.internal.IMatcher; | |||
import org.eclipse.jgit.ignore.internal.PathMatcher; |
@@ -44,13 +44,13 @@ | |||
package org.eclipse.jgit.internal.ketch; | |||
import static org.eclipse.jgit.internal.ketch.KetchReplica.CommitMethod.ALL_REFS; | |||
import static org.eclipse.jgit.lib.Ref.Storage.NETWORK; | |||
import static org.eclipse.jgit.transport.ReceiveCommand.Result.LOCK_FAILURE; | |||
import static org.eclipse.jgit.transport.ReceiveCommand.Result.NOT_ATTEMPTED; | |||
import static org.eclipse.jgit.transport.ReceiveCommand.Result.OK; | |||
import static org.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_NODELETE; | |||
import static org.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_NONFASTFORWARD; | |||
import static org.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_OTHER_REASON; | |||
import static org.eclipse.jgit.lib.Ref.Storage.NETWORK; | |||
import java.io.IOException; | |||
import java.util.ArrayList; |
@@ -47,9 +47,9 @@ import java.io.IOException; | |||
import org.eclipse.jgit.lib.ObjectIdRef; | |||
import org.eclipse.jgit.lib.Ref; | |||
import org.eclipse.jgit.lib.Ref.Storage; | |||
import org.eclipse.jgit.lib.RefUpdate; | |||
import org.eclipse.jgit.lib.SymbolicRef; | |||
import org.eclipse.jgit.lib.Ref.Storage; | |||
import org.eclipse.jgit.revwalk.RevObject; | |||
import org.eclipse.jgit.revwalk.RevTag; | |||
import org.eclipse.jgit.revwalk.RevWalk; |
@@ -43,11 +43,11 @@ | |||
package org.eclipse.jgit.internal.storage.file; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.ObjectIdOwnerMap; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
/** | |||
* Base implementation of the PackBitmapIndex. | |||
*/ |
@@ -47,9 +47,6 @@ import java.text.MessageFormat; | |||
import java.util.Iterator; | |||
import java.util.NoSuchElementException; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
import com.googlecode.javaewah.IntIterator; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.BitmapIndex; | |||
@@ -59,6 +56,9 @@ import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectIdOwnerMap; | |||
import org.eclipse.jgit.util.BlockList; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
import com.googlecode.javaewah.IntIterator; | |||
/** A compressed bitmap representation of the entire object graph. */ | |||
public class BitmapIndexImpl implements BitmapIndex { | |||
private static final int EXTRA_BITS = 10 * 1024; |
@@ -49,13 +49,13 @@ import java.io.IOException; | |||
import java.io.InputStream; | |||
import java.text.MessageFormat; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
/** | |||
* Logical representation of the bitmap data stored in the pack index. | |||
* {@link ObjectId}s are encoded as a single integer in the range [0, |
@@ -50,8 +50,6 @@ import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.NoSuchElementException; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap; | |||
import org.eclipse.jgit.internal.storage.pack.ObjectToPack; | |||
@@ -63,6 +61,8 @@ import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectIdOwnerMap; | |||
import org.eclipse.jgit.util.BlockList; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
/** | |||
* Helper for constructing {@link PackBitmapIndex}es. | |||
*/ |
@@ -47,15 +47,15 @@ import java.util.Collections; | |||
import java.util.Iterator; | |||
import java.util.NoSuchElementException; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
import com.googlecode.javaewah.IntIterator; | |||
import org.eclipse.jgit.internal.storage.file.BasePackBitmapIndex.StoredBitmap; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.BitmapIndex; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectIdOwnerMap; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
import com.googlecode.javaewah.IntIterator; | |||
/** | |||
* A PackBitmapIndex that remaps the bitmaps in the previous index to the | |||
* positions in the new pack index. Note, unlike typical PackBitmapIndex |
@@ -49,8 +49,6 @@ import java.io.InputStream; | |||
import java.text.MessageFormat; | |||
import java.util.Arrays; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.lib.Constants; | |||
@@ -59,6 +57,8 @@ import org.eclipse.jgit.lib.ObjectIdOwnerMap; | |||
import org.eclipse.jgit.util.IO; | |||
import org.eclipse.jgit.util.NB; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
/** | |||
* Support for the pack bitmap index v1 format. | |||
* |
@@ -50,13 +50,13 @@ import java.io.OutputStream; | |||
import java.security.DigestOutputStream; | |||
import java.text.MessageFormat; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder.StoredEntry; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.util.io.SafeBufferedOutputStream; | |||
import com.googlecode.javaewah.EWAHCompressedBitmap; | |||
/** | |||
* Creates the version 1 pack bitmap index files. | |||
* |
@@ -49,11 +49,11 @@ import java.util.Set; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; | |||
import org.eclipse.jgit.errors.MissingObjectException; | |||
import org.eclipse.jgit.lib.BitmapIndex; | |||
import org.eclipse.jgit.lib.BitmapIndex.Bitmap; | |||
import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.NullProgressMonitor; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.BitmapIndex.Bitmap; | |||
import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; | |||
import org.eclipse.jgit.lib.ProgressMonitor; | |||
import org.eclipse.jgit.revwalk.ObjectWalk; | |||
import org.eclipse.jgit.revwalk.RevCommit; |
@@ -43,7 +43,6 @@ | |||
package org.eclipse.jgit.internal.storage.reftree; | |||
import static org.eclipse.jgit.lib.RefDatabase.MAX_SYMBOLIC_REF_DEPTH; | |||
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; | |||
import static org.eclipse.jgit.lib.Constants.R_REFS; | |||
import static org.eclipse.jgit.lib.Constants.encode; | |||
@@ -52,6 +51,7 @@ import static org.eclipse.jgit.lib.FileMode.TYPE_SYMLINK; | |||
import static org.eclipse.jgit.lib.FileMode.TYPE_TREE; | |||
import static org.eclipse.jgit.lib.Ref.Storage.NEW; | |||
import static org.eclipse.jgit.lib.Ref.Storage.PACKED; | |||
import static org.eclipse.jgit.lib.RefDatabase.MAX_SYMBOLIC_REF_DEPTH; | |||
import java.io.IOException; | |||
@@ -73,8 +73,8 @@ import org.eclipse.jgit.treewalk.AbstractTreeIterator; | |||
import org.eclipse.jgit.treewalk.EmptyTreeIterator; | |||
import org.eclipse.jgit.treewalk.FileTreeIterator; | |||
import org.eclipse.jgit.treewalk.TreeWalk; | |||
import org.eclipse.jgit.treewalk.WorkingTreeIterator; | |||
import org.eclipse.jgit.treewalk.TreeWalk.OperationType; | |||
import org.eclipse.jgit.treewalk.WorkingTreeIterator; | |||
import org.eclipse.jgit.treewalk.filter.AndTreeFilter; | |||
import org.eclipse.jgit.treewalk.filter.IndexDiffFilter; | |||
import org.eclipse.jgit.treewalk.filter.SkipWorkTreeFilter; |
@@ -44,15 +44,15 @@ | |||
package org.eclipse.jgit.lib; | |||
import org.eclipse.jgit.errors.InvalidObjectIdException; | |||
import org.eclipse.jgit.util.NB; | |||
import org.eclipse.jgit.util.RawParseUtils; | |||
import java.io.IOException; | |||
import java.io.ObjectInputStream; | |||
import java.io.ObjectOutputStream; | |||
import java.io.Serializable; | |||
import org.eclipse.jgit.errors.InvalidObjectIdException; | |||
import org.eclipse.jgit.util.NB; | |||
import org.eclipse.jgit.util.RawParseUtils; | |||
/** | |||
* A SHA-1 abstraction. | |||
*/ |
@@ -42,9 +42,6 @@ | |||
*/ | |||
package org.eclipse.jgit.lib; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.PersonIdent; | |||
/** | |||
* Parsed reflog entry | |||
* |
@@ -46,8 +46,8 @@ import java.io.IOException; | |||
import org.eclipse.jgit.api.MergeCommand.FastForwardMode; | |||
import org.eclipse.jgit.lib.Config; | |||
import org.eclipse.jgit.lib.ConfigConstants; | |||
import org.eclipse.jgit.lib.Config.SectionParser; | |||
import org.eclipse.jgit.lib.ConfigConstants; | |||
import org.eclipse.jgit.lib.Repository; | |||
/** |
@@ -44,9 +44,9 @@ | |||
package org.eclipse.jgit.patch; | |||
import static org.eclipse.jgit.lib.Constants.encodeASCII; | |||
import static org.eclipse.jgit.patch.FileHeader.isHunkHdr; | |||
import static org.eclipse.jgit.patch.FileHeader.NEW_NAME; | |||
import static org.eclipse.jgit.patch.FileHeader.OLD_NAME; | |||
import static org.eclipse.jgit.patch.FileHeader.isHunkHdr; | |||
import static org.eclipse.jgit.util.RawParseUtils.match; | |||
import static org.eclipse.jgit.util.RawParseUtils.nextLF; | |||
@@ -44,8 +44,8 @@ | |||
package org.eclipse.jgit.revplot; | |||
import org.eclipse.jgit.lib.AnyObjectId; | |||
import org.eclipse.jgit.revwalk.RevCommit; | |||
import org.eclipse.jgit.lib.Ref; | |||
import org.eclipse.jgit.revwalk.RevCommit; | |||
/** | |||
* A commit reference to a commit in the DAG. |
@@ -55,8 +55,8 @@ import java.io.FileNotFoundException; | |||
import java.io.IOException; | |||
import java.text.MessageFormat; | |||
import org.eclipse.jgit.errors.LockFailedException; | |||
import org.eclipse.jgit.errors.ConfigInvalidException; | |||
import org.eclipse.jgit.errors.LockFailedException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.internal.storage.file.FileSnapshot; | |||
import org.eclipse.jgit.internal.storage.file.LockFile; |
@@ -71,7 +71,6 @@ import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectInserter; | |||
import org.eclipse.jgit.lib.ProgressMonitor; | |||
import org.eclipse.jgit.lib.Ref; | |||
import org.eclipse.jgit.transport.GitProtocolConstants.MultiAck; | |||
import org.eclipse.jgit.revwalk.RevCommit; | |||
import org.eclipse.jgit.revwalk.RevCommitList; | |||
import org.eclipse.jgit.revwalk.RevFlag; | |||
@@ -80,6 +79,7 @@ import org.eclipse.jgit.revwalk.RevSort; | |||
import org.eclipse.jgit.revwalk.RevWalk; | |||
import org.eclipse.jgit.revwalk.filter.CommitTimeRevFilter; | |||
import org.eclipse.jgit.revwalk.filter.RevFilter; | |||
import org.eclipse.jgit.transport.GitProtocolConstants.MultiAck; | |||
import org.eclipse.jgit.transport.PacketLineIn.AckNackResult; | |||
import org.eclipse.jgit.util.TemporaryBuffer; | |||
@@ -47,8 +47,8 @@ package org.eclipse.jgit.transport; | |||
import java.io.IOException; | |||
import org.eclipse.jgit.lib.Config; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.lib.Config.SectionParser; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; | |||
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; | |||
@@ -52,7 +52,6 @@ import javax.crypto.spec.SecretKeySpec; | |||
import org.eclipse.jgit.internal.storage.dfs.DfsRepository; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.transport.NonceGenerator; | |||
import org.eclipse.jgit.transport.PushCertificate.NonceStatus; | |||
/** |
@@ -44,7 +44,6 @@ | |||
package org.eclipse.jgit.transport; | |||
import static java.nio.charset.StandardCharsets.UTF_8; | |||
import static org.eclipse.jgit.util.RawParseUtils.lastIndexOfTrim; | |||
import java.text.SimpleDateFormat; |
@@ -44,6 +44,7 @@ | |||
package org.eclipse.jgit.transport; | |||
import java.io.IOException; | |||
import javax.servlet.http.HttpServletResponse; | |||
import org.eclipse.jgit.internal.JGitText; |
@@ -64,11 +64,11 @@ import org.eclipse.jgit.errors.TransportException; | |||
import org.eclipse.jgit.internal.JGitText; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.Repository; | |||
import org.eclipse.jgit.util.FS; | |||
import org.eclipse.jgit.util.QuotedString; | |||
import org.eclipse.jgit.util.SystemReader; | |||
import org.eclipse.jgit.util.io.MessageWriter; | |||
import org.eclipse.jgit.util.io.StreamCopyThread; | |||
import org.eclipse.jgit.util.FS; | |||
/** | |||
* Transport through an SSH tunnel. |
@@ -45,8 +45,8 @@ package org.eclipse.jgit.transport; | |||
import static org.eclipse.jgit.lib.RefDatabase.ALL; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_AGENT; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_ALLOW_TIP_SHA1_IN_WANT; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_ALLOW_REACHABLE_SHA1_IN_WANT; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_ALLOW_TIP_SHA1_IN_WANT; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_INCLUDE_TAG; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_MULTI_ACK; | |||
import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_MULTI_ACK_DETAILED; |
@@ -49,8 +49,8 @@ import java.io.IOException; | |||
import java.nio.ByteBuffer; | |||
import java.nio.CharBuffer; | |||
import org.eclipse.jgit.attributes.AttributesNode; | |||
import org.eclipse.jgit.attributes.AttributesHandler; | |||
import org.eclipse.jgit.attributes.AttributesNode; | |||
import org.eclipse.jgit.dircache.DirCacheCheckout; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; |
@@ -53,11 +53,11 @@ import org.eclipse.jgit.annotations.Nullable; | |||
import org.eclipse.jgit.api.errors.JGitInternalException; | |||
import org.eclipse.jgit.attributes.Attribute; | |||
import org.eclipse.jgit.attributes.Attributes; | |||
import org.eclipse.jgit.attributes.AttributesHandler; | |||
import org.eclipse.jgit.attributes.AttributesNodeProvider; | |||
import org.eclipse.jgit.attributes.AttributesProvider; | |||
import org.eclipse.jgit.attributes.FilterCommandRegistry; | |||
import org.eclipse.jgit.dircache.DirCacheBuildIterator; | |||
import org.eclipse.jgit.attributes.AttributesHandler; | |||
import org.eclipse.jgit.dircache.DirCacheIterator; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.errors.IncorrectObjectTypeException; |
@@ -44,8 +44,8 @@ | |||
package org.eclipse.jgit.treewalk; | |||
import org.eclipse.jgit.lib.Config; | |||
import org.eclipse.jgit.lib.ConfigConstants; | |||
import org.eclipse.jgit.lib.Config.SectionParser; | |||
import org.eclipse.jgit.lib.ConfigConstants; | |||
import org.eclipse.jgit.lib.CoreConfig.AutoCRLF; | |||
import org.eclipse.jgit.lib.CoreConfig.CheckStat; | |||
import org.eclipse.jgit.lib.CoreConfig.EOL; |
@@ -45,8 +45,8 @@ package org.eclipse.jgit.util; | |||
import java.util.regex.Pattern; | |||
import org.eclipse.jgit.lib.Constants; | |||
import org.eclipse.jgit.lib.ObjectInserter; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.ObjectInserter; | |||
import org.eclipse.jgit.lib.PersonIdent; | |||
/** |
@@ -56,10 +56,10 @@ import java.text.SimpleDateFormat; | |||
import java.util.Locale; | |||
import java.util.TimeZone; | |||
import org.eclipse.jgit.storage.file.FileBasedConfig; | |||
import org.eclipse.jgit.errors.CorruptObjectException; | |||
import org.eclipse.jgit.lib.Config; | |||
import org.eclipse.jgit.lib.ObjectChecker; | |||
import org.eclipse.jgit.storage.file.FileBasedConfig; | |||
/** | |||
* Interface to read values from the system. |