]> source.dussan.org Git - jgit.git/log
jgit.git
12 years agoLoad .gitmodules config before adding values to it 25/5225/2
Sascha Scholz [Fri, 2 Mar 2012 17:31:09 +0000 (09:31 -0800)]
Load .gitmodules config before adding values to it

This prevents existing entries from being cleared when the
.gitmodules config is saved after the new submodule configuration
is added.

Change-Id: I66841f5e758a7527e2e6e25cf1318e5fea91a909
Signed-off-by: Kevin Sawicki <kevin@github.com>
12 years agoMerge "Exclude org.eclipse.jgit from pack200 packing"
Christian Halstrick [Fri, 2 Mar 2012 16:03:14 +0000 (11:03 -0500)]
Merge "Exclude org.eclipse.jgit from pack200 packing"

12 years agoMerge "Reuse existing modes and ids"
Christian Halstrick [Fri, 2 Mar 2012 08:46:03 +0000 (03:46 -0500)]
Merge "Reuse existing modes and ids"

12 years agoExclude org.eclipse.jgit from pack200 packing 19/5219/1
Matthias Sohn [Fri, 2 Mar 2012 08:09:39 +0000 (09:09 +0100)]
Exclude org.eclipse.jgit from pack200 packing

It seems pack200 became unable to correctly pack the bundle
org.eclipse.jgit (see bug 372845). Hence mark it to be excluded from
this packing step following the workaround which worked for
org.eclipse.jst.jsf.core (bug 335806).

Bug: 372845
Change-Id: I2e3d20645ac49125472ddc235afbe9f3c7480caf
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoExtract filterCommands as a static method on ReceiveCommand 72/5172/5
Dave Borowitz [Mon, 27 Feb 2012 20:15:49 +0000 (12:15 -0800)]
Extract filterCommands as a static method on ReceiveCommand

Change-Id: I24501f95185878d09b54562e48cb4e7e45dd3968

12 years agoRemove PreUploadHook.onPreAdvertiseRefs 85/5085/5
Dave Borowitz [Tue, 14 Feb 2012 18:33:05 +0000 (10:33 -0800)]
Remove PreUploadHook.onPreAdvertiseRefs

AdvertiseRefsHook.advertiseRefs subsumes this behavior.

Change-Id: Id2d1ebb2503c9ba79eda58aaea2fd76ec233427f

12 years agoAdd an AdvertiseRefsHookChain, similar to the other hook chains 86/5086/6
Dave Borowitz [Tue, 14 Feb 2012 22:54:45 +0000 (14:54 -0800)]
Add an AdvertiseRefsHookChain, similar to the other hook chains

Change-Id: I3bb0dc86047fe0446d18e0055f714092a658d228

12 years agoModify refs in UploadPack/ReceivePack using a hook interface 84/5084/9
Dave Borowitz [Wed, 8 Feb 2012 22:30:04 +0000 (14:30 -0800)]
Modify refs in UploadPack/ReceivePack using a hook interface

This is intended to replace the RefFilter interface (but does not yet,
for backwards compatibility). That interface required lots of extra
scanning and copying in filter cases such as only advertising a subtree
of the refs directory. Instead, provide a hook that can be executed
right before ref advertisement, using the public methods on
UploadPack/ReceivePack to explicitly set the map of advertised refs.

Change-Id: I0067019a191c8148af2cfb71a675f2258c5af0ca

12 years agoFix a typo referring to RevFilter as RefFilter 83/5083/6
Dave Borowitz [Wed, 8 Feb 2012 22:30:08 +0000 (14:30 -0800)]
Fix a typo referring to RevFilter as RefFilter

Change-Id: I173efca7540b522d386216d1bd229e9a061263b2

12 years agoMinor javadoc wording fixes in ReceivePack 71/5171/5
Dave Borowitz [Mon, 27 Feb 2012 19:56:55 +0000 (11:56 -0800)]
Minor javadoc wording fixes in ReceivePack

Change-Id: I5b409ef39aee890bcd7d4277e36b85ac4dc48281

12 years agoExpose an OutputStream from ReceivePack for sending client messages 70/5170/5
Dave Borowitz [Mon, 27 Feb 2012 19:54:19 +0000 (11:54 -0800)]
Expose an OutputStream from ReceivePack for sending client messages

Callers may want to format and flush their own output, for example in a
PreReceiveHook that creates its own TextProgressMonitor. The actual
underlying msgOut can change over the lifetime of ReceivePack, so we
implement a small wrapper.

