]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 17e6d8d) | patch
Add progress monitor to Merger 80/64280/3
authorLaurent Delaigue <laurent.delaigue@obeo.fr>
Wed, 13 Jan 2016 15:56:00 +0000 (16:56 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 21 Jan 2016 10:37:26 +0000 (11:37 +0100)
commit1e1fb9fc596603a44b0fff6d19eeba2b005d659d
tree283f76b1bff65d98e7ed372f6b4d6ae4d11175a4tree | snapshot
parent17e6d8d42b6266c8644da805b7b698bf21a54393commit | diff
Add progress monitor to Merger

Monitoring progress of merges can be useful for users for large
repositories or complex merge processes that take some time.

This enables setting a monitor. Existing merge implementations in jgit
do not yet report progress if a monitor is set. This will be added in a
later change.

Change-Id: I17b978b3fc91750dd88649638b90a46820a0877c
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit