allows to update existing repo instead of forcing to clone it

contributes to #10 Signed-off-by: Didier Vojtisek <[email protected]>
gemoc · Jun 7, 2021 · afd34a4 · afd34a4
1 parent e65ecfb
commit afd34a4
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 3 deletions.
diff --git a/...es/src/main/java/org/gemoc/sync_git_submodules_branches/SyncGitSubModulesBranchesCLI.java b/...es/src/main/java/org/gemoc/sync_git_submodules_branches/SyncGitSubModulesBranchesCLI.java
@@ -59,7 +59,7 @@ public static void main(String[] args) throws Exception {
 		GitModuleManager gitManager = new GitModuleManager(parentGitURL, outputDirectory.getAbsolutePath(), credProvider,
 				committerName,
 				committerEmail);
-    	gitManager.gitClone();
+    	gitManager.gitUpdateOrClone();
     	//gitManager.listAllBranches();
     	//gitManager.listMasterSubModules();
     	//gitManager.listAllSubmodulesBranches();

diff --git a/...s/src/main/java/org/gemoc/sync_git_submodules_branches/SyncGitSubmodulesBranchesMojo.java b/...s/src/main/java/org/gemoc/sync_git_submodules_branches/SyncGitSubmodulesBranchesMojo.java
@@ -86,7 +86,7 @@ public void execute()
 				committerName,
 				committerEmail);
     	try {
-			gitManager.gitClone();
+			gitManager.gitUpdateOrClone();
 			gitManager.listSubModules();
 	    	Set<String> relevantBranches = gitManager.collectAllSubmodulesActiveRemoteBranches(inactivityThreshold);
 	    	gitManager.deleteBranchesNotIn(relevantBranches);

diff --git a/...anches/src/main/java/org/gemoc/sync_git_submodules_branches/gittool/GitModuleManager.java b/...anches/src/main/java/org/gemoc/sync_git_submodules_branches/gittool/GitModuleManager.java
@@ -14,16 +14,24 @@
 import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.ListBranchCommand.ListMode;
+import org.eclipse.jgit.api.PullResult;
 import org.eclipse.jgit.api.Status;
+import org.eclipse.jgit.api.errors.CanceledException;
 import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.api.errors.InvalidConfigurationException;
 import org.eclipse.jgit.api.errors.InvalidRemoteException;
+import org.eclipse.jgit.api.errors.NoHeadException;
+import org.eclipse.jgit.api.errors.RefNotAdvertisedException;
+import org.eclipse.jgit.api.errors.RefNotFoundException;
 import org.eclipse.jgit.api.errors.TransportException;
+import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
 import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.SubmoduleConfig.FetchRecurseSubmodulesMode;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
@@ -95,6 +103,39 @@ public void gitClone() throws InvalidRemoteException, TransportException, GitAPI
 
 		}
 	}
+
+	public void gitUpdate() throws IOException, WrongRepositoryStateException, InvalidConfigurationException, InvalidRemoteException, CanceledException, RefNotFoundException, RefNotAdvertisedException, NoHeadException, TransportException, GitAPIException {
+		File localPath = new File(localGitFolder);
+		logger.info("Updating " + localPath + " from " + gitRemoteURL);
+		try (Git result = Git.open(localPath)) {
+			String url = result.getRepository().getConfig().getString("remote", "origin", "url");
+			if(gitRemoteURL.equals(url)) {
+				logger.info("Checkout "+masterBranchName+" branch from existing repository: " + result.getRepository().getDirectory());
+				result.checkout().setName(masterBranchName).call();
+				logger.info("Pulling existing repository: " + result.getRepository().getDirectory());
+				PullResult res = result.pull().setRecurseSubmodules(FetchRecurseSubmodulesMode.YES).call();
+				if(!res.isSuccessful()){
+					logger.error("Failed to pull repository\n Please delete folder "+localGitFolder+" to perform a full clone.");
+					logger.error("fetch result: "+res.getFetchResult().getMessages());
+					logger.error("merge result: "+res.getMergeResult().getMergeStatus());
+					logger.error("rebase result: "+res.getRebaseResult().getStatus());
+					throw new WrongRepositoryStateException("Failed to pull repository");
+				}
+			} else {
+				logger.error("Existing folder doesn't point to the same url ("+url+")\n Please delete folder "+localGitFolder+" to perform a full clone.");
+				throw new InvalidRemoteException("Existing folder doesn't point to the same url ("+url+") Please delete this folder to perform a full clone.");
+			}
+		}
+	}
+
+	public void gitUpdateOrClone() throws WrongRepositoryStateException, InvalidConfigurationException, InvalidRemoteException, CanceledException, RefNotFoundException, RefNotAdvertisedException, NoHeadException, TransportException, IOException, GitAPIException {
+		File localPath = new File(localGitFolder);
+		if(localPath.exists() && localPath.isDirectory()) {
+			gitUpdate();
+		} else {
+			gitClone();
+		}
+	}
 
 	public void listAllBranches() throws IOException, GitAPIException {
 		FileRepositoryBuilder builder = new FileRepositoryBuilder();
@@ -384,7 +425,7 @@ public void updateBranchesForModules(Git parentgit, String consideredBranch)
 				Repository submoduleRepository = walk.getRepository();
 				try (Git submodulegit = Git.wrap(submoduleRepository)) {
 					// logger.info("remote branches in submodule "+walk.getModuleName()+":");
-					String trackedBranchName = "master";
+					String trackedBranchName = masterBranchName;
 					Ref trackedBranchRef = null;
 					List<Ref> branches = submodulegit.branchList().setListMode(ListMode.REMOTE).call();
 					for (Ref ref : branches) {