Change-Id: I57b6d6cad2542aaa93dcadc06cb3e933e81bcd3d

12 years agoAllow creating ReceiveCommands with a specified type 90/5090/3
Dave Borowitz [Wed, 15 Feb 2012 19:10:52 +0000 (11:10 -0800)]
Allow creating ReceiveCommands with a specified type

This allows callers who know in advance whether a command is UPDATE or
UPDATE_NONFASTFORWARD to specify this in the constructor rather than
with a separate method call.

Change-Id: Iae483594a4ff370ff75d17a7b0648c5590b3d1bd

12 years agoExecute ReceiveCommands via a method rather than in ReceivePack 81/5081/7
Dave Borowitz [Tue, 7 Feb 2012 23:16:40 +0000 (15:16 -0800)]
Execute ReceiveCommands via a method rather than in ReceivePack

This allows a PreReceiveHook to easily "take over" all of the
ReceiveCommands passed to it, preventing any of them from being handled
within the ReceivePack core.

Change-Id: I2a8c1fc44e8dcadf22cd97a8ec4ee79d4d9d08f1

12 years agoReuse existing modes and ids 95/5195/2
Kevin Sawicki [Wed, 29 Feb 2012 23:07:37 +0000 (15:07 -0800)]
Reuse existing modes and ids

This change replaces calls to getEntryObjectId and getEntryFileMode
with the existing method local variables for the index, merge, and
head tree iterators.

Change-Id: I75d1edfdd192a009fc916102ec052434c6302d00

12 years agoAdd command support for applying a stashed commit 73/5173/2
Kevin Sawicki [Mon, 27 Feb 2012 23:11:00 +0000 (15:11 -0800)]
Add command support for applying a stashed commit

Applies the changes in a stashed commit to the local working
directory and index

Bug: 309355
Change-Id: I9fd5ede8affc7f0060ffa7c5cec34573b6fa2b1b
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
12 years agoAdd support for creating a stashed commit 60/4760/17
Kevin Sawicki [Mon, 27 Feb 2012 20:44:34 +0000 (12:44 -0800)]
Add support for creating a stashed commit

Adds a new command to stash the index and working directory
changes in a commit stored in refs/stash

Bug: 309355
Change-Id: I2ce85b1601b74b07e286a3f99feb358dfbdfe29c
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
12 years agoAdd all paths option to CheckoutCommand 52/5152/7
Kevin Sawicki [Sun, 26 Feb 2012 15:10:57 +0000 (16:10 +0100)]
Add all paths option to CheckoutCommand

This will perform the equivalent  of running a
'git checkout -- .' at the root of a repository

Change-Id: I3e2dd563700999bc063effdd3640499c8ed08136
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoLet the date formatter pick the locale. 66/4966/4
Daniel Megert [Wed, 22 Feb 2012 20:32:43 +0000 (21:32 +0100)]
Let the date formatter pick the locale.

Instead of using the locale from the SystemReader we let the
SystemReader create the date formats without passing the locale.

Bug 368756
Change-Id: I6be9e07af804a08f3f3ac2d2d526ef594eed19e3
Signed-off-by: Daniel Megert <daniel_megert@ch.ibm.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoAdd support for autosetuprebase to the CloneCommand 19/4919/3
Stefan Lay [Thu, 23 Feb 2012 17:32:02 +0000 (09:32 -0800)]
Add support for autosetuprebase to the CloneCommand

Bug: 345536
Change-Id: I93c609235dec4e5e3a2ddc275c28b202bf868d40
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Kevin Sawicki <kevin@github.com>
12 years agoMerge "Add IGNORE_ERRORS to FileUtils.delete()"
Matthias Sohn [Tue, 21 Feb 2012 19:34:42 +0000 (14:34 -0500)]
Merge "Add IGNORE_ERRORS to FileUtils.delete()"

12 years agoAdd IGNORE_ERRORS to FileUtils.delete() 88/5088/2
Christian Halstrick [Tue, 21 Feb 2012 13:23:43 +0000 (14:23 +0100)]
Add IGNORE_ERRORS to FileUtils.delete()

There are a few situations where you want to delete files or folders but
where you are not interested in getting exceptions if this doesn't
succeed. E.g. if you delete garbage in the GC class you want that if
certain files can't be deleted the command succeeds. Maybe the next
garbage collector run has more luck not to interfere with a virus
scanner run on Windows. Therefore an option is added to
FileUtils.delete() not to report errors in such cases.

Change-Id: I58994d8c481e591dcbb0f2be7dfa562e125f0f08
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
12 years agoPrepare 2.0.0-SNAPSHOT builds 02/5102/1
Matthias Sohn [Wed, 15 Feb 2012 23:49:49 +0000 (00:49 +0100)]
Prepare 2.0.0-SNAPSHOT builds

Change-Id: I946e315af04227727ac937ebe9d70ae1ea4e8936
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoMerge branch 'stable-1.3' 01/5101/1
Matthias Sohn [Wed, 15 Feb 2012 23:44:36 +0000 (00:44 +0100)]
Merge branch 'stable-1.3'

* stable-1.3:
  Prepare post 1.3.0.201202151440-r build
  JGit 1.3.0.201202151440-r
  Generate conflicts and index updates on file mode changes

Change-Id: Ie99780ef5cdea7b3ea1ea076282fe0a25f14f469
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoPrepare post 1.3.0.201202151440-r build 00/5100/1 stable-1.3
Matthias Sohn [Wed, 15 Feb 2012 23:41:52 +0000 (00:41 +0100)]
Prepare post 1.3.0.201202151440-r build

Change-Id: I4d695273e3151c22f2df9a58725cc7ba21ab6043
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoJGit 1.3.0.201202151440-r 91/5091/1 v1.3.0.201202151440-r
Matthias Sohn [Wed, 15 Feb 2012 19:42:11 +0000 (20:42 +0100)]
JGit 1.3.0.201202151440-r

Change-Id: I663208919f297836a9c16bf458e4a43ffaca4c12
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoGenerate conflicts and index updates on file mode changes 78/5078/1
Christian Halstrick [Mon, 13 Feb 2012 08:39:05 +0000 (09:39 +0100)]
Generate conflicts and index updates on file mode changes

Handle more cases for file mode changes. Especially make sure that the
following cases are handled correctly.

Case 1)

  An entry in the working tree, HEAD tree, and merge tree have
  different modes and different content.

  Prior Outcome:
    Dirty working tree content is replaced and file mode
    changes are lost.

  New Outcome:
    Conflict is generated.

Case 2)

  An entry in the index and merge tree have the same content
  but different modes but both modes are file type modes.

  Prior Outcome:
    File mode in working tree is not updated and the working
    directory is dirty.

  New Outcome:
    Index is updated and the working directory is clean.

Bug: 363772
Change-Id: I224602d68228eb419813986807f1eeab77e9c302
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Also-by: Kevin Sawicki <kevin@github.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoMerge branch 'stable-1.3' 73/5073/1
Matthias Sohn [Mon, 13 Feb 2012 06:33:43 +0000 (07:33 +0100)]
Merge branch 'stable-1.3'

* stable-1.3:
  Prepare post 1.3.0.201202121842-rc4 builds
  JGit 1.3.0.201202121842-rc4
  Support gitdir references in working tree .git file
  Support committing submodule updates
  Update iplog tool's README

Change-Id: Id70f4d4b059b03d4fa6fbd9137b81a337e9c48e8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoPrepare post 1.3.0.201202121842-rc4 builds 72/5072/1
Matthias Sohn [Mon, 13 Feb 2012 06:28:37 +0000 (07:28 +0100)]
Prepare post 1.3.0.201202121842-rc4 builds

Change-Id: I50e0e6c2bccab5f3da62cbfe976f065169426906
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoJGit 1.3.0.201202121842-rc4 69/5069/1 v1.3.0.201202121842-rc4
Matthias Sohn [Sun, 12 Feb 2012 23:47:12 +0000 (00:47 +0100)]
JGit 1.3.0.201202121842-rc4

Change-Id: I82c6c0c175ab6fb4e2113101f36c8d2ddf4a13c1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoSupport gitdir references in working tree .git file 29/5029/4
Kevin Sawicki [Wed, 8 Feb 2012 22:10:28 +0000 (23:10 +0100)]
Support gitdir references in working tree .git file

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>
12 years agoAdd getters for old and new prefixes in DiffFormatter 44/5044/2
Tomasz Zarna [Thu, 2 Feb 2012 10:59:28 +0000 (11:59 +0100)]
Add getters for old and new prefixes in DiffFormatter

Bug: 370318
Change-Id: Iaf9282ba55ee3bb4e2c27fb71c598b308771bf57

