如何查找具有特定父级的所有提交?

时间:2012-05-10 18:16:30

标签: git libgit2 libgit2sharp

如何在存储库中找到具有特定父级的所有提交?

例如,如果我有一个提交A,我想找到与A共享父项的所有其他提交。在LibGit2Sharp中执行此操作的最有效,即高效但正确的方法是什么?

1 个答案:

答案 0 :(得分:3)

这是一个棘手的问题;-)

Git对象允许检索提交的父级。但是,找到提交的孩子并不容易。

但是,以下代码将部分解决此问题。我们的想法是从存储库的所有引用(头部,标签......)中执行git log,并且在此过程中,选择承载具有所请求SHA的父级的每个提交。

由于漫步是从最近提交的祖先路径完成的,所以如果您在具有非常大的历史和许多分支的存储库中搜索非常早期提交的子节点,则可能需要一些时间。

[Fact]
public void CanRetrieveChildrenOfASpecificCommit()
{
    TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoPath);
    using (var repo = new Repository(path.RepositoryPath))
    {
        const string parentSha = "5b5b025afb0b4c913b4c338a42934a3863bf3644";

        var filter = new Filter
                         {
                             /* Revwalk from all the refs (git log --all) ... */
                             Since = repo.Refs, 

                             /* ... and stop when the parent is reached */
                             Until = parentSha
                         };

        var commits = repo.Commits.QueryBy(filter);

        var children = from c in commits
                    from p in c.Parents
                    let pId = p.Id
                    where pId.Sha == parentSha
                    select c;

        var expectedChildren = new[] { "c47800c7266a2be04c571c04d5a6614691ea99bd", 
                                        "4a202b346bb0fb0db7eff3cffeb3c70babbd2045" };

        Assert.Equal(expectedChildren, children.Select(c => c.Id.Sha));
    }
}

限制:

  • 这不会检索已经重写的提交(例如通过修改或rebase),因为LibGit2Sharp没有公开访问reflog的方法(还)
  • 此提案无法检索到无法访问(悬空)提交。

测试存储库:

正在查询的存储库的内容显示在下面

$ git log --all --graph
* commit 4c062a6361ae6959e06292c1fa5e2822d9c96345
| Author: gor <gorbach.alexey@gmail.com>
| Date:   Thu Apr 14 18:44:16 2011 +0300
|
|     directory was added
|
*   commit be3563ae3f795b2b4353bcce3a527ad0a4f7f644
|\  Merge: 9fd738e c47800c
| | Author: Scott Chacon <schacon@gmail.com>
| | Date:   Tue May 25 11:58:27 2010 -0700
| |
| |     Merge branch 'br2'
| |
| | * commit e90810b8df3e80c413d903f631643c716887138d
| | | Author: Vicent Marti <tanoku@gmail.com>
| | | Date:   Thu Aug 5 18:42:20 2010 +0200
| | |
| | |     Test commit 2
| | |
| | * commit 6dcf9bf7541ee10456529833502442f385010c3d
| |   Author: Vicent Marti <tanoku@gmail.com>
| |   Date:   Thu Aug 5 18:41:33 2010 +0200
| |
| |       Test commit 1
| |
| | *   commit a4a7dce85cf63874e984719f4fdd239f5145052f
| | |\  Merge: c47800c 9fd738e
| |/ /  Author: Scott Chacon <schacon@gmail.com>
| | /   Date:   Tue May 25 12:00:23 2010 -0700
| |/
|/|         Merge branch 'master' into br2
| |
* | commit 9fd738e8f7967c078dceed8190330fc8648ee56a
| | Author: Scott Chacon <schacon@gmail.com>
| | Date:   Mon May 24 10:19:19 2010 -0700
| |
| |     a fourth commit
| |
* | commit 4a202b346bb0fb0db7eff3cffeb3c70babbd2045
| | Author: Scott Chacon <schacon@gmail.com>
| | Date:   Mon May 24 10:19:04 2010 -0700
| |
| |     a third commit
| |
| * commit c47800c7266a2be04c571c04d5a6614691ea99bd
|/  Author: Scott Chacon <schacon@gmail.com>
|   Date:   Tue May 25 11:58:14 2010 -0700
|
|       branch commit one
|
* commit 5b5b025afb0b4c913b4c338a42934a3863bf3644
| Author: Scott Chacon <schacon@gmail.com>
| Date:   Tue May 11 13:38:42 2010 -0700
|
|     another commit
|
* commit 8496071c1b46c854b31185ea97743be6a8774479
  Author: Scott Chacon <schacon@gmail.com>
  Date:   Sat May 8 16:13:06 2010 -0700

      testing

* commit 41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9
| Author: Scott Chacon <schacon@gmail.com>
| Date:   Tue May 11 13:40:41 2010 -0700
|
|     packed commit two
|
* commit 5001298e0c09ad9c34e4249bc5801c75e9754fa5
  Author: Scott Chacon <schacon@gmail.com>
  Date:   Tue May 11 13:40:23 2010 -0700

      packed commit one