From 9d35aafc565a880c5cae7c21fa6c10fbdd0399ec Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Sun, 24 Jan 2016 22:05:38 +0100 Subject: [PATCH] LUCENE-6938: Add WC checks back, now based on JGit --- build.xml | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 5 deletions(-) diff --git a/build.xml b/build.xml index 681b230b521..da0474a483e 100644 --- a/build.xml +++ b/build.xml @@ -20,6 +20,8 @@ + + @@ -551,8 +553,71 @@ File | Project Structure | Platform Settings | SDKs): - - This task is currently disabled due to migration to GIT + + + + + + + + if (val instanceof Set) { + if (prop in ['untracked', 'untrackedFolders', 'missing']) { + unversioned.addAll(val); + } else if (prop != 'ignoredNotInIndex') { + modified.addAll(val); + } + } + }; + setProjectPropertyFromSet('wc.unversioned.files', unversioned); + setProjectPropertyFromSet('wc.modified.files', modified); + } + } catch (RepositoryNotFoundException | NoWorkTreeException | NotSupportedException e) { + task.log('WARNING: Development directory is not a valid GIT checkout! Disabling checks...', Project.MSG_WARN); + } + ]]> + + + + + + + + + + + + + + @@ -645,13 +710,13 @@ File | Project Structure | Platform Settings | SDKs): - - + + - +