Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-02-12JGit 1.3.0.201202121842-rc4v1.3.0.201202121842-rc4Matthias Sohn3-4/+4
Change-Id: I82c6c0c175ab6fb4e2113101f36c8d2ddf4a13c1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-02-08Support gitdir references in working tree .git fileKevin Sawicki6-47/+74
A '.git' file in a repository's working tree root is now parsed as a ref to a folder located elsewhere. This supports submodules having their repository location outside of the parent repository's working directory such as in the parent repository's '.git/modules' directory. This adds support to BaseRepositoryBuilder for repositories created with the '--separate-git-dir' option specified to 'git init'. Change-Id: I73c538f6d845bdbc0c4e2bce5a77f900cf36e1a9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-30Support committing submodule updatesKevin Sawicki1-6/+3
Use the submodule object id provided by the working tree iterator Change-Id: Ibf82f56c04cb9c91b2b309cf0cfa3f638539e23c
2012-01-22Really close output stream when core.autocrlf is trueRobin Rosenberg1-1/+2
Change-Id: I8a0d91e908145168c32589600bd1598826511ae3
2012-01-20Add command support for listing stashed commitsKevin Sawicki4-2/+132
Bug: 309355 Change-Id: I34a8c251b89abcdb67565ca49bee02e5e2113593 Signe-off-by: Chris Aniszczyk <zx@twitter.com>
2012-01-18Merge "Support relative submodule URLs on init/add/sync"Matthias Sohn6-4/+106
2012-01-17Support relative submodule URLs on init/add/syncKevin Sawicki6-4/+106
Interpret submodule URLs that start with './' or '../' as relative to either the configured remote for the HEAD branch, or 'origin', or the parent repository working directory if no remote URL is configured Bug: 368536 Change-Id: Id4985824023b75cd45cd64a4dd9d421166391e10
2012-01-16Add BranchTrackingStatus for getting remote tracking statusRobin Stocker1-0/+140
This is used by EGit change I1e1caca561d1b0a0c194bfc42e64b698f42c6e6a to show branch status in decoration. It can also be used for providing the same output as C Git in "git status". Change-Id: I8d2b108c89905c3f0496f3d517879596740787c0 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-16Add BranchConfig helper for access to branch config sectionRobin Stocker1-0/+114
Getting the name of the remote-tracking branch given a branch is not so easy to get right. This class provides a way to do that and could be used for more branch config related things (e.g. in PullCommand). Change-Id: I896a2384217936c8b672df8b81c9599f5c350458 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-16Add RevWalkUtils with count(start, end) methodRobin Stocker1-0/+96
It returns the number of commits that are in start and not in end. Useful for calculating how much a branch is ahead of another one. Change-Id: I09f7d9b049beea417da7ff32c9f8bf0d4ed46a7f Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-16Merge "Support more of AutoCRLF"Christian Halstrick6-10/+258
2012-01-15Fix resolution of tree when path is emptyRobin Rosenberg1-1/+1
Revision strings that end with a ':' with no trailing path should return the tree associated with the current ref parsed Bug: 368370 Change-Id: I7c7617a77bd418bad4e570be2d1e9002ad280762 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2012-01-15Make sure all bytes are written to files on close, or get an error.Robin Rosenberg9-18/+106
Java's BufferedOutputStream swallows any errors that occur when flushing the buffer in close(). This class overrides close to make sure an error during the final flush is reported back to the caller. Change-Id: I74a82b31505fadf8378069c5f6554f1033c28f9b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-15Merge "Resolve ~ with no trailing number as the first parent commit"Robin Rosenberg1-7/+10
2012-01-15Throw API exception when LsRemoteCommand fails with TransportExceptionMatthias Sohn2-2/+70
In many cases applications want to handle TransportException hence expose it as an API exception. Change-Id: I64b885ecfb1a35bd93c89026c6298d1820ba69d0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-14Resolve ~ with no trailing number as the first parent commitKevin Sawicki1-7/+10
This would previously throw a RevisionSyntaxException Change-Id: I42b4988c7f6c6454e2ebda13914260e25ac1a889
2012-01-13Cannot commit -o file with only file permission changeRobin Rosenberg1-1/+4
Bug 345076 Change-Id: Ie64039793ab6ba4748731320399f03301b6282ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-10Support more of AutoCRLFRobin Rosenberg6-10/+258
This patch introduces CRLF handling to the DirCacheCheckout and WorkingTreeIterator supporting the AutoCRLF for add, checkout reset and status and hopefully some other places that depende on the underlying logic of the affected API's. The patch includes test cases for the Status command provided by Tomasz Zarna for bug 353867. The core.eol and core.safecrlf options are not yet supported. Bug: 301775 Bug: 353867 Change-Id: I2280a2dc0698829475de6a662a6c6e80b1df7663
2012-01-10Merge "Provide helper for unlocking a file"Matthias Sohn1-2/+34
2012-01-09Provide helper for unlocking a fileKevin Sawicki1-2/+34
This will allow recovery from a LockFailedException where the file associated with an exception is passed to FileUtils.unlock to attempt an unlock on the file so the operation can be retried Change-Id: I580166d386126bfb54a318a65253070a6e325936
2012-01-09Add setter for ProgressMonitor to DiffCommandTomasz Zarna1-0/+20
Change-Id: I34f8b77a461e165d7d624dbd9a6944feadc57b8e
2012-01-09Merge "Add options for setting context lines and prefixes to DiffCommand"Stefan Lay1-0/+48
2012-01-09Add options for setting context lines and prefixes to DiffCommandTomasz Zarna1-0/+48
Change-Id: I539f3531e94c11c0f0a3e7096c0eb1b1c309898a
2012-01-09Merge "Add helper for determining if status is clean"Christian Halstrick1-1/+18
2012-01-09Narrow exceptions declared by LsRemoteCommandMatthias Sohn1-40/+47
API commands either throw GitAPIException or JGitInternalException. Also add missing javadoc and reduce nesting of catch blocks. Change-Id: I9a3b302e1b3f373ee11a977a0e3d6213bfbd3cdf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Kevin Sawicki <kevin@github.com>
2012-01-08Merge "Retain executable mode of existing files on Windows"Robin Rosenberg4-4/+33
2012-01-05Merge "Use constants from ConfigConstants in CoreConfig"Matthias Sohn2-3/+15
2012-01-04Add helper for determining if status is cleanKevin Sawicki1-1/+18
This checks if all collections that Status exposes are empty or not Change-Id: I0c342ab70dc36c1fd70acb4f8a924bb207d62f47
2012-01-03Provide file mode of paths in index from IndexDiffKevin Sawicki1-0/+11
Change-Id: I1d543e2f721987114cc1e1cb0848c234470df794 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-03Use constants from ConfigConstants in CoreConfigKevin Sawicki2-3/+15
Change-Id: Ic1253498ecdd7545c6b1f114f4c83a3b77273874
2012-01-03Retain executable mode of existing files on WindowsKevin Sawicki4-4/+33
Currently files in a repository marked as executable will have that mode unset when modified and committed on systems that do not support detection of this mode since the working tree iterator will never report this mode for any entries. This change updates WorkingTreeIterator to be able to determine the target file mode to be used for the index through consideration of the configured WorkingTreeOptions. Bug: 364956 Change-Id: Iae496baa011b8a59d9329ec73615482b03d34a5a
2012-01-03Add support for cloning submodules to CloneCommandKevin Sawicki1-0/+26
Change-Id: Ib1f82206fa14be75e2080f95db9f2d178e876453
2012-01-02Extend TransportCommand in submodule add/update commandsKevin Sawicki2-34/+6
This allows all the settings of a TransportCommand to be configured on the clone commands that are run by submodule add/update Change-Id: I93bfe5a91d430200de8c7f1e32a60cb990aa58ea
2012-01-02Add submodule command helpers to Git classKevin Sawicki1-0/+51
Change-Id: I649d96617072db68ab15aa2569836fa783577424
2012-01-02Skip a number commits before starting to show the commit outputTomasz Zarna4-2/+120
Change-Id: Id2666d897d29b6371f7a6cf241cfda02964b4971 Signed-off-by: Kevin Sawicki <kevin@github.com>
2012-01-02Add constant for default name for the Git repo configurationTomasz Zarna5-5/+9
Change-Id: I5a6ef686c444fb1e46c9f784bad01165471ef372 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2012-01-02Sort translation bundle keys in alphabetical order.Tomasz Zarna2-80/+80
Change-Id: I83e26531ea924178ba43fa82b3c1fe02afd23eca Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-12-28Add comand support for git-submoduleKevin Sawicki14-13/+1499
Adds the following commands: - Add - Init - Status - Sync - Update This also updates AddCommand so that file patterns added that are submodules can be staged in the index. Change-Id: Ie5112aa26430e5a2a3acd65a7b0e1d76067dc545 Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2011-12-27Add commit id and parent count to exception messageKevin Sawicki3-5/+11
Bug: 357312 Change-Id: I2f85cf88650594eca7df6aa0e26bea329674f08e
2011-12-27Merge "Only print stack trace to Sytem.err when debug flag is set"Shawn Pearce1-2/+4
2011-12-27Fix typo in RebaseResult#mySatusTomasz Zarna1-5/+5
Change-Id: I88d34eec8307231f89343ead06858d1df4ac0886
2011-12-27Only print stack trace to Sytem.err when debug flag is setKevin Sawicki1-2/+4
Bug: 362100 Change-Id: Id18de9660f0dc2fb6c30db9770f31f26c874022d
2011-12-26Merge branch 'stable-1.2'Matthias Sohn2-0/+104
* stable-1.2: JGit v1.2.0.201112221803-r Expose unmerged paths when revert fails Enforce the use of Java5 API:s only (with a few exceptions) Change-Id: Ib18d41a65e68cc47fb63114fcce27a16820d0692 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-12-23Merge "Limit the number of commits in LogCommand output"Robin Rosenberg4-0/+116
2011-12-23Limit the number of commits in LogCommand outputTomasz Zarna4-0/+116
Bug: 316680 Change-Id: I88cf7aac6b5763cc94421433dd4bbd42f81e0e69
2011-12-23DiffFormatter#format(List) fails unless #scan(ATI, ATI) is called firstTomasz Zarna2-10/+25
Bug: 354919 Change-Id: I710394fe6675e0e5aa66d9118c5b10d433aa30ea
2011-12-22Merge "Support getting specific entry number in reflog"Robin Rosenberg3-9/+37
2011-12-22JGit v1.2.0.201112221803-rv1.2.0.201112221803-rstable-1.2Matthias Sohn3-3/+3
Change-Id: Icc0b09324f205d93929af8cf522a99ad00cf7591 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-12-20Refactor ResolveMergerChristian Halstrick1-59/+96
The places where ResolveMerger was doing content merges have been refactored. The goal was to have one single method where content merge was done and to factor out other topics (updating the index, updating the working tree) into own methods. This was done to allow adding pluggable content mergers in change I7817e2123d254f3eeb315b47a61d2c55bd202c12 Change-Id: I8529697b197372a284bcd5ab2c9ba1adb925a520 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
2011-12-19Expose unmerged paths when revert failsKevin Sawicki1-0/+10
Change-Id: I02678aeb31a62668ae2b0342a6dae721e043dc5e

Back to the top