12 years agoSupport committing submodule updates 30/5030/1
Kevin Sawicki [Mon, 23 Jan 2012 19:37:10 +0000 (11:37 -0800)]
Support committing submodule updates

Use the submodule object id provided by the working
tree iterator

Change-Id: Ibf82f56c04cb9c91b2b309cf0cfa3f638539e23c

12 years agoUpdate iplog tool's README 05/5005/1
Matthias Sohn [Fri, 27 Jan 2012 08:30:43 +0000 (09:30 +0100)]
Update iplog tool's README

Change-Id: I0a6d770b0c4deb11fea23b875ef5449c619c05a1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoMerge "Add developers section to root POM file"
Matthias Sohn [Thu, 26 Jan 2012 12:42:55 +0000 (07:42 -0500)]
Merge "Add developers section to root POM file"

12 years agoMerge "Allow to list tags with org.eclipse.jgit.pgm.Tag"
Robin Rosenberg [Wed, 25 Jan 2012 18:10:15 +0000 (13:10 -0500)]
Merge "Allow to list tags with org.eclipse.jgit.pgm.Tag"

12 years agoAdd developers section to root POM file 97/4997/2
Kevin Sawicki [Wed, 25 Jan 2012 17:01:55 +0000 (09:01 -0800)]
Add developers section to root POM file

This section contains the names of the current committers
and is required for acceptance to the Maven Central repository

Change-Id: Ib758cfe0a574aa3e80af9d289bec1a74d9b78d25

12 years agoMove writeTrashFile and deleteFile into JGitTestUtil 82/4982/2
Dariusz Luksza [Wed, 25 Jan 2012 00:24:09 +0000 (01:24 +0100)]
Move writeTrashFile and deleteFile into JGitTestUtil

Moves RepositoryTestCase.writeThashFile, RepositoryTestCase.deleteFile
and dependencies into JGitTestUtil for further reuse.

Required-by-EGit: If8dfa0251797aca56ddc825619500dc21885ba26
Change-Id: I6fc62c8e6626f907e544b5bbe5d64e864a2c323f
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
12 years agoAdd scm section to root POM file 84/4984/1
Kevin Sawicki [Mon, 23 Jan 2012 17:19:18 +0000 (09:19 -0800)]
Add scm section to root POM file

Change-Id: I23db67685a7b6a481961eb6ed6b4b80b2d0cace8

12 years agoReally close output stream when core.autocrlf is true 83/4983/1
Robin Rosenberg [Sun, 22 Jan 2012 23:57:39 +0000 (00:57 +0100)]
Really close output stream when core.autocrlf is true

Change-Id: I8a0d91e908145168c32589600bd1598826511ae3

12 years agoWorkaround incompatible refactoring in Jetty 7.6.0 69/4969/2
Tomasz Zarna [Fri, 20 Jan 2012 23:15:03 +0000 (00:15 +0100)]
Workaround incompatible refactoring in Jetty 7.6.0

In Jetty 7.6 package org.eclipse.jetty.http.security was renamed to
org.eclipse.jetty.util.security [1] breaking compatibility.

Compare docs for the package in 7.5.4 [2] and missing part in 7.6.0 [3].
To fix until we switch to Jetty 8, restrict the maximum version to 7.6.0
exclusive.

[1] http://dev.eclipse.org/mhonarc/lists/jetty-dev/msg01175.html
[2] http://download.eclipse.org/jetty/7.5.4.v20111024/apidocs/
[3] http://download.eclipse.org/jetty/7.6.0.RC4/apidocs/

Change-Id: I82b107ec76e66367e55e2cc20233a7924bf7be9f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoAdd command support for listing stashed commits 50/4750/10
Kevin Sawicki [Mon, 19 Dec 2011 17:46:37 +0000 (09:46 -0800)]
Add command support for listing stashed commits

Bug: 309355
Change-Id: I34a8c251b89abcdb67565ca49bee02e5e2113593
Signe-off-by: Chris Aniszczyk <zx@twitter.com>
12 years agoMerge "Support relative submodule URLs on init/add/sync"
Matthias Sohn [Wed, 18 Jan 2012 21:26:42 +0000 (16:26 -0500)]
Merge "Support relative submodule URLs on init/add/sync"

12 years agoSupport relative submodule URLs on init/add/sync 62/4962/3
Kevin Sawicki [Tue, 17 Jan 2012 17:35:29 +0000 (09:35 -0800)]
Support relative submodule URLs on init/add/sync

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

12 years agoAdd BranchTrackingStatus for getting remote tracking status 32/4732/4
Robin Stocker [Mon, 16 Jan 2012 21:33:03 +0000 (22:33 +0100)]
Add BranchTrackingStatus for getting remote tracking status

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>
12 years agoAdd BranchConfig helper for access to branch config section 30/4730/4
Robin Stocker [Mon, 16 Jan 2012 21:18:54 +0000 (22:18 +0100)]
Add BranchConfig helper for access to branch config section

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>
12 years agoAdd RevWalkUtils with count(start, end) method 31/4731/4
Robin Stocker [Mon, 16 Jan 2012 21:05:20 +0000 (22:05 +0100)]
Add RevWalkUtils with count(start, end) method

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>
12 years agoMerge "Support more of AutoCRLF"
Christian Halstrick [Mon, 16 Jan 2012 15:53:13 +0000 (10:53 -0500)]
Merge "Support more of AutoCRLF"

12 years agoFix resolution of tree when path is empty 56/4956/4
Robin Rosenberg [Sun, 15 Jan 2012 22:51:43 +0000 (23:51 +0100)]
Fix resolution of tree when path is empty

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>
12 years agoMake sure all bytes are written to files on close, or get an error. 41/4841/3
Robin Rosenberg [Sun, 15 Jan 2012 10:22:52 +0000 (11:22 +0100)]
Make sure all bytes are written to files on close, or get an error.

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>
12 years agoMerge "Resolve ~ with no trailing number as the first parent commit"
Robin Rosenberg [Sun, 15 Jan 2012 01:28:52 +0000 (20:28 -0500)]
Merge "Resolve ~ with no trailing number as the first parent commit"

12 years agoThrow API exception when LsRemoteCommand fails with TransportException 49/4949/3
Matthias Sohn [Sun, 15 Jan 2012 00:38:25 +0000 (01:38 +0100)]
Throw API exception when LsRemoteCommand fails with TransportException

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>
12 years agoResolve ~ with no trailing number as the first parent commit 55/4955/6
Kevin Sawicki [Sat, 14 Jan 2012 23:34:18 +0000 (15:34 -0800)]
Resolve ~ with no trailing number as the first parent commit

This would previously throw a RevisionSyntaxException

Change-Id: I42b4988c7f6c6454e2ebda13914260e25ac1a889

12 years agoCannot commit -o file with only file permission change 51/4851/4
Robin Rosenberg [Sat, 7 Jan 2012 13:00:14 +0000 (14:00 +0100)]
Cannot commit -o file with only file permission change

Bug 345076
Change-Id: Ie64039793ab6ba4748731320399f03301b6282ec
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoSupport more of AutoCRLF 30/4530/2
Robin Rosenberg [Mon, 31 Oct 2011 22:30:11 +0000 (23:30 +0100)]
Support more of AutoCRLF

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

12 years agoMerge "Provide helper for unlocking a file"
Matthias Sohn [Tue, 10 Jan 2012 17:24:49 +0000 (12:24 -0500)]
Merge "Provide helper for unlocking a file"

12 years agoProvide helper for unlocking a file 08/4908/4
Kevin Sawicki [Mon, 9 Jan 2012 16:46:13 +0000 (08:46 -0800)]
Provide helper for unlocking a file

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

12 years agoAdd setter for ProgressMonitor to DiffCommand 34/4934/2
Tomasz Zarna [Mon, 9 Jan 2012 14:48:16 +0000 (15:48 +0100)]
Add setter for ProgressMonitor to DiffCommand

Change-Id: I34f8b77a461e165d7d624dbd9a6944feadc57b8e

12 years agoMerge "Add options for setting context lines and prefixes to DiffCommand"
Stefan Lay [Mon, 9 Jan 2012 12:06:59 +0000 (07:06 -0500)]
Merge "Add options for setting context lines and prefixes to DiffCommand"

12 years agoAdd options for setting context lines and prefixes to DiffCommand 90/4890/2
Tomasz Zarna [Mon, 9 Jan 2012 11:13:12 +0000 (12:13 +0100)]
Add options for setting context lines and prefixes to DiffCommand

Change-Id: I539f3531e94c11c0f0a3e7096c0eb1b1c309898a

12 years agoMerge "Add helper for determining if status is clean"
Christian Halstrick [Mon, 9 Jan 2012 11:13:12 +0000 (06:13 -0500)]
Merge "Add helper for determining if status is clean"

