aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Ignore missing MERGE_MSG when deleting MERGE_MSGJens Baumgart2011-07-191-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository.writeMergeCommitMsg(null) no longer fails if the MERGE_MSG file is missing. This was done to avoid CommitCommand to fail in case of a missing MERGE_MSG file. Bug: 352243 Change-Id: Iddf43533d133f8f22199ed6e2393a552670e7d1f Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
* | | | Merge "Correct comment on CloneCommand.setRemote method."Shawn Pearce2011-08-131-1/+6
|\ \ \ \
| * | | | Correct comment on CloneCommand.setRemote method.Kevin Sawicki2011-08-051-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous comment stated that the value set was used to keep track of the branch in the remote repository which was incorrect. Updated the method comment to match the format used for the PushCommand.setRemote and FetchCommand.setRemote methods. Change-Id: I11b81eb3125958af29247b485da56fd88c3bfdf5 Signed-off-by: Kevin Sawicki <kevin@github.com>
* | | | | Merge "Fix jgit rev-list --objects master"Shawn O. Pearce2011-08-131-3/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix jgit rev-list --objects masterShawn O. Pearce2011-08-081-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag was not being honored due to a bug in createWalk(). argWalk is always non-null when there are commits passed in on the command line. If --objects was specified, always make a new ObjectWalk for the actual execution. Change-Id: I6e1a1636f2634605d86671a83766cc1c42939821 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | | | Merge "Fix reading of ref names containing characters that sort before /"Robin Rosenberg2011-08-102-2/+39
|\ \ \ \ \
| * | | | | Fix reading of ref names containing characters that sort before /Robin Rosenberg2011-07-222-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A set of ref names like ('a/b' and 'a+b') would cause the RefDirectory to think that the set of refs have changed because it traversed the 'a' directory in the subtree before looking at 'a+b', but it then compared with the know refs which are sorted with 'a+b' first. Fix this by traversing the refs tree in another order. Treat a directory as if they ends with a '/' before deciding on the order to traverse the refs tree. Bug: 348834 Change-Id: I23377f8df00c7252bf27dbcfba5da193c5403917 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | | | | | Merge "Fix offset64 creation for objects at 2 GiB"Robin Rosenberg2011-08-101-3/+6
|\ \ \ \ \ \
| * | | | | | Fix offset64 creation for objects at 2 GiBShawn O. Pearce2011-08-081-3/+6
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The offset32 format is used for objects <= 2^31-1, while the offset64 format is used for all other objects. This condition was missing the = needed to ensure an object placed exactly at 2^31 would have its 64 bit offset in the index. Change-Id: I293fac0e829c9baa12cb59411dffde666051d6c5 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* / | | | | Add isSuccessful to MergeStatus, RebaseResult.Status and PullResultRobin Stocker2011-08-093-7/+88
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful when the result needs to be displayed and it's only of interest if the operation was successful or not (in egit, it could be used in MultiPullResultDialog). Change-Id: Icfc9a9c76763f8a777087a1262c8d6ad251a9068 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | Merge changes I58110f17,I440baa64,Ic77dcac5Shawn O. Pearce2011-08-052-11/+32
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | * changes: PackWriter: Skip progress messages on fast operations IndexPack: Defer the "Resolving deltas" progress meter IndexPack: Fix "Resolving deltas" progress meter
| * | | | PackWriter: Skip progress messages on fast operationsShawn O. Pearce2011-07-281-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the "Finding sources" phase will complete in <1 second with no delta compression enabled, don't bother showing the progress meter for this phase. Small repositories on the local filesystem tend to rip through this phase always subsecond and the ProgressMonitor display can actually slow the operation down. If delta compression is enabled, there are two phases that may run very quickly. Set the timer to 500 milliseconds instead, reducing the risk that the user has to wait longer than 1 second before any sort of output from the packer occurs. Change-Id: I58110f17e2a5ffa0134f9768b94804d16bbb8399 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | | | IndexPack: Defer the "Resolving deltas" progress meterShawn O. Pearce2011-07-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If delta resolution completes in < 1000 milliseconds, don't bother showing the progress meter. This is actually very common for a Gerrit Code Review server, where the client is probably sending 1 commit and only a few trees/blobs modified... and the base objects are hot in the process buffer cache. The 1000 millisecond delay is just a guess at a reasonable time to wait. Change-Id: I440baa64ab0dfa21be61deae8dcd3ca061bed8ce Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * | | | IndexPack: Fix "Resolving deltas" progress meterShawn O. Pearce2011-07-281-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This progress meter never reached 100% as it did not update while resolving the external bases in thin packs. Instead of updating in batches at the top level, update once per delta that is resolved. The batching progress meter type should smooth out the frequent updates to an update rate that is more reasonable to send to the UI, while also ensuring a successful pack parse always reaches 100% deltas resolved. Change-Id: Ic77dcac542cfa97213a6b0194708f9d3c256d223 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | | | Reuse ObjectReader for all objects touched during checkoutMatthias Sohn2011-08-023-65/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 349361 Change-Id: I61ffcb7694eb8b99ebaf4d0d0acd63e0ee91bcb3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
* | | | | Don't hard-code section names, use ConfigConstants insteadTomasz Zarna2011-08-021-1/+2
|/ / / / | | | | | | | | | | | | Change-Id: Ie2dde43da491fa27b25a2ad8014866d77d484b24 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Make PackReverseIndex a public structureShawn O. Pearce2011-07-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository inspection tools may find building a reverse index on a pack useful, as they can then locate an object by offset. As both C Git and JGit sometimes produce error messages with the offset rather than the SHA-1, it may be useful to expose this type. Change-Id: I487bf32e85a8985cf8ab382d4c82fcbe1fc7da6c
* | | | Make lookup methods on PackIndex publicShawn O. Pearce2011-07-283-25/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There isn't a good reason to hide all of these as package-private. Make them public so applications can inspect pack files. Change-Id: Ia418daf65d63e9e015b8dafdf3d06a1ed91d190b
* | | | PackIndex: Support reading from any InputStreamShawn O. Pearce2011-07-281-12/+36
| | | | | | | | | | | | | | | | | | | | Change-Id: If065a9e33a8f3a03e9758eb7612af2fc460c87e5 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | | Add String form of PackInvalidException constructorShawn O. Pearce2011-07-281-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This way the path can be supplied as a string, without first converting to a java.io.File. Change-Id: I54d9bb9867556cd98b378c0762054b31497459cb
* | | | Add copy constructor to PackConfigShawn O. Pearce2011-07-271-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some embeddings of UploadPack (e.g. Gerrit Code Review) set their own PackConfig from a server-wide configuration, overriding any JGit defaults or settings that may exist at the local repository level. Make a copy constructor form of PackConfig so this server-wide configuration object can be copied and then merged with repository specific configuration data. Change-Id: I4463c95aeaf7d6536c3ab132dec9c50ee528d9e0 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | | Don't close ObjectDatabase after parsing packShawn O. Pearce2011-07-271-1/+0
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cached object databases should not require a close to release their cached resources. Most object databases just return their own reference for newCachedDatabase(), so a close() here kills the real database's internal caches, and possibly underlying files, resulting in poor performance for the callers of PackParser like ReceivePack or FetchProcess trying to then go look up objects that were just parsed, or that current references point to. Change-Id: Ia4a239093866e5b9faf82744f729fb73f4373f1a Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Merge doesn't remove empty foldersTomasz Zarna2011-07-132-1/+42
| | | | | | | | | | | | | | | Bug: 349848 Change-Id: I2aa5a1a7259889428e4845046b900538262f3c84
* | | Add support for reseting on directoriesDariusz Luksza2011-07-122-7/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset command should works recursively and allows reset all changed files in given directory. Bug: 348524 Change-Id: I441db34f226be36548c61cef77958995971498de Signed-off-by: Dariusz Luksza <dariusz@luksza.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Fixed creation of branch from a tagSasa Zivkov2011-07-122-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creation of a branch X from an annotated tag, as the starting point, resulted into .git/refs/heads/X containing the ID of the annotated tag instead of the ID of the tagged commit. This fix peels the tag ref before using it as the starting point for the newly created branch. Bug: 340836 Change-Id: I01c7325770ecb37f5bf8ddb2a22f802466524f24 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Merge "Merge in JGit CLI is missing break statement"Chris Aniszczyk2011-07-121-0/+1
|\ \ \
| * | | Merge in JGit CLI is missing break statementTomasz Zarna2011-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2095601b848e66e54d5dac828ef6ed1a4c5ae66c Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | | Cleanup directories leftover by test.Adrian Goerler2011-07-074-49/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the temporary file management from superclass. Change-Id: I3042951dc21860b4b85dd72a6bf41ee7cfe2aba4 Signed-off-by: Adrian Goerler <adrian.goerler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Cloning should fail when destination directory exists and is not emptyAdrian Goerler2011-07-065-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to clone into a folder that already contains a cloned repository native git will fail with a message "fatal: destination path 'folder' already exists and is not an empty directory.". Now JGit will also fail in this situation throwing a JGitInternalException. The test case was provided by Tomasz Zarna. Bug: 347852 Change-Id: If9e9919a5f92d13cf038dc470c21ee5967322dac Also-by: Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> Signed-off-by: Adrian Goerler <adrian.goerler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Do not catch Exception in test casesStefan Lay2011-07-062-153/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Exception handling is already done by JUnit. Change-Id: Ia25d768c311d384d728f281aced92f598e5e2041 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
* | | | Merge "Cleanup curly braces"Christian Halstrick2011-07-061-16/+9
|\ \ \ \
| * | | | Cleanup curly bracesAdrian Goerler2011-07-061-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2de6439a3ad951a99d89e4aee02006c745d16510 Signed-off-by: Adrian Goerler <adrian.goerler@sap.com>
* | | | | Merge "Add lookup to remote config if the refSpec is not explicitly set"Christian Halstrick2011-07-062-0/+77
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add lookup to remote config if the refSpec is not explicitly setStefan Lay2011-07-042-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no refSpec is explicitly set, the PushCommand should first check the remote config and then as a fallback use the current behavior. Change-Id: I2bc648abc517b1d01b2de15d383423ace2081e72 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
* | | | | Merge "Enable PlotWalk to show additional refs"Shawn Pearce2011-07-011-0/+23
|\ \ \ \ \
| * | | | | Enable PlotWalk to show additional refsStefan Lay2011-07-011-0/+23
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ic85f8859571dc2aef7f146ce56a6c9b8ec142e60 Signed-off-by: Stefan Lay <stefan.lay@sap.com>
* | | | | Merge "Improve performance when writing trees and small blobs"Shawn O. Pearce2011-07-011-4/+56
|\ \ \ \ \
| * | | | | Improve performance when writing trees and small blobsShawn O. Pearce2011-06-241-4/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ObjectDirectoryInserter was always creating a temporary file, writing the complete compressed contents of a tree, fsync()'ing that to stable storage, and only then checking to see if there was already an object with the same SHA-1 in the repository. For commits this strategy makes some sense, the commit is very unlikely to exist in the repository, as there are embedded times and these change with each commit. However for trees coming out of DirCache, it is more common for the tree to already exist in the repository. Most subdirectories are not modified in any given commit. Doing all of this local file IO for things that already exist is very slow. Try to detect cases where the object is "small enough" that it can be processed entirely in memory, and avoid doing disk IO entirely if the object already exists. Also increase the size of the output buffer for the deflation. This should boost the average write(2) syscall size from 512 bytes to 8192 bytes, making streaming of large compressed contents to disk slightly more efficient. Change-Id: I1d40364e8725468522435814631916d73174c92b Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | | | | Merge "TemporaryBuffer: Fix reading from in-memory InputStream"Shawn O. Pearce2011-07-012-2/+18
|\| | | | |
| * | | | | TemporaryBuffer: Fix reading from in-memory InputStreamShawn O. Pearce2011-06-242-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had the conditions wrong here, causing the in-memory InputStream to always appear to be at EOF. Change-Id: I6811d6187a34eaf1fd6c5002550d631decdfc391 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | | | | Merge "Implement Serializable interface in PersonIdent class."Shawn Pearce2011-07-011-1/+4
|\ \ \ \ \ \
| * | | | | | Implement Serializable interface in PersonIdent class.Kevin Sawicki2011-06-301-1/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I3229f4ec85e7604cb45642813757975b30f1227e Signed-off-by: Kevin Sawicki <kevin@github.com>
* | | | | | Merge "Fix compilation with Java 1.5"Matthias Sohn2011-07-011-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix compilation with Java 1.5Carsten Pfeiffer2011-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I785f59fcf2018cd923d4d1617b923049dbde9809
* | | | | | DirCacheCheckout: unlock DirCache in case of failureJens Baumgart2011-06-291-0/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DirCacheCheckout did not unlock the index if e.g. an IOException occured during checkout. Bug: 350677 Change-Id: Ie9fa09f7a404080da7cdccafb9be3a8c845e4869 Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
* | | | | Merge "RFC: Ugly fix for i18n of metaVar CLI arguments"Shawn Pearce2011-06-242-0/+67
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | RFC: Ugly fix for i18n of metaVar CLI argumentsRobin Rosenberg2011-06-202-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch possibly ties to a specific version of args4j. Bug: 318286 Change-Id: I05d4ecf6bd25deec7fb2efbfa61913f4ec4e04e5 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* | | | | Add ReflogCommandChris Aniszczyk2011-06-223-0/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a git-reflog command and associated tests. Bug: 347859 Change-Id: Iba146ac842cc9ca0be43d3381b4082c9e92bf56f Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | | | Refactor out ReflogEntryChris Aniszczyk2011-06-205-95/+146
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | It's useful to have ReflogEntry refactored out so it can be used by clients via the JGit API. Change-Id: I03044df9af9f9547777545b7c9b93bdf5f8b7cb5 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | | Merge changes Ie393fb8b,Ib11a077aRobin Rosenberg2011-06-178-42/+208
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | * changes: Push errors back over sideband when possible Report progress while updating references
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 09:12:05 +0000