From 679cab9b3297e550a9ae04b88ba839dc9eb84957 Mon Sep 17 00:00:00 2001 From: Dariusz Luksza Date: Wed, 17 Aug 2011 12:43:35 +0200 Subject: Adds DiffEntry.scan(TreeWalk, boolean) method Adds method into DiffEntry class that allows to specify whether changed trees are included in scanning result list. By default changed trees aren't added, but in some cases having changed tree would be useful. Also adds check for tree count in TreeWalk and when it is different from two it will thrown an IllegalArgumentException. This change is required by egit I7ddb21e7ff54333dd6d7ace3209bbcf83da2b219 Change-Id: I5a680a73e1cffa18ade3402cc86008f46c1da1f1 Signed-off-by: Dariusz Luksza Signed-off-by: Matthias Sohn --- org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 2 ++ 1 file changed, 2 insertions(+) (limited to 'org.eclipse.jgit/resources/org/eclipse') diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index 8c87d2a6b0..9cc0e022ea 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -492,3 +492,5 @@ year=year years=years yearsAgo={0} years ago yearsMonthsAgo={0} {1}, {2} {3} ago +treeWalkMustHaveExactlyTwoTrees=TreeWalk should have exactly two trees. +cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included. -- cgit v1.2.3