12 years agoNarrow exceptions declared by LsRemoteCommand 32/4932/7
Matthias Sohn [Sun, 8 Jan 2012 21:08:08 +0000 (13:08 -0800)]
Narrow exceptions declared by LsRemoteCommand

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>
12 years agoMerge "Retain executable mode of existing files on Windows"
Robin Rosenberg [Sun, 8 Jan 2012 21:34:28 +0000 (16:34 -0500)]
Merge "Retain executable mode of existing files on Windows"

12 years agoMerge "Use constants from ConfigConstants in CoreConfig"
Matthias Sohn [Thu, 5 Jan 2012 15:15:55 +0000 (10:15 -0500)]
Merge "Use constants from ConfigConstants in CoreConfig"

12 years agoAdd helper for determining if status is clean 16/4916/1
Kevin Sawicki [Wed, 4 Jan 2012 00:48:01 +0000 (16:48 -0800)]
Add helper for determining if status is clean

This checks if all collections that Status exposes are
empty or not

Change-Id: I0c342ab70dc36c1fd70acb4f8a924bb207d62f47

12 years agoProvide file mode of paths in index from IndexDiff 04/4904/8
Kevin Sawicki [Tue, 3 Jan 2012 23:27:56 +0000 (00:27 +0100)]
Provide file mode of paths in index from IndexDiff

Change-Id: I1d543e2f721987114cc1e1cb0848c234470df794
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoUse constants from ConfigConstants in CoreConfig 13/4913/1
Kevin Sawicki [Tue, 3 Jan 2012 23:24:55 +0000 (15:24 -0800)]
Use constants from ConfigConstants in CoreConfig

Change-Id: Ic1253498ecdd7545c6b1f114f4c83a3b77273874

12 years agoRetain executable mode of existing files on Windows 28/4828/14
Kevin Sawicki [Tue, 3 Jan 2012 23:07:02 +0000 (15:07 -0800)]
Retain executable mode of existing files on Windows

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

12 years agoAdd support for cloning submodules to CloneCommand 00/4900/7
Kevin Sawicki [Mon, 2 Jan 2012 17:38:21 +0000 (09:38 -0800)]
Add support for cloning submodules to CloneCommand

Change-Id: Ib1f82206fa14be75e2080f95db9f2d178e876453

12 years agoExtend TransportCommand in submodule add/update commands 02/4902/2
Kevin Sawicki [Mon, 2 Jan 2012 17:40:53 +0000 (09:40 -0800)]
Extend TransportCommand in submodule add/update commands

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

12 years agoAdd submodule command helpers to Git class 01/4901/1
Kevin Sawicki [Mon, 2 Jan 2012 17:34:25 +0000 (09:34 -0800)]
Add submodule command helpers to Git class

Change-Id: I649d96617072db68ab15aa2569836fa783577424

12 years agoSkip a number commits before starting to show the commit output 84/4884/9
Tomasz Zarna [Mon, 2 Jan 2012 16:40:02 +0000 (08:40 -0800)]
Skip a number commits before starting to show the commit output

Change-Id: Id2666d897d29b6371f7a6cf241cfda02964b4971
Signed-off-by: Kevin Sawicki <kevin@github.com>
12 years agoAdd constant for default name for the Git repo configuration 97/4897/2
Tomasz Zarna [Mon, 2 Jan 2012 12:24:36 +0000 (13:24 +0100)]
Add constant for default name for the Git repo configuration

Change-Id: I5a6ef686c444fb1e46c9f784bad01165471ef372
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoSort translation bundle keys in alphabetical order. 95/4895/3
Tomasz Zarna [Mon, 2 Jan 2012 11:59:05 +0000 (12:59 +0100)]
Sort translation bundle keys in alphabetical order.

Change-Id: I83e26531ea924178ba43fa82b3c1fe02afd23eca
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoUpdate base version for clirr API check to latest release 92/4892/1
Matthias Sohn [Fri, 30 Dec 2011 01:09:17 +0000 (02:09 +0100)]
Update base version for clirr API check to latest release

Change-Id: Icb56610241c80d6ca8a980f6d419f4934579d441
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoAdd comand support for git-submodule 61/4861/6
Kevin Sawicki [Mon, 19 Dec 2011 17:38:11 +0000 (09:38 -0800)]
Add comand support for git-submodule

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>
12 years agoAdd commit id and parent count to exception message 20/4820/2
Kevin Sawicki [Wed, 14 Dec 2011 21:33:27 +0000 (13:33 -0800)]
Add commit id and parent count to exception message

