mirror of
https://github.com/git/git.git
synced 2024-11-23 01:46:13 +08:00
e32eaf73b0
Add a new reachability algorithm that intends to discover (from a heuristic)
which branch was used as the starting point for a given commit. Add focused
tests using the 'test-tool reach' command.
In repositories that use pull requests (or merge requests) to advance one or
more "protected" branches, the history of that reference can be recovered by
following the first-parent history in most cases. Most are completed using
no-fast-forward merges, though squash merges are quite common. Less common
is rebase-and-merge, which still validates this assumption. Finally, the
case that breaks this assumption is the fast-forward update (with potential
rebasing). Even in this case, the previous commit commonly appears in the
first-parent history of the branch.
Similar assumptions can be made for a topic branch created by a single user
with the intention to merge back into another branch. Using 'git commit',
'git merge', and 'git cherry-pick' from HEAD will default to having the
first-parent commit be the previous commit at HEAD. This history changes
only with commands such as 'git reset' or 'git rebase', where the command
names also imply that the branch is starting from a new location.
With this movement of branches in mind, the following heuristic is proposed
as a way to determine the base branch for a given source branch:
Among a list of candidate base branches, select the candidate that
minimizes the number of commits in the first-parent history of the source
that are not in the first-parent history of the candidate.
Prior third-party solutions to this problem have used this optimization
criteria, but have relied upon extracting the first-parent history and
comparing those lists as tables instead of using commit-graph walks.
Given current command-line interface options, this optimization criteria is
not easy to detect directly. Even using the command
git rev-list --count --first-parent <base>..<source>
does not measure this count, as it uses full reachability from <base> to
determine which commits to remove from the range '<base>..<source>'. This
may lead to one asking if we should instead be using the full reachability
of the candidate and only the first-parent history of the source. This,
unfortunately, does not work for repositories that use long-lived branches
and automation to merge across those branches.
In extremely large repositories, merging into a single trunk may not be
feasible. This is usually due to the desired frequency of updates
(thousands of engineers doing daily work) combined with the time required to
perform a validation build. These factors combine to create significant
risk of semantic merge conflicts, leading to build breaks on the trunk. In
response, repository maintainers can create a single Level Zero (L0) trunk
and multiple Level One (L1) branches. By partitioning the engineers by
organization, these engineers may see lower risk of semantic merge conflicts
as well as be protected against build breaks in other L1 branches. The key
to making this system work is a semi-automated process of merging L1
branches into the L0 trunk and vice-versa. In a large enough organization,
these L1 branches may further split into L2 or L3 branches, but the same
principles apply for merging across deeper levels.
If these automated merges use a typical merge with the second parent
bringing in the "new" content, then each L0 and L1 branch can track its
previous positions by following first-parent history, which appear as
parallel paths (until reaching the first place where the branches diverged).
If we also walk to second parents, then the histories overlap significantly
and cannot be distinguished except for very-recent changes.
For this reason, the first-parent condition should be symmetrical across the
base and source branches.
Another common case for desiring the result of this optimization method is
the use of release branches. When releasing a version of a repository, a
branch can be used to track that release. Any updates that are worth fixing
in that release can be merged to the release branch and shipped with only
the necessary fixes without any new features introduced in the trunk branch.
The 'maint-2.<X>' branches represent this pattern in the Git project. The
microsoft/git fork uses 'vfs-2.<X>.<Y>' branches to track the changes that
are custom to that fork on top of each upstream Git release 2.<X>.<Y>. This
application doesn't need the symmetrical first-parent condition, but the use
of first-parent histories does not change the results for these branches.
To determine the base branch from a list of candidates, create a new method
in commit-reach.c that performs a single* commit-graph walk. The core
concept is to walk first-parents starting at the candidate bases and the
source, tracking the "best" base to reach a given commit. Use generation
numbers to ensure that a commit is walked at most once and all children have
been explored before visiting it. When reaching a commit that is reachable
from both a base and the source, we will then have a guarantee that this is
the closest intersection of first-parent histories. Track the best base to
reach that commit and return it as a result. In rare cases involving
multiple root commits, the first-parent history of the source may never
intersect any of the candidates and thus a null result is returned.
* There are up to two walks, since we require all commits to have a computed
generation number in order to avoid incorrect results. This is similar to
the need for computed generation numbers in ahead_behind() as implemented
in fd67d149bd
(commit-reach: implement ahead_behind() logic, 2023-03-20).
In order to track the "best" base, use a new commit slab that stores an
integer. This value defaults to zero upon initialization, so use -1 to
track that the source commit can reach this commit and use 'i + 1' to track
that the ith base can reach this commit. When multiple bases can reach a
commit, minimize the index to break ties. This allows the caller to specify
an order to the bases that determines some amount of preference when the
heuristic does not result in a unique result.
The trickiest part of the integer slab is what happens when reaching a
collision among the histories of the bases and the history of the source.
This is noticed when viewing the first parent and seeing that it has a slab
value that differs in sign (negative or positive). In this case, the
collision commit is stored in the method variable 'branch_point' and its
slab value is set to -1. The index of the best base (so far) is stored in
the method variable 'best_index'. It is possible that there are multiple
commits that have the branch_point as its first parent, leading to multiple
updates of best_index. The result is determined when 'branch_point' is
visited in the commit walk, giving the guarantee that all commits that could
reach 'branch_point' were visited.
Several interesting cases of collisions and different results are tested in
the t6600-test-reach.sh script. Recall that this script also tests the
algorithm in three possible states involving the commit-graph file and how
many commits are written in the file. This provides some coverage of the
need (and lack of need) for the ensure_generations_valid() method.
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
160 lines
5.1 KiB
C
160 lines
5.1 KiB
C
#ifndef COMMIT_REACH_H
|
|
#define COMMIT_REACH_H
|
|
|
|
#include "commit.h"
|
|
#include "commit-slab.h"
|
|
|
|
struct commit_list;
|
|
struct ref_filter;
|
|
struct object_id;
|
|
struct object_array;
|
|
|
|
int repo_get_merge_bases(struct repository *r,
|
|
struct commit *rev1,
|
|
struct commit *rev2,
|
|
struct commit_list **result);
|
|
int repo_get_merge_bases_many(struct repository *r,
|
|
struct commit *one, int n,
|
|
struct commit **twos,
|
|
struct commit_list **result);
|
|
/* To be used only when object flags after this call no longer matter */
|
|
int repo_get_merge_bases_many_dirty(struct repository *r,
|
|
struct commit *one, int n,
|
|
struct commit **twos,
|
|
struct commit_list **result);
|
|
|
|
int get_octopus_merge_bases(struct commit_list *in, struct commit_list **result);
|
|
|
|
int repo_is_descendant_of(struct repository *r,
|
|
struct commit *commit,
|
|
struct commit_list *with_commit);
|
|
int repo_in_merge_bases(struct repository *r,
|
|
struct commit *commit,
|
|
struct commit *reference);
|
|
int repo_in_merge_bases_many(struct repository *r,
|
|
struct commit *commit,
|
|
int nr_reference, struct commit **reference,
|
|
int ignore_missing_commits);
|
|
|
|
/*
|
|
* Takes a list of commits and returns a new list where those
|
|
* have been removed that can be reached from other commits in
|
|
* the list. It is useful for, e.g., reducing the commits
|
|
* randomly thrown at the git-merge command and removing
|
|
* redundant commits that the user shouldn't have given to it.
|
|
*
|
|
* This function destroys the STALE bit of the commit objects'
|
|
* flags.
|
|
*/
|
|
struct commit_list *reduce_heads(struct commit_list *heads);
|
|
|
|
/*
|
|
* Like `reduce_heads()`, except it replaces the list. Use this
|
|
* instead of `foo = reduce_heads(foo);` to avoid memory leaks.
|
|
*/
|
|
void reduce_heads_replace(struct commit_list **heads);
|
|
|
|
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid);
|
|
|
|
/*
|
|
* Unknown has to be "0" here, because that's the default value for
|
|
* contains_cache slab entries that have not yet been assigned.
|
|
*/
|
|
enum contains_result {
|
|
CONTAINS_UNKNOWN = 0,
|
|
CONTAINS_NO,
|
|
CONTAINS_YES
|
|
};
|
|
|
|
define_commit_slab(contains_cache, enum contains_result);
|
|
|
|
int commit_contains(struct ref_filter *filter, struct commit *commit,
|
|
struct commit_list *list, struct contains_cache *cache);
|
|
|
|
/*
|
|
* Determine if every commit in 'from' can reach at least one commit
|
|
* that is marked with 'with_flag'. As we traverse, use 'assign_flag'
|
|
* as a marker for commits that are already visited. Do not walk
|
|
* commits with date below 'min_commit_date' or generation below
|
|
* 'min_generation'.
|
|
*/
|
|
int can_all_from_reach_with_flag(struct object_array *from,
|
|
unsigned int with_flag,
|
|
unsigned int assign_flag,
|
|
time_t min_commit_date,
|
|
timestamp_t min_generation);
|
|
int can_all_from_reach(struct commit_list *from, struct commit_list *to,
|
|
int commit_date_cutoff);
|
|
|
|
|
|
/*
|
|
* Return a list of commits containing the commits in the 'to' array
|
|
* that are reachable from at least one commit in the 'from' array.
|
|
* Also add the given 'flag' to each of the commits in the returned list.
|
|
*
|
|
* This method uses the PARENT1 and PARENT2 flags during its operation,
|
|
* so be sure these flags are not set before calling the method.
|
|
*/
|
|
struct commit_list *get_reachable_subset(struct commit **from, int nr_from,
|
|
struct commit **to, int nr_to,
|
|
unsigned int reachable_flag);
|
|
|
|
struct ahead_behind_count {
|
|
/**
|
|
* As input, the *_index members indicate which positions in
|
|
* the 'tips' array correspond to the tip and base of this
|
|
* comparison.
|
|
*/
|
|
size_t tip_index;
|
|
size_t base_index;
|
|
|
|
/**
|
|
* These values store the computed counts for each side of the
|
|
* symmetric difference:
|
|
*
|
|
* 'ahead' stores the number of commits reachable from the tip
|
|
* and not reachable from the base.
|
|
*
|
|
* 'behind' stores the number of commits reachable from the base
|
|
* and not reachable from the tip.
|
|
*/
|
|
unsigned int ahead;
|
|
unsigned int behind;
|
|
};
|
|
|
|
/*
|
|
* Given an array of commits and an array of ahead_behind_count pairs,
|
|
* compute the ahead/behind counts for each pair.
|
|
*/
|
|
void ahead_behind(struct repository *r,
|
|
struct commit **commits, size_t commits_nr,
|
|
struct ahead_behind_count *counts, size_t counts_nr);
|
|
|
|
/*
|
|
* For all tip commits, add 'mark' to their flags if and only if they
|
|
* are reachable from one of the commits in 'bases'.
|
|
*/
|
|
void tips_reachable_from_bases(struct repository *r,
|
|
struct commit_list *bases,
|
|
struct commit **tips, size_t tips_nr,
|
|
int mark);
|
|
|
|
/*
|
|
* Given a 'tip' commit and a list potential 'bases', return the index 'i' that
|
|
* minimizes the number of commits in the first-parent history of 'tip' and not
|
|
* in the first-parent history of 'bases[i]'.
|
|
*
|
|
* Among a list of long-lived branches that are updated only by merges (with the
|
|
* first parent being the previous position of the branch), this would inform
|
|
* which branch was used to create the tip reference.
|
|
*
|
|
* Returns -1 if no common point is found in first-parent histories, which is
|
|
* rare, but possible with multiple root commits.
|
|
*/
|
|
int get_branch_base_for_tip(struct repository *r,
|
|
struct commit *tip,
|
|
struct commit **bases,
|
|
size_t bases_nr);
|
|
|
|
#endif
|