use of org.apache.maven.scm.ScmFile in project maven-scm by apache.
the class BazaarAddConsumer method doConsume.
/**
* {@inheritDoc}
*/
public void doConsume(ScmFileStatus status, String trimmedLine) {
if (status != null && status == ScmFileStatus.ADDED) {
// Only include real files (not directories)
File tmpFile = new File(workingDir, trimmedLine);
if (!tmpFile.exists()) {
if (getLogger().isWarnEnabled()) {
getLogger().warn("Not a file: " + tmpFile + ". Ignored");
}
} else {
ScmFile scmFile = new ScmFile(trimmedLine, ScmFileStatus.ADDED);
if (getLogger().isInfoEnabled()) {
getLogger().info(scmFile.toString());
}
addedFiles.add(scmFile);
}
}
}
use of org.apache.maven.scm.ScmFile in project maven-scm by apache.
the class BazaarCheckInCommand method executeCheckInCommand.
/**
* {@inheritDoc}
*/
protected CheckInScmResult executeCheckInCommand(ScmProviderRepository repo, ScmFileSet fileSet, String message, ScmVersion version) throws ScmException {
if (version != null && StringUtils.isNotEmpty(version.getName())) {
throw new ScmException("This provider can't handle tags.");
}
// Get files that will be committed (if not specified in fileSet)
List<ScmFile> commitedFiles = new ArrayList<ScmFile>();
List<File> files = fileSet.getFileList();
if (files.isEmpty()) {
// Either commit all changes
BazaarStatusCommand statusCmd = new BazaarStatusCommand();
statusCmd.setLogger(getLogger());
StatusScmResult status = statusCmd.executeStatusCommand(repo, fileSet);
List<ScmFile> statusFiles = status.getChangedFiles();
for (ScmFile file : statusFiles) {
if (file.getStatus() == ScmFileStatus.ADDED || file.getStatus() == ScmFileStatus.DELETED || file.getStatus() == ScmFileStatus.MODIFIED) {
commitedFiles.add(new ScmFile(file.getPath(), ScmFileStatus.CHECKED_IN));
}
}
} else {
// Or commit spesific files
for (File file : files) {
commitedFiles.add(new ScmFile(file.getPath(), ScmFileStatus.CHECKED_IN));
}
}
// Commit to local branch
String[] commitCmd = new String[] { BazaarConstants.COMMIT_CMD, BazaarConstants.MESSAGE_OPTION, message };
commitCmd = BazaarUtils.expandCommandLine(commitCmd, fileSet);
ScmResult result = BazaarUtils.execute(new BazaarConsumer(getLogger()), getLogger(), fileSet.getBasedir(), commitCmd);
// Push to parent branch if any
BazaarScmProviderRepository repository = (BazaarScmProviderRepository) repo;
if (!repository.getURI().equals(fileSet.getBasedir().getAbsolutePath()) && repo.isPushChanges()) {
String[] pushCmd = new String[] { BazaarConstants.PUSH_CMD, BazaarConstants.NO_STRICT_OPTION, repository.getURI() };
result = BazaarUtils.execute(new BazaarConsumer(getLogger()), getLogger(), fileSet.getBasedir(), pushCmd);
}
return new CheckInScmResult(commitedFiles, result);
}
use of org.apache.maven.scm.ScmFile in project maven-scm by apache.
the class BazaarRemoveConsumer method doConsume.
/**
* {@inheritDoc}
*/
public void doConsume(ScmFileStatus status, String trimmedLine) {
if (status != null && status == ScmFileStatus.DELETED) {
// Only include real files (not directories)
File tmpFile = new File(workingDir, trimmedLine);
if (!tmpFile.exists()) {
if (getLogger().isWarnEnabled()) {
getLogger().warn("Not a file: " + tmpFile + ". Ignored");
}
} else {
ScmFile scmFile = new ScmFile(trimmedLine, ScmFileStatus.DELETED);
if (getLogger().isInfoEnabled()) {
getLogger().info(scmFile.toString());
}
removedFiles.add(scmFile);
}
}
}
use of org.apache.maven.scm.ScmFile in project maven-scm by apache.
the class JGitCheckOutCommand method executeCheckOutCommand.
/**
* For git, the given repository is a remote one. We have to clone it first if the working directory does not
* contain a git repo yet, otherwise we have to git-pull it.
* <p/>
* {@inheritDoc}
*/
protected CheckOutScmResult executeCheckOutCommand(ScmProviderRepository repo, ScmFileSet fileSet, ScmVersion version, boolean recursive, boolean shallow) throws ScmException {
GitScmProviderRepository repository = (GitScmProviderRepository) repo;
if (GitScmProviderRepository.PROTOCOL_FILE.equals(repository.getFetchInfo().getProtocol()) && repository.getFetchInfo().getPath().indexOf(fileSet.getBasedir().getPath()) >= 0) {
throw new ScmException("remote repository must not be the working directory");
}
Git git = null;
try {
ProgressMonitor monitor = JGitUtils.getMonitor(getLogger());
String branch = version != null ? version.getName() : null;
if (StringUtils.isBlank(branch)) {
branch = Constants.MASTER;
}
getLogger().debug("try checkout of branch: " + branch);
if (!fileSet.getBasedir().exists() || !(new File(fileSet.getBasedir(), ".git").exists())) {
if (fileSet.getBasedir().exists()) {
// git refuses to clone otherwise
fileSet.getBasedir().delete();
}
// FIXME only if windauze
WindowCacheConfig cfg = new WindowCacheConfig();
cfg.setPackedGitMMAP(false);
cfg.install();
// no git repo seems to exist, let's clone the original repo
CredentialsProvider credentials = JGitUtils.getCredentials((GitScmProviderRepository) repo);
getLogger().info("cloning [" + branch + "] to " + fileSet.getBasedir());
CloneCommand command = Git.cloneRepository().setURI(repository.getFetchUrl());
command.setCredentialsProvider(credentials).setBranch(branch).setDirectory(fileSet.getBasedir());
command.setProgressMonitor(monitor);
git = command.call();
}
JGitRemoteInfoCommand remoteInfoCommand = new JGitRemoteInfoCommand();
remoteInfoCommand.setLogger(getLogger());
RemoteInfoScmResult result = remoteInfoCommand.executeRemoteInfoCommand(repository, fileSet, null);
if (git == null) {
// deliberately not using JGitUtils.openRepo(), the caller told us exactly where to checkout
git = Git.open(fileSet.getBasedir());
}
if (fileSet.getBasedir().exists() && new File(fileSet.getBasedir(), ".git").exists() && result.getBranches().size() > 0) {
// git repo exists, so we must git-pull the changes
CredentialsProvider credentials = JGitUtils.prepareSession(getLogger(), git, repository);
if (version != null && StringUtils.isNotEmpty(version.getName()) && (version instanceof ScmTag)) {
// A tag will not be pulled but we only fetch all the commits from the upstream repo
// This is done because checking out a tag might not happen on the current branch
// but create a 'detached HEAD'.
// In fact, a tag in git may be in multiple branches. This occurs if
// you create a branch after the tag has been created
getLogger().debug("fetch...");
git.fetch().setCredentialsProvider(credentials).setProgressMonitor(monitor).call();
} else {
getLogger().debug("pull...");
git.pull().setCredentialsProvider(credentials).setProgressMonitor(monitor).call();
}
}
Set<String> localBranchNames = JGitBranchCommand.getShortLocalBranchNames(git);
if (version instanceof ScmTag) {
getLogger().info("checkout tag [" + branch + "] at " + fileSet.getBasedir());
git.checkout().setName(branch).call();
} else if (localBranchNames.contains(branch)) {
getLogger().info("checkout [" + branch + "] at " + fileSet.getBasedir());
git.checkout().setName(branch).call();
} else {
getLogger().info("checkout remote branch [" + branch + "] at " + fileSet.getBasedir());
git.checkout().setName(branch).setCreateBranch(true).setStartPoint(Constants.DEFAULT_REMOTE_NAME + "/" + branch).call();
}
RevWalk revWalk = new RevWalk(git.getRepository());
RevCommit commit = revWalk.parseCommit(git.getRepository().resolve(Constants.HEAD));
revWalk.release();
final TreeWalk walk = new TreeWalk(git.getRepository());
// drop the first empty tree, which we do not need here
walk.reset();
walk.setRecursive(true);
walk.addTree(commit.getTree());
List<ScmFile> listedFiles = new ArrayList<ScmFile>();
while (walk.next()) {
listedFiles.add(new ScmFile(walk.getPathString(), ScmFileStatus.CHECKED_OUT));
}
walk.release();
getLogger().debug("current branch: " + git.getRepository().getBranch());
return new CheckOutScmResult("checkout via JGit", listedFiles);
} catch (Exception e) {
throw new ScmException("JGit checkout failure!", e);
} finally {
JGitUtils.closeRepo(git);
}
}
use of org.apache.maven.scm.ScmFile in project maven-scm by apache.
the class JGitCheckInCommand method executeCheckInCommand.
/**
* {@inheritDoc}
*/
protected CheckInScmResult executeCheckInCommand(ScmProviderRepository repo, ScmFileSet fileSet, String message, ScmVersion version) throws ScmException {
Git git = null;
try {
File basedir = fileSet.getBasedir();
git = JGitUtils.openRepo(basedir);
boolean doCommit = false;
if (!fileSet.getFileList().isEmpty()) {
doCommit = JGitUtils.addAllFiles(git, fileSet).size() > 0;
} else {
// add all tracked files which are modified manually
Set<String> changeds = git.status().call().getModified();
if (changeds.isEmpty()) {
// warn there is nothing to add
getLogger().warn("there are no files to be added");
doCommit = false;
} else {
AddCommand add = git.add();
for (String changed : changeds) {
getLogger().debug("add manualy: " + changed);
add.addFilepattern(changed);
doCommit = true;
}
add.call();
}
}
List<ScmFile> checkedInFiles = Collections.emptyList();
if (doCommit) {
UserInfo author = getAuthor(repo, git);
UserInfo committer = getCommitter(repo, git);
CommitCommand command = git.commit().setMessage(message).setAuthor(author.name, author.email);
command.setCommitter(committer.name, committer.email);
RevCommit commitRev = command.call();
getLogger().info("commit done: " + commitRev.getShortMessage());
checkedInFiles = JGitUtils.getFilesInCommit(git.getRepository(), commitRev);
if (getLogger().isDebugEnabled()) {
for (ScmFile scmFile : checkedInFiles) {
getLogger().debug("in commit: " + scmFile);
}
}
}
if (repo.isPushChanges()) {
String branch = version != null ? version.getName() : null;
if (StringUtils.isBlank(branch)) {
branch = git.getRepository().getBranch();
}
RefSpec refSpec = new RefSpec(Constants.R_HEADS + branch + ":" + Constants.R_HEADS + branch);
getLogger().info("push changes to remote... " + refSpec.toString());
JGitUtils.push(getLogger(), git, (GitScmProviderRepository) repo, refSpec);
}
return new CheckInScmResult("JGit checkin", checkedInFiles);
} catch (Exception e) {
throw new ScmException("JGit checkin failure!", e);
} finally {
JGitUtils.closeRepo(git);
}
}
Aggregations