I want to retrieve commits from master first parent only using libgit2sharp, the equivalent command line statement is
git log --first-parent master --oneline
I know of the CommitFilter that I can use with QueryBy, like this
repo.Commits.QueryBy(new CommitFilter() { FirstParentOnly = true })
I'm getting commits on the branch that I'm currently on if I'm not on master. Can I limit the commit results to master, even when I'm on a different branch ?
I believe you are looking for the IncludeReachableFrom in the CommitFilter.
You might want to also use ExcludeReachableFrom at the same time to remove the commits from the branch that you are currently on...
using (var repo = new Repository("/Users/sushi/code/redux/playscript"))
{
var commitLog = repo.Commits.QueryBy(new CommitFilter() { FirstParentOnly = true, IncludeReachableFrom = "master" });
foreach (var commit in commitLog)
{
Console.WriteLine($"{commit.Sha}");
Console.ReadKey();
}
}
Related
I've got a large number of projects all in a single repository. I want to determine the volatility of all of these projects, i.e., when there was last a commit that affected each project. I've got a list of all of the project paths, and I'm trying to find the last commit for each one. My code looks like this:
public CommitInfo GetLastCommit(string path)
{
// resolve any \..\ and pathing weirdness
path = Path.GetDirectoryName(Path.GetFullPath(path));
var relativePath = path.Substring(BaseRepoPath.Length + 1).Replace("\\", "/");
if (!CommitCache.TryGetValue(relativePath, out CommitInfo result))
{
var options = new RepositoryOptions()
{
WorkingDirectoryPath = BaseRepoPath
};
using (var repo = new Repository(BaseRepoPath, options))
{
var filter = new CommitFilter()
{
IncludeReachableFrom = BranchName
};
var commit = repo.Commits.QueryBy(relativePath, filter).First().Commit;
result = new CommitInfo
{
When = commit.Author.When.DateTime,
Who = commit.Author.Name,
Message = commit.Message,
Files = commit.Tree.Select(x => x.Name).ToList()
};
repo.Dispose();
}
CommitCache.Add(relativePath, result);
}
return result;
}
This works, but the line where the commit is actually retrieved:
var commit = repo.Commits.QueryBy(relativePath, filter).First().Commit;
Can take up to eight minutes to complete. As far as I can tell, there's nothing especially complex about those folders...a sample of them reveals maybe twenty commits. I suspect I'm doing something wrong like loading the entire repo graph when I need something more specific, but I haven't been able to figure out a better way.
Thoughts?
Your requirement is producing following git command through lib2gitsharp package.
$ git log -1 -C "relativePath"
You can limit the size of commits with the help of Take(numberOfCommits) extension in lib2gitsharp. Please have a try with putting Take(1) before your First() like following;
var commit = repo.Commits.QueryBy(relativePath, filter).Take(1).First().Commit;
Hope this helps.
i have committed a file. now i want to revert the file to one of the previous commit as we do $git checkout sha filepath. i want to realize this command with libgit2sharp.
Can any body tell me the example code.
public void RevertToSpecificVersion()
{
using (var repo = new Repository(#"C:\Users\insiv1\source\GitRevert"))
{
foreach (LogEntry entry in repo.Commits.QueryBy("ArchitectureDocs.txt").ToList())
{
if (entry.Commit.Id.ToString().Equals("25c20851cfef37492fd008b969408dc730ae7b6b"))
{
Commands.Checkout(repo, entry.Commit);
}
}
}
}
I want to merge my develop in my master branch with LibGit2Sharp, but I can't find any examples on the GitHub wiki of LibGit2Sharp.
How can I do that?
Code snippet:
using (var repo = new Repository(repoDirectory))
{
var masterBranch = repo.Branches["master"];
var developBranch = repo.Branches["develop"];
Commands.Checkout(repo, masterBranch);
// merge dev in master
// tag master
Commands.Checkout(repo, developBranch);
// merge master in dev
}
I found a solution, I'm not sure if it could be done in another way, but I works.
using (var repo = new Repository(repoDirectory))
{
var masterBranch = repo.Branches["master"];
var developBranch = repo.Branches["develop"];
var merger = new Signature(AuthorName, AuthorEmail, DateTime.Now);
Commands.Checkout(repo, masterBranch);
repo.Merge(developBranch, merger, new MergeOptions());
repo.ApplyTag("v0.1");
Commands.Checkout(repo, developBranch);
repo.Merge(masterBranch, merger, new MergeOptions());
}
I'm using filter with QueryBy to get the commits that I'm interested in.
// Set the filter
CommitFilter filter = null;
filter = new CommitFilter()
{
IncludeReachableFrom = "85494c32921c136cc3381fc14a3a20e08012c514",
ExcludeReachableFrom = "63c8cb9ed585c0f3b79b6e2efc067e254910f875"
};
// Get the commits
repo.Commits.QueryBy(filter)
The QueryBy will not return the 63c8cb9ed585c0f3b79b6e2efc067e254910f875 commit, it will return the commits between the two.
Is there a way to have the 63c8cb9ed585c0f3b79b6e2efc067e254910f875 commit included as well ?
Maybe there another way available that I can use to get to the previous 63c8cb9ed585c0f3b79b6e2efc067e254910f875 from the commit that came after 63c8cb9ed585c0f3b79b6e2efc067e254910f875 and is returned by the query ?
You can use parents of the Commit as list of commit pointers for your ExcludeReachableFrom filter.
Example:
var filter = new CommitFilter
{
IncludeReachableFrom = "824201fcb8d4fa79b0aafa7c5aea86643cdd118a",
ExcludeReachableFrom = repo.Lookup<Commit>("bcd85da0e287a3b404d12f8b666888962f692076").Parents
};
var commits = repo.Commits.QueryBy(filter);
foreach (var commit in commits)
{
Console.WriteLine($"{commit.Sha}");
}
Output:
824201fcb8d4fa79b0aafa7c5aea86643cdd118a
934fa3892acb2a48f296b7afc66b07125fb6db91
da995a21dc3fd038173695776fc1a3f4ff64f6ab
a9ee8086e5647141087c90909cd847a5fa5f294e
6313ca4b41dfef4d6b779f34f7b4807917c31188
bcd85da0e287a3b404d12f8b666888962f692076
I'm trying to figure out how to get the commit log for a sub directory. According to this thread, it should work fine in libgit2sharp.
For testing I'm using a small repo, https://github.com/ornatwork/nugetpackages.git that has 8 total entries for the whole repository.
I cloned it locally in root c:/nugetpackages, from that folder I can do.
git log -- devbox
on the command line and I will get two commit entries for the /devbox sub directory as expected.
Sample Xunit test code to do the same using libgit2sharp
[Fact]
public void testSub()
{
// Extract the git commit history
using (var repo = new Repository(#"C:\nugetpackages"))
{
Trace.WriteLine("repo count=" + repo.Commits.Count());
// absolute path
IEnumerable<LogEntry> history = repo.Commits.QueryBy(#"C:\nugetpackages\devbox");
Trace.WriteLine("subdir count=" + history.Count());
}
}
I'm expecting count of 8 and 2, but this is what I get.
repo count=8
subdir count=0
What am I missing ?
Use a relative path from the repository's base diretory:
using (var repo = new Repository(#"/Users/sushi/code/sushi/Xamarin.Forms.Renderer.Tests"))
{
D.WriteLine("repo count=" + repo.Commits.Count());
IEnumerable<LogEntry> history = repo.Commits.QueryBy(#"AlarmSO");
D.WriteLine("subdir count=" + history.Count());
}
ref: FileHistoryFixture.cs
Update:
Follow up, is there a way to combine subdir with a filter, for example. CommitFilter filter = new CommitFilter(); filter.FirstParentOnly = true;
Not sure if this is what you are looking for... if not please in a new question, thanks.
using (var repo = new Repository(#"/Users/sushi/code/sushi/RealmJson"))
{
var subDir = "media";
var commits = repo.Commits.QueryBy(new CommitFilter { FirstParentOnly = true }).Where(
(Commit c) => c.Tree.Any(
(TreeEntry te) => te.Path.StartsWith(subDir, StringComparison.Ordinal)));
foreach (var commit in commits)
{
D.WriteLine($"{commit.Sha} : {commit.MessageShort}");
}
}