Bug: 357312
Change-Id: I2f85cf88650594eca7df6aa0e26bea329674f08e

12 years agoMerge "Only print stack trace to Sytem.err when debug flag is set"
Shawn Pearce [Tue, 27 Dec 2011 21:24:36 +0000 (16:24 -0500)]
Merge "Only print stack trace to Sytem.err when debug flag is set"

12 years agoFix typo in RebaseResult#mySatus 85/4885/1
Tomasz Zarna [Tue, 27 Dec 2011 20:46:19 +0000 (21:46 +0100)]
Fix typo in RebaseResult#mySatus

Change-Id: I88d34eec8307231f89343ead06858d1df4ac0886

12 years agoOnly print stack trace to Sytem.err when debug flag is set 83/4883/1
Kevin Sawicki [Tue, 27 Dec 2011 17:20:03 +0000 (09:20 -0800)]
Only print stack trace to Sytem.err when debug flag is set

Bug: 362100
Change-Id: Id18de9660f0dc2fb6c30db9770f31f26c874022d

12 years agoMerge branch 'stable-1.2' 79/4879/1
Matthias Sohn [Mon, 26 Dec 2011 22:52:32 +0000 (23:52 +0100)]
Merge branch 'stable-1.2'

* 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>
12 years agoMerge "Limit the number of commits in LogCommand output"
Robin Rosenberg [Fri, 23 Dec 2011 18:28:21 +0000 (13:28 -0500)]
Merge "Limit the number of commits in LogCommand output"

12 years agoLimit the number of commits in LogCommand output 27/4827/4
Tomasz Zarna [Thu, 22 Dec 2011 11:34:01 +0000 (12:34 +0100)]
Limit the number of commits in LogCommand output

Bug: 316680
Change-Id: I88cf7aac6b5763cc94421433dd4bbd42f81e0e69

12 years agoDiffFormatter#format(List) fails unless #scan(ATI, ATI) is called first 36/4036/2
Tomasz Zarna [Thu, 18 Aug 2011 11:43:42 +0000 (13:43 +0200)]
DiffFormatter#format(List) fails unless #scan(ATI, ATI) is called first

Bug: 354919
Change-Id: I710394fe6675e0e5aa66d9118c5b10d433aa30ea

12 years agoMerge "Support getting specific entry number in reflog"
Robin Rosenberg [Thu, 22 Dec 2011 23:49:04 +0000 (18:49 -0500)]
Merge "Support getting specific entry number in reflog"

12 years agoJGit v1.2.0.201112221803-r 73/4873/1 stable-1.2 v1.2.0.201112221803-r
Matthias Sohn [Thu, 22 Dec 2011 23:12:32 +0000 (00:12 +0100)]
JGit v1.2.0.201112221803-r

Change-Id: Icc0b09324f205d93929af8cf522a99ad00cf7591
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoRefactor ResolveMerger 66/4366/3
Christian Halstrick [Wed, 19 Oct 2011 22:33:47 +0000 (00:33 +0200)]
Refactor ResolveMerger

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>
12 years agoExpose unmerged paths when revert fails 23/4823/3
Kevin Sawicki [Wed, 14 Dec 2011 22:30:00 +0000 (14:30 -0800)]
Expose unmerged paths when revert fails

Change-Id: I02678aeb31a62668ae2b0342a6dae721e043dc5e

12 years agoSupport getting specific entry number in reflog 22/4822/4
Kevin Sawicki [Mon, 19 Dec 2011 17:14:47 +0000 (09:14 -0800)]
Support getting specific entry number in reflog

The number specified is interpreted as relative to the
last entry in the reflog.

Change-Id: Ie4dd03370bb0d475a0e89d3015113ca98920100f

12 years agoAdd exception class for when locking a file fails 00/4800/2
Kevin Sawicki [Tue, 13 Dec 2011 01:49:09 +0000 (17:49 -0800)]
Add exception class for when locking a file fails

This will allows calling classes to handle lock failures
without checking against the message and will also provide
access to the file that could not be locked.

Change-Id: I95bc59e1330a7af71ae3b0485c4516299193f504

12 years agoAllow to amend commits with JGit CLI 54/4854/1
Tomasz Zarna [Sun, 18 Dec 2011 15:28:44 +0000 (16:28 +0100)]
Allow to amend commits with JGit CLI

Change-Id: I0e8d365b56e079ac4ccece7fcf80ea140c319c78

