From 4fcac9d2cbdafb51e3ee9ca3b3da64fd86103174 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 26 Nov 2013 15:58:15 -0500
Subject: [PATCH] Remove artifact setting from manager dialog
---
src/main/java/com/gitblit/utils/JGitUtils.java | 596 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 485 insertions(+), 111 deletions(-)
diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java
index 1f2ae94..5584fb5 100644
--- a/src/main/java/com/gitblit/utils/JGitUtils.java
+++ b/src/main/java/com/gitblit/utils/JGitUtils.java
@@ -19,20 +19,24 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.text.DecimalFormat;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Pattern;
+import org.apache.commons.io.filefilter.TrueFileFilter;
import org.eclipse.jgit.api.CloneCommand;
import org.eclipse.jgit.api.FetchCommand;
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.TagCommand;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
@@ -55,6 +59,7 @@
import org.eclipse.jgit.lib.RefUpdate.Result;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryCache.FileKey;
+import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.lib.TreeFormatter;
import org.eclipse.jgit.revwalk.RevBlob;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -64,7 +69,7 @@
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.revwalk.filter.CommitTimeRevFilter;
import org.eclipse.jgit.revwalk.filter.RevFilter;
-import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.FetchResult;
import org.eclipse.jgit.transport.RefSpec;
@@ -76,7 +81,6 @@
import org.eclipse.jgit.treewalk.filter.PathSuffixFilter;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.eclipse.jgit.util.FS;
-import org.eclipse.jgit.util.io.DisabledOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -88,9 +92,9 @@
/**
* Collection of static methods for retrieving information from a repository.
- *
+ *
* @author James Moger
- *
+ *
*/
public class JGitUtils {
@@ -98,7 +102,7 @@
/**
* Log an error message and exception.
- *
+ *
* @param t
* @param repository
* if repository is not null it MUST be the {0} parameter in the
@@ -122,7 +126,7 @@
/**
* Returns the displayable name of the person in the form "Real Name <email
* address>". If the email address is empty, just "Real Name" is returned.
- *
+ *
* @param person
* @return "Real Name <email address>" or "Real Name"
*/
@@ -151,7 +155,7 @@
* Clone or Fetch a repository. If the local repository does not exist,
* clone is called. If the repository does exist, fetch is called. By
* default the clone/fetch retrieves the remote heads, tags, and notes.
- *
+ *
* @param repositoriesFolder
* @param name
* @param fromUrl
@@ -167,7 +171,7 @@
* Clone or Fetch a repository. If the local repository does not exist,
* clone is called. If the repository does exist, fetch is called. By
* default the clone/fetch retrieves the remote heads, tags, and notes.
- *
+ *
* @param repositoriesFolder
* @param name
* @param fromUrl
@@ -195,7 +199,7 @@
File folder = new File(repositoriesFolder, name);
if (folder.exists()) {
File gitDir = FileKey.resolve(new File(repositoriesFolder, name), FS.DETECTED);
- FileRepository repository = new FileRepository(gitDir);
+ Repository repository = new FileRepositoryBuilder().setGitDir(gitDir).build();
result.fetchResult = fetchRepository(credentialsProvider, repository);
repository.close();
} else {
@@ -208,7 +212,7 @@
clone.setCredentialsProvider(credentialsProvider);
}
Repository repository = clone.call().getRepository();
-
+
// Now we have to fetch because CloneCommand doesn't fetch
// refs/notes nor does it allow manual RefSpec.
result.createdRepository = true;
@@ -221,7 +225,7 @@
/**
* Fetch updates from the remote repository. If refSpecs is unspecifed,
* remote heads, tags, and notes are retrieved.
- *
+ *
* @param credentialsProvider
* @param repository
* @param refSpecs
@@ -250,23 +254,197 @@
/**
* Creates a bare repository.
- *
+ *
* @param repositoriesFolder
* @param name
* @return Repository
*/
public static Repository createRepository(File repositoriesFolder, String name) {
+ return createRepository(repositoriesFolder, name, "FALSE");
+ }
+
+ /**
+ * Creates a bare, shared repository.
+ *
+ * @param repositoriesFolder
+ * @param name
+ * @param shared
+ * the setting for the --shared option of "git init".
+ * @return Repository
+ */
+ public static Repository createRepository(File repositoriesFolder, String name, String shared) {
try {
- Git git = Git.init().setDirectory(new File(repositoriesFolder, name)).setBare(true).call();
- return git.getRepository();
- } catch (GitAPIException e) {
+ Repository repo = null;
+ try {
+ Git git = Git.init().setDirectory(new File(repositoriesFolder, name)).setBare(true).call();
+ repo = git.getRepository();
+ } catch (GitAPIException e) {
+ throw new RuntimeException(e);
+ }
+
+ GitConfigSharedRepository sharedRepository = new GitConfigSharedRepository(shared);
+ if (sharedRepository.isShared()) {
+ StoredConfig config = repo.getConfig();
+ config.setString("core", null, "sharedRepository", sharedRepository.getValue());
+ config.setBoolean("receive", null, "denyNonFastforwards", true);
+ config.save();
+
+ if (! JnaUtils.isWindows()) {
+ Iterator<File> iter = org.apache.commons.io.FileUtils.iterateFilesAndDirs(repo.getDirectory(),
+ TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
+ // Adjust permissions on file/directory
+ while (iter.hasNext()) {
+ adjustSharedPerm(iter.next(), sharedRepository);
+ }
+ }
+ }
+
+ return repo;
+ } catch (IOException e) {
throw new RuntimeException(e);
}
}
+ private enum GitConfigSharedRepositoryValue
+ {
+ UMASK("0", 0), FALSE("0", 0), OFF("0", 0), NO("0", 0),
+ GROUP("1", 0660), TRUE("1", 0660), ON("1", 0660), YES("1", 0660),
+ ALL("2", 0664), WORLD("2", 0664), EVERYBODY("2", 0664),
+ Oxxx(null, -1);
+
+ private String configValue;
+ private int permValue;
+ private GitConfigSharedRepositoryValue(String config, int perm) { configValue = config; permValue = perm; };
+
+ public String getConfigValue() { return configValue; };
+ public int getPerm() { return permValue; };
+
+ }
+
+ private static class GitConfigSharedRepository
+ {
+ private int intValue;
+ private GitConfigSharedRepositoryValue enumValue;
+
+ GitConfigSharedRepository(String s) {
+ if ( s == null || s.trim().isEmpty() ) {
+ enumValue = GitConfigSharedRepositoryValue.GROUP;
+ }
+ else {
+ try {
+ // Try one of the string values
+ enumValue = GitConfigSharedRepositoryValue.valueOf(s.trim().toUpperCase());
+ } catch (IllegalArgumentException iae) {
+ try {
+ // Try if this is an octal number
+ int i = Integer.parseInt(s, 8);
+ if ( (i & 0600) != 0600 ) {
+ String msg = String.format("Problem with core.sharedRepository filemode value (0%03o).\nThe owner of files must always have read and write permissions.", i);
+ throw new IllegalArgumentException(msg);
+ }
+ intValue = i & 0666;
+ enumValue = GitConfigSharedRepositoryValue.Oxxx;
+ } catch (NumberFormatException nfe) {
+ throw new IllegalArgumentException("Bad configuration value for 'shared': '" + s + "'");
+ }
+ }
+ }
+ }
+
+ String getValue() {
+ if ( enumValue == GitConfigSharedRepositoryValue.Oxxx ) {
+ if (intValue == 0) return "0";
+ return String.format("0%o", intValue);
+ }
+ return enumValue.getConfigValue();
+ }
+
+ int getPerm() {
+ if ( enumValue == GitConfigSharedRepositoryValue.Oxxx ) return intValue;
+ return enumValue.getPerm();
+ }
+
+ boolean isCustom() {
+ return enumValue == GitConfigSharedRepositoryValue.Oxxx;
+ }
+
+ boolean isShared() {
+ return (enumValue.getPerm() > 0) || enumValue == GitConfigSharedRepositoryValue.Oxxx;
+ }
+ }
+
+
+ /**
+ * Adjust file permissions of a file/directory for shared repositories
+ *
+ * @param path
+ * File that should get its permissions changed.
+ * @param configShared
+ * Configuration string value for the shared mode.
+ * @return Upon successful completion, a value of 0 is returned. Otherwise, a value of -1 is returned.
+ */
+ public static int adjustSharedPerm(File path, String configShared) {
+ return adjustSharedPerm(path, new GitConfigSharedRepository(configShared));
+ }
+
+
+ /**
+ * Adjust file permissions of a file/directory for shared repositories
+ *
+ * @param path
+ * File that should get its permissions changed.
+ * @param configShared
+ * Configuration setting for the shared mode.
+ * @return Upon successful completion, a value of 0 is returned. Otherwise, a value of -1 is returned.
+ */
+ public static int adjustSharedPerm(File path, GitConfigSharedRepository configShared) {
+ if (! configShared.isShared()) return 0;
+ if (! path.exists()) return -1;
+
+ int perm = configShared.getPerm();
+ JnaUtils.Filestat stat = JnaUtils.getFilestat(path);
+ if (stat == null) return -1;
+ int mode = stat.mode;
+ if (mode < 0) return -1;
+
+ // Now, here is the kicker: Under Linux, chmod'ing a sgid file whose guid is different from the process'
+ // effective guid will reset the sgid flag of the file. Since there is no way to get the sgid flag back in
+ // that case, we decide to rather not touch is and getting the right permissions will have to be achieved
+ // in a different way, e.g. by using an appropriate umask for the Gitblit process.
+ if (System.getProperty("os.name").toLowerCase().startsWith("linux")) {
+ if ( ((mode & (JnaUtils.S_ISGID | JnaUtils.S_ISUID)) != 0)
+ && stat.gid != JnaUtils.getegid() ) {
+ LOGGER.debug("Not adjusting permissions to prevent clearing suid/sgid bits for '" + path + "'" );
+ return 0;
+ }
+ }
+
+ // If the owner has no write access, delete it from group and other, too.
+ if ((mode & JnaUtils.S_IWUSR) == 0) perm &= ~0222;
+ // If the owner has execute access, set it for all blocks that have read access.
+ if ((mode & JnaUtils.S_IXUSR) == JnaUtils.S_IXUSR) perm |= (perm & 0444) >> 2;
+
+ if (configShared.isCustom()) {
+ // Use the custom value for access permissions.
+ mode = (mode & ~0777) | perm;
+ }
+ else {
+ // Just add necessary bits to existing permissions.
+ mode |= perm;
+ }
+
+ if (path.isDirectory()) {
+ mode |= (mode & 0444) >> 2;
+ mode |= JnaUtils.S_ISGID;
+ }
+
+ return JnaUtils.setFilemode(path, mode);
+ }
+
+
/**
* Returns a list of repository names in the specified folder.
- *
+ *
* @param repositoriesFolder
* @param onlyBare
* if true, only bare repositories repositories are listed. If
@@ -294,12 +472,13 @@
list.addAll(getRepositoryList(repositoriesFolder.getAbsolutePath(), repositoriesFolder,
onlyBare, searchSubfolders, depth, patterns));
StringUtils.sortRepositorynames(list);
+ list.remove(".git"); // issue-256
return list;
}
/**
* Recursive function to find git repositories.
- *
+ *
* @param basePath
* basePath is stripped from the repository name as repositories
* are relative to this path
@@ -322,7 +501,7 @@
if (depth == 0) {
return list;
}
-
+
int nextDepth = (depth == -1) ? -1 : depth - 1;
for (File file : searchFolder.listFiles()) {
if (file.isDirectory()) {
@@ -367,7 +546,7 @@
/**
* Returns the first commit on a branch. If the repository does not exist or
* is empty, null is returned.
- *
+ *
* @param repository
* @param branch
* if unspecified, HEAD is assumed.
@@ -403,7 +582,7 @@
* Returns the date of the first commit on a branch. If the repository does
* not exist, Date(0) is returned. If the repository does exist bit is
* empty, the last modified date of the repository folder is returned.
- *
+ *
* @param repository
* @param branch
* if unspecified, HEAD is assumed.
@@ -424,7 +603,7 @@
/**
* Determine if a repository has any commits. This is determined by checking
* the for loose and packed objects.
- *
+ *
* @param repository
* @return true if the repository has commits
*/
@@ -437,42 +616,59 @@
}
/**
- * Returns the date of the most recent commit on a branch. If the repository
- * does not exist Date(0) is returned. If it does exist but is empty, the
- * last modified date of the repository folder is returned.
- *
- * @param repository
- * @return
+ * Encapsulates the result of cloning or pulling from a repository.
*/
- public static Date getLastChange(Repository repository) {
+ public static class LastChange {
+ public Date when;
+ public String who;
+
+ LastChange() {
+ when = new Date(0);
+ }
+
+ LastChange(long lastModified) {
+ this.when = new Date(lastModified);
+ }
+ }
+
+ /**
+ * Returns the date and author of the most recent commit on a branch. If the
+ * repository does not exist Date(0) is returned. If it does exist but is
+ * empty, the last modified date of the repository folder is returned.
+ *
+ * @param repository
+ * @return a LastChange object
+ */
+ public static LastChange getLastChange(Repository repository) {
if (!hasCommits(repository)) {
// null repository
if (repository == null) {
- return new Date(0);
+ return new LastChange();
}
// fresh repository
- return new Date(repository.getDirectory().lastModified());
+ return new LastChange(repository.getDirectory().lastModified());
}
List<RefModel> branchModels = getLocalBranches(repository, true, -1);
if (branchModels.size() > 0) {
// find most recent branch update
- Date lastChange = new Date(0);
+ LastChange lastChange = new LastChange();
for (RefModel branchModel : branchModels) {
- if (branchModel.getDate().after(lastChange)) {
- lastChange = branchModel.getDate();
+ if (branchModel.getDate().after(lastChange.when)) {
+ lastChange.when = branchModel.getDate();
+ lastChange.who = branchModel.getAuthorIdent().getName();
}
}
return lastChange;
}
-
+
// default to the repository folder modification date
- return new Date(repository.getDirectory().lastModified());
+ return new LastChange(repository.getDirectory().lastModified());
}
/**
* Retrieves a Java Date from a Git commit.
- *
+ *
* @param commit
* @return date of the commit or Date(0) if the commit is null
*/
@@ -485,7 +681,7 @@
/**
* Retrieves a Java Date from a Git commit.
- *
+ *
* @param commit
* @return date of the commit or Date(0) if the commit is null
*/
@@ -499,7 +695,7 @@
/**
* Returns the specified commit from the repository. If the repository does
* not exist or is empty, null is returned.
- *
+ *
* @param repository
* @param objectId
* if unspecified, HEAD is assumed.
@@ -530,7 +726,7 @@
/**
* Retrieves the raw byte content of a file in the specified tree.
- *
+ *
* @param repository
* @param tree
* if null, the RevTree from HEAD is assumed.
@@ -545,6 +741,8 @@
try {
if (tree == null) {
ObjectId object = getDefaultBranch(repository);
+ if (object == null)
+ return null;
RevCommit commit = rw.parseCommit(object);
tree = commit.getTree();
}
@@ -584,7 +782,7 @@
/**
* Returns the UTF-8 string content of a file in the specified tree.
- *
+ *
* @param repository
* @param tree
* if null, the RevTree from HEAD is assumed.
@@ -602,7 +800,7 @@
/**
* Gets the raw byte content of the specified blob object.
- *
+ *
* @param repository
* @param objectId
* @return byte [] blob content
@@ -633,7 +831,7 @@
/**
* Gets the UTF-8 string content of the blob specified by objectId.
- *
+ *
* @param repository
* @param objectId
* @param charsets optional
@@ -651,7 +849,7 @@
* Returns the list of files in the specified folder at the specified
* commit. If the repository does not exist or is empty, an empty list is
* returned.
- *
+ *
* @param repository
* @param path
* if unspecified, root folder is assumed.
@@ -706,13 +904,28 @@
/**
* Returns the list of files changed in a specified commit. If the
* repository does not exist or is empty, an empty list is returned.
- *
+ *
* @param repository
* @param commit
* if null, HEAD is assumed.
* @return list of files changed in a commit
*/
public static List<PathChangeModel> getFilesInCommit(Repository repository, RevCommit commit) {
+ return getFilesInCommit(repository, commit, true);
+ }
+
+ /**
+ * Returns the list of files changed in a specified commit. If the
+ * repository does not exist or is empty, an empty list is returned.
+ *
+ * @param repository
+ * @param commit
+ * if null, HEAD is assumed.
+ * @param calculateDiffStat
+ * if true, each PathChangeModel will have insertions/deletions
+ * @return list of files changed in a commit
+ */
+ public static List<PathChangeModel> getFilesInCommit(Repository repository, RevCommit commit, boolean calculateDiffStat) {
List<PathChangeModel> list = new ArrayList<PathChangeModel>();
if (!hasCommits(repository)) {
return list;
@@ -737,26 +950,25 @@
tw.release();
} else {
RevCommit parent = rw.parseCommit(commit.getParent(0).getId());
- DiffFormatter df = new DiffFormatter(DisabledOutputStream.INSTANCE);
+ DiffStatFormatter df = new DiffStatFormatter(commit.getName());
df.setRepository(repository);
df.setDiffComparator(RawTextComparator.DEFAULT);
df.setDetectRenames(true);
List<DiffEntry> diffs = df.scan(parent.getTree(), commit.getTree());
for (DiffEntry diff : diffs) {
- String objectId = diff.getNewId().name();
- if (diff.getChangeType().equals(ChangeType.DELETE)) {
- list.add(new PathChangeModel(diff.getOldPath(), diff.getOldPath(), 0, diff
- .getNewMode().getBits(), objectId, commit.getId().getName(), diff
- .getChangeType()));
- } else if (diff.getChangeType().equals(ChangeType.RENAME)) {
- list.add(new PathChangeModel(diff.getOldPath(), diff.getNewPath(), 0, diff
- .getNewMode().getBits(), objectId, commit.getId().getName(), diff
- .getChangeType()));
- } else {
- list.add(new PathChangeModel(diff.getNewPath(), diff.getNewPath(), 0, diff
- .getNewMode().getBits(), objectId, commit.getId().getName(), diff
- .getChangeType()));
+ // create the path change model
+ PathChangeModel pcm = PathChangeModel.from(diff, commit.getName());
+
+ if (calculateDiffStat) {
+ // update file diffstats
+ df.format(diff);
+ PathChangeModel pathStat = df.getDiffStat().getPath(pcm.path);
+ if (pathStat != null) {
+ pcm.insertions = pathStat.insertions;
+ pcm.deletions = pathStat.deletions;
+ }
}
+ list.add(pcm);
}
}
} catch (Throwable t) {
@@ -768,10 +980,43 @@
}
/**
+ * Returns the list of files changed in a specified commit. If the
+ * repository does not exist or is empty, an empty list is returned.
+ *
+ * @param repository
+ * @param startCommit
+ * earliest commit
+ * @param endCommit
+ * most recent commit. if null, HEAD is assumed.
+ * @return list of files changed in a commit range
+ */
+ public static List<PathChangeModel> getFilesInRange(Repository repository, RevCommit startCommit, RevCommit endCommit) {
+ List<PathChangeModel> list = new ArrayList<PathChangeModel>();
+ if (!hasCommits(repository)) {
+ return list;
+ }
+ try {
+ DiffFormatter df = new DiffFormatter(null);
+ df.setRepository(repository);
+ df.setDiffComparator(RawTextComparator.DEFAULT);
+ df.setDetectRenames(true);
+
+ List<DiffEntry> diffEntries = df.scan(startCommit.getTree(), endCommit.getTree());
+ for (DiffEntry diff : diffEntries) {
+ PathChangeModel pcm = PathChangeModel.from(diff, null);
+ list.add(pcm);
+ }
+ Collections.sort(list);
+ } catch (Throwable t) {
+ error(t, repository, "{0} failed to determine files in range {1}..{2}!", startCommit, endCommit);
+ }
+ return list;
+ }
+ /**
* Returns the list of files in the repository on the default branch that
* match one of the specified extensions. This is a CASE-SENSITIVE search.
* If the repository does not exist or is empty, an empty list is returned.
- *
+ *
* @param repository
* @param extensions
* @return list of files in repository with a matching extension
@@ -784,7 +1029,7 @@
* Returns the list of files in the repository in the specified commit that
* match one of the specified extensions. This is a CASE-SENSITIVE search.
* If the repository does not exist or is empty, an empty list is returned.
- *
+ *
* @param repository
* @param extensions
* @param objectId
@@ -804,10 +1049,10 @@
List<TreeFilter> suffixFilters = new ArrayList<TreeFilter>();
for (String extension : extensions) {
if (extension.charAt(0) == '.') {
- suffixFilters.add(PathSuffixFilter.create("\\" + extension));
+ suffixFilters.add(PathSuffixFilter.create(extension));
} else {
// escape the . since this is a regexp filter
- suffixFilters.add(PathSuffixFilter.create("\\." + extension));
+ suffixFilters.add(PathSuffixFilter.create("." + extension));
}
}
TreeFilter filter;
@@ -833,7 +1078,7 @@
/**
* Returns a path model of the current file in the treewalk.
- *
+ *
* @param tw
* @param basePath
* @param commit
@@ -861,7 +1106,7 @@
/**
* Returns a permissions representation of the mode bits.
- *
+ *
* @param mode
* @return string representation of the mode bits
*/
@@ -883,7 +1128,7 @@
/**
* Returns a list of commits since the minimum date starting from the
* specified object id.
- *
+ *
* @param repository
* @param objectId
* if unspecified, HEAD is assumed.
@@ -921,7 +1166,7 @@
/**
* Returns a list of commits starting from HEAD and working backwards.
- *
+ *
* @param repository
* @param maxCount
* if < 0, all commits for the repository are returned.
@@ -936,7 +1181,7 @@
* offset and maxCount for paging. This is similar to LIMIT n OFFSET p in
* SQL. If the repository does not exist or is empty, an empty list is
* returned.
- *
+ *
* @param repository
* @param objectId
* if unspecified, HEAD is assumed.
@@ -955,7 +1200,7 @@
* repository. Caller may specify ending revision with objectId. Caller may
* specify offset and maxCount to achieve pagination of results. If the
* repository does not exist or is empty, an empty list is returned.
- *
+ *
* @param repository
* @param objectId
* if unspecified, HEAD is assumed.
@@ -978,18 +1223,30 @@
}
try {
// resolve branch
- ObjectId branchObject;
+ ObjectId startRange = null;
+ ObjectId endRange;
if (StringUtils.isEmpty(objectId)) {
- branchObject = getDefaultBranch(repository);
+ endRange = getDefaultBranch(repository);
} else {
- branchObject = repository.resolve(objectId);
+ if( objectId.contains("..") ) {
+ // range expression
+ String[] parts = objectId.split("\\.\\.");
+ startRange = repository.resolve(parts[0]);
+ endRange = repository.resolve(parts[1]);
+ } else {
+ // objectid
+ endRange= repository.resolve(objectId);
+ }
}
- if (branchObject == null) {
+ if (endRange == null) {
return list;
}
RevWalk rw = new RevWalk(repository);
- rw.markStart(rw.parseCommit(branchObject));
+ rw.markStart(rw.parseCommit(endRange));
+ if (startRange != null) {
+ rw.markUninteresting(rw.parseCommit(startRange));
+ }
if (!StringUtils.isEmpty(path)) {
TreeFilter filter = AndTreeFilter.create(
PathFilterGroup.createFromStrings(Collections.singleton(path)),
@@ -1027,7 +1284,7 @@
* Returns a list of commits for the repository within the range specified
* by startRangeId and endRangeId. If the repository does not exist or is
* empty, an empty list is returned.
- *
+ *
* @param repository
* @param startRangeId
* the first commit (not included in results)
@@ -1072,7 +1329,7 @@
* Search results require a specified SearchType of AUTHOR, COMMITTER, or
* COMMIT. Results may be paginated using offset and maxCount. If the
* repository does not exist or is empty, an empty list is returned.
- *
+ *
* @param repository
* @param objectId
* if unspecified, HEAD is assumed.
@@ -1086,14 +1343,17 @@
*/
public static List<RevCommit> searchRevlogs(Repository repository, String objectId,
String value, final com.gitblit.Constants.SearchType type, int offset, int maxCount) {
- final String lcValue = value.toLowerCase();
List<RevCommit> list = new ArrayList<RevCommit>();
+ if (StringUtils.isEmpty(value)) {
+ return list;
+ }
if (maxCount == 0) {
return list;
}
if (!hasCommits(repository)) {
return list;
}
+ final String lcValue = value.toLowerCase();
try {
// resolve branch
ObjectId branchObject;
@@ -1169,7 +1429,7 @@
* Returns the default branch to use for a repository. Normally returns
* whatever branch HEAD points to, but if HEAD points to nothing it returns
* the most recently updated branch.
- *
+ *
* @param repository
* @return the objectid of a branch
* @throws Exception
@@ -1232,7 +1492,7 @@
}
return target;
}
-
+
/**
* Sets the symbolic ref HEAD to the specified target ref. The
* HEAD will be detached if the target ref is not a branch.
@@ -1259,7 +1519,7 @@
case FORCED:
case NO_CHANGE:
case FAST_FORWARD:
- return true;
+ return true;
default:
LOGGER.error(MessageFormat.format("{0} HEAD update to {1} returned result {2}",
repository.getDirectory().getAbsolutePath(), targetRef, result));
@@ -1269,7 +1529,7 @@
}
return false;
}
-
+
/**
* Sets the local branch ref to point to the specified commit id.
*
@@ -1280,7 +1540,7 @@
*/
public static boolean setBranchRef(Repository repository, String branch, String commitId) {
String branchName = branch;
- if (!branchName.startsWith(Constants.R_HEADS)) {
+ if (!branchName.startsWith(Constants.R_REFS)) {
branchName = Constants.R_HEADS + branch;
}
@@ -1294,7 +1554,7 @@
case FORCED:
case NO_CHANGE:
case FAST_FORWARD:
- return true;
+ return true;
default:
LOGGER.error(MessageFormat.format("{0} {1} update to {2} returned result {3}",
repository.getDirectory().getAbsolutePath(), branchName, commitId, result));
@@ -1304,10 +1564,10 @@
}
return false;
}
-
+
/**
* Deletes the specified branch ref.
- *
+ *
* @param repository
* @param branch
* @return true if successful
@@ -1327,7 +1587,7 @@
case FORCED:
case NO_CHANGE:
case FAST_FORWARD:
- return true;
+ return true;
default:
LOGGER.error(MessageFormat.format("{0} failed to delete to {1} returned result {2}",
repository.getDirectory().getAbsolutePath(), branchName, result));
@@ -1337,7 +1597,7 @@
}
return false;
}
-
+
/**
* Get the full branch and tag ref names for any potential HEAD targets.
*
@@ -1358,17 +1618,17 @@
/**
* Returns all refs grouped by their associated object id.
- *
+ *
* @param repository
* @return all refs grouped by their referenced object id
*/
public static Map<ObjectId, List<RefModel>> getAllRefs(Repository repository) {
return getAllRefs(repository, true);
}
-
+
/**
* Returns all refs grouped by their associated object id.
- *
+ *
* @param repository
* @param includeRemoteRefs
* @return all refs grouped by their referenced object id
@@ -1392,7 +1652,7 @@
/**
* Returns the list of tags in the repository. If repository does not exist
* or is empty, an empty list is returned.
- *
+ *
* @param repository
* @param fullName
* if true, /refs/tags/yadayadayada is returned. If false,
@@ -1408,7 +1668,7 @@
/**
* Returns the list of local branches in the repository. If repository does
* not exist or is empty, an empty list is returned.
- *
+ *
* @param repository
* @param fullName
* if true, /refs/heads/yadayadayada is returned. If false,
@@ -1425,7 +1685,7 @@
/**
* Returns the list of remote branches in the repository. If repository does
* not exist or is empty, an empty list is returned.
- *
+ *
* @param repository
* @param fullName
* if true, /refs/remotes/yadayadayada is returned. If false,
@@ -1442,7 +1702,7 @@
/**
* Returns the list of note branches. If repository does not exist or is
* empty, an empty list is returned.
- *
+ *
* @param repository
* @param fullName
* if true, /refs/notes/yadayadayada is returned. If false,
@@ -1455,11 +1715,11 @@
int maxCount) {
return getRefs(repository, Constants.R_NOTES, fullName, maxCount);
}
-
+
/**
- * Returns the list of refs in the specified base ref. If repository does
+ * Returns the list of refs in the specified base ref. If repository does
* not exist or is empty, an empty list is returned.
- *
+ *
* @param repository
* @param fullName
* if true, /refs/yadayadayada is returned. If false,
@@ -1473,7 +1733,7 @@
/**
* Returns a list of references in the repository matching "refs". If the
* repository is null or empty, an empty list is returned.
- *
+ *
* @param repository
* @param refs
* if unspecified, all refs are returned
@@ -1520,7 +1780,7 @@
/**
* Returns a RefModel for the gh-pages branch in the repository. If the
* branch can not be found, null is returned.
- *
+ *
* @param repository
* @return a refmodel for the gh-pages branch or null
*/
@@ -1531,7 +1791,7 @@
/**
* Returns a RefModel for a specific branch name in the repository. If the
* branch can not be found, null is returned.
- *
+ *
* @param repository
* @return a refmodel for the branch or null
*/
@@ -1560,10 +1820,10 @@
}
return branch;
}
-
+
/**
* Returns the list of submodules for this repository.
- *
+ *
* @param repository
* @param commit
* @return list of submodules
@@ -1572,10 +1832,10 @@
RevCommit commit = getCommit(repository, commitId);
return getSubmodules(repository, commit.getTree());
}
-
+
/**
* Returns the list of submodules for this repository.
- *
+ *
* @param repository
* @param commit
* @return list of submodules
@@ -1598,11 +1858,11 @@
}
return list;
}
-
+
/**
* Returns the submodule definition for the specified path at the specified
* commit. If no module is defined for the path, null is returned.
- *
+ *
* @param repository
* @param commit
* @param path
@@ -1616,7 +1876,7 @@
}
return null;
}
-
+
public static String getSubmoduleCommitId(Repository repository, String path, RevCommit commit) {
String commitId = null;
RevWalk rw = new RevWalk(repository);
@@ -1647,7 +1907,7 @@
* Returns the list of notes entered about the commit from the refs/notes
* namespace. If the repository does not exist or is empty, an empty list is
* returned.
- *
+ *
* @param repository
* @param commit
* @return list of notes
@@ -1671,7 +1931,7 @@
list.add(gitNote);
continue;
}
-
+
// folder structure
StringBuilder sb = new StringBuilder(commit.getName());
sb.insert(2, '/');
@@ -1689,8 +1949,72 @@
}
/**
+ * this method creates an incremental revision number as a tag according to
+ * the amount of already existing tags, which start with a defined prefix.
+ *
+ * @param repository
+ * @param objectId
+ * @param tagger
+ * @param prefix
+ * @param intPattern
+ * @param message
+ * @return true if operation was successful, otherwise false
+ */
+ public static boolean createIncrementalRevisionTag(Repository repository,
+ String objectId, PersonIdent tagger, String prefix, String intPattern, String message) {
+ boolean result = false;
+ Iterator<Entry<String, Ref>> iterator = repository.getTags().entrySet().iterator();
+ long lastRev = 0;
+ while (iterator.hasNext()) {
+ Entry<String, Ref> entry = iterator.next();
+ if (entry.getKey().startsWith(prefix)) {
+ try {
+ long val = Long.parseLong(entry.getKey().substring(prefix.length()));
+ if (val > lastRev) {
+ lastRev = val;
+ }
+ } catch (Exception e) {
+ // this tag is NOT an incremental revision tag
+ }
+ }
+ }
+ DecimalFormat df = new DecimalFormat(intPattern);
+ result = createTag(repository, objectId, tagger, prefix + df.format((lastRev + 1)), message);
+ return result;
+ }
+
+ /**
+ * creates a tag in a repository
+ *
+ * @param repository
+ * @param objectId, the ref the tag points towards
+ * @param tagger, the person tagging the object
+ * @param tag, the string label
+ * @param message, the string message
+ * @return boolean, true if operation was successful, otherwise false
+ */
+ public static boolean createTag(Repository repository, String objectId, PersonIdent tagger, String tag, String message) {
+ try {
+ Git gitClient = Git.open(repository.getDirectory());
+ TagCommand tagCommand = gitClient.tag();
+ tagCommand.setTagger(tagger);
+ tagCommand.setMessage(message);
+ if (objectId != null) {
+ RevObject revObj = getCommit(repository, objectId);
+ tagCommand.setObjectId(revObj);
+ }
+ tagCommand.setName(tag);
+ Ref call = tagCommand.call();
+ return call != null ? true : false;
+ } catch (Exception e) {
+ error(e, repository, "Failed to create tag {1} in repository {0}", objectId, tag);
+ }
+ return false;
+ }
+
+ /**
* Create an orphaned branch in a repository.
- *
+ *
* @param repository
* @param branchName
* @param author
@@ -1758,10 +2082,10 @@
}
return success;
}
-
+
/**
* Reads the sparkleshare id, if present, from the repository.
- *
+ *
* @param repository
* @return an id or null
*/
@@ -1772,4 +2096,54 @@
}
return StringUtils.decodeString(content);
}
+
+ /**
+ * Automatic repair of (some) invalid refspecs. These are the result of a
+ * bug in JGit cloning where a double forward-slash was injected. :(
+ *
+ * @param repository
+ * @return true, if the refspecs were repaired
+ */
+ public static boolean repairFetchSpecs(Repository repository) {
+ StoredConfig rc = repository.getConfig();
+
+ // auto-repair broken fetch ref specs
+ for (String name : rc.getSubsections("remote")) {
+ int invalidSpecs = 0;
+ int repairedSpecs = 0;
+ List<String> specs = new ArrayList<String>();
+ for (String spec : rc.getStringList("remote", name, "fetch")) {
+ try {
+ RefSpec rs = new RefSpec(spec);
+ // valid spec
+ specs.add(spec);
+ } catch (IllegalArgumentException e) {
+ // invalid spec
+ invalidSpecs++;
+ if (spec.contains("//")) {
+ // auto-repair this known spec bug
+ spec = spec.replace("//", "/");
+ specs.add(spec);
+ repairedSpecs++;
+ }
+ }
+ }
+
+ if (invalidSpecs == repairedSpecs && repairedSpecs > 0) {
+ // the fetch specs were automatically repaired
+ rc.setStringList("remote", name, "fetch", specs);
+ try {
+ rc.save();
+ rc.load();
+ LOGGER.debug("repaired {} invalid fetch refspecs for {}", repairedSpecs, repository.getDirectory());
+ return true;
+ } catch (Exception e) {
+ LOGGER.error(null, e);
+ }
+ } else if (invalidSpecs > 0) {
+ LOGGER.error("mirror executor found {} invalid fetch refspecs for {}", invalidSpecs, repository.getDirectory());
+ }
+ }
+ return false;
+ }
}
--
Gitblit v1.9.1