Commit 54d0218b authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

do not change branches for target repository

parent 1aa049bd

src/main/java/fr/emse/gitlab/saref/entities/SAREFVersion.java

+6 −8
Original line number Diff line number Diff line
@@ -148,6 +148,4 @@ public class SAREFVersion extends SAREFNamedGraph implements SAREFProject { 
		return "SAREFVersion " + repository.getProject() + " " + versionName;

	}



	



}

src/main/java/fr/emse/gitlab/saref/managers/RepositoryManager.java

+13 −2
Original line number Diff line number Diff line
@@ -50,13 +50,15 @@ public class RepositoryManager extends SAREFErrorLogger { 
	private String currentBranch;

	private SAREFVersion currentVersion;

	private SAREFVersionName currentVersionName;

	private final boolean isTarget;



	public RepositoryManager(SAREFPipeline pipeline, Logger errorLogger, SAREFRepository repository) {

	public RepositoryManager(SAREFPipeline pipeline, Logger errorLogger, SAREFRepository repository, boolean isTarget) {

		super(pipeline, errorLogger);

		this.repository = repository;

		this.currentBranch = repository.getOriginalBranch();

		this.currentVersionName = repository.getOriginalVersion();

		this.currentVersion = repository.getVersion(currentVersionName);

		this.isTarget = isTarget;

	}

	

	public SAREFRepository getRepository() {
@@ -75,7 +77,16 @@ public class RepositoryManager extends SAREFErrorLogger { 
		return currentVersionName;

	}



	public boolean isTarget() {

		return isTarget;

	}

	

	public void checkoutVersion(SAREFVersionName versionName, boolean releaseOnly) throws SAREFPipelineException {

		if(isTarget) {

			// do not mess with branches for the target repository

			return;

		}

		

		SAREFVersion version = repository.getVersions().get(versionName);

		Ref ref = getRef(version, releaseOnly);

		if(ref == null) {
@@ -111,7 +122,7 @@ public class RepositoryManager extends SAREFErrorLogger { 




	public void resetCheckout() throws SAREFPipelineException {

		if(!repository.isClean()) {

		if(isTarget || !repository.isClean()) {

			return;

		}

		String originalBranch = repository.getOriginalBranch();

src/main/java/fr/emse/gitlab/saref/managers/SourcesManager.java

+9 −9
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class SourcesManager extends SAREFErrorLogger { 
			Logger repositoryLogger = pipeline.getLogger(getMessage(MESSAGE.versions, directory.getName()));

			RepositoryFactory repositoryFactory = new RepositoryFactory(pipeline, repositoryLogger, true);

			SAREFRepository repository = repositoryFactory.create(directory);

			targetRepositoryManager = new RepositoryManager(pipeline, repositoryLogger, repository);

			targetRepositoryManager = new RepositoryManager(pipeline, repositoryLogger, repository, true);

		}

	}
@@ -165,7 +165,7 @@ public class SourcesManager extends SAREFErrorLogger { 
					continue;

				}

			}

			RepositoryManager repositoryManager = new RepositoryManager(pipeline, repositoryLogger, repository);

			RepositoryManager repositoryManager = new RepositoryManager(pipeline, repositoryLogger, repository, false);

			sourcesManagers.put(project, repositoryManager);

		}

	}
@@ -305,13 +305,13 @@ public class SourcesManager extends SAREFErrorLogger { 
	

	public void resetCheckout() throws SAREFPipelineException {

		boolean hasErrors = false;

		if(targetRepositoryManager != null) {

			try {

				targetRepositoryManager.resetCheckout();

			} catch (SAREFPipelineException ex) {

				hasErrors = true;

			}

		}

//		if(targetRepositoryManager != null) {

//			try {

//				targetRepositoryManager.resetCheckout();

//			} catch (SAREFPipelineException ex) {

//				hasErrors = true;

//			}

//		}

		for (RepositoryManager repositoryManager : sourcesManagers.values()) {

			try {

				repositoryManager.resetCheckout();