12 years agoSupport resolving integer-based reflog revisions 19/4819/4
Kevin Sawicki [Sat, 17 Dec 2011 01:05:42 +0000 (17:05 -0800)]
Support resolving integer-based reflog revisions

Revision strings such as 'master@{0}' can now be resolved
by Repository.resolve by reading the reflog for the ref and
returning the commit for the entry number specified.

This still throws an exception for cases not supported
such as 'master@{yesterday}'.

Change-Id: I6162777d6510e083565a77cac4545cda5a9aefb3

12 years agoMerge "Report diff entries for files that only change mode"
Robin Rosenberg [Fri, 16 Dec 2011 15:30:24 +0000 (10:30 -0500)]
Merge "Report diff entries for files that only change mode"

12 years agoMerge branch 'stable-1.2' 38/4838/1
Matthias Sohn [Fri, 16 Dec 2011 07:49:59 +0000 (08:49 +0100)]
Merge branch 'stable-1.2'

* stable-1.2:
  Add API checking using clirr
  Fix MergeCommandTest to pass if File.executable is not supported
  Fix ResolveMerger not to add paths with FileMode 0

Change-Id: I86e7194a40acd6dfa3d433f1d17c01bdf5bb0d9c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoEnforce the use of Java5 API:s only (with a few exceptions) 85/4785/3
Robin Rosenberg [Fri, 16 Dec 2011 00:01:36 +0000 (01:01 +0100)]
Enforce the use of Java5 API:s only (with a few exceptions)

This only works with Eclipse 3.6 and newer and requires installation
of new package. Documentation is not very good, but there is a blog
about it here:
http://eclipseandjazz.blogspot.com/2011/10/of-invalid-references-to-system.html

API checking is especially useful on OS X where Java5 is not readily
available.

Change-Id: I3c0ad460874a21c073f5ac047146cbf5d31992b4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
12 years agoMerge "Fix MergeCommandTest to pass if File.executable is not supported" into stable-1.2
Matthias Sohn [Thu, 15 Dec 2011 23:58:48 +0000 (18:58 -0500)]
Merge "Fix MergeCommandTest to pass if File.executable is not supported" into stable-1.2

12 years agoAdd API checking using clirr 31/4831/3
Matthias Sohn [Thu, 15 Dec 2011 23:50:46 +0000 (15:50 -0800)]
Add API checking using clirr

In order to generate API reports run: mvn clirr:clirr

The reports are generated to the folder
target/site/clirr-report.html under the respective
project.

In order to check API compatibility and fail the build
on incompatible changes run: mvn clirr:check

For now we compare the API against the latest release
1.1.0.201109151100-r.

Bug: 336849
Change-Id: I21baaf3a6883c5b4db263f712705cc7b8ab6d888
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Signed-off-by: Kevin Sawicki <kevin@github.com>
12 years agoFix MergeCommandTest to pass if File.executable is not supported 30/4830/1
Robin Rosenberg [Thu, 15 Dec 2011 22:33:00 +0000 (23:33 +0100)]
Fix MergeCommandTest to pass if File.executable is not supported

Change-Id: If11080ed6e53d9df88a1ae42f48ee8914d54669b

12 years agoReport diff entries for files that only change mode 26/4826/4
Kevin Sawicki [Thu, 15 Dec 2011 01:51:42 +0000 (17:51 -0800)]
Report diff entries for files that only change mode

This also updates DiffFormatter to not write path lines
for entries that have the same object id

Bug: 361570
Change-Id: I830a78e2babf472503630a7aa020ebfd5c7e69c6

12 years agoFire DfsPacksChangedEvents when committing packs. 07/4807/2
Dave Borowitz [Tue, 13 Dec 2011 19:00:19 +0000 (11:00 -0800)]
Fire DfsPacksChangedEvents when committing packs.

Once a pack has been committed with commitPack(), we know that the pack
list has changed but we don't re-scan the underlying storage.

Change-Id: Ia7b35df4442a5f5dfe7e817edcc77b44b5410d08

12 years agoStatusCommand#setWorkingTreeIt should return 'this' 91/4791/2
Tomasz Zarna [Mon, 12 Dec 2011 17:21:15 +0000 (09:21 -0800)]
StatusCommand#setWorkingTreeIt should return 'this'

All setters for JGit API commands return the command instance, follow
the builder pattern.

Change-Id: Id2bbc3f1300bb179887c4d2d6dd72925bde55f24
Signed-off-by: Kevin Sawicki <kevin@github.com>