Broadly speaking the update proceeds as follows: during the Ranking
phase we construct the intended graph of dependencies between patches
-(which involves select a merge order for the base branch of each
+(and incidentally select a merge order for the base branch of each
patch). Then during the Traversal phase we walk that graph from the
bottom up, constructing for each patch by a series of merges and other
operations first a new base branch head commit and then a new tip
Convenience notation for
$\bigforall_{E \in \pendsof{\set X}{\p}} E \le T$
-\item[ $\Gamma_{\pc}$ ]
-The desired direct dependencies of $\pc$, a set of patches.
-
-\item[ $\allpatches$ ]
-The set of all the patches we are dealing with (constructed
-during the update algorithm).
-
%\item[ $\set E_{\pc}$ ]
%$ \bigcup_i \pendsof{S_{\pc,i}}{\pc} $.
%All the ends of $\pc$ in the sources.
\end{basedescript}
+\stdsection{Important variables and values in the update algorithm}
+
+\begin{basedescript}{
+\desclabelwidth{5em}
+\desclabelstyle{\nextlinelabel}
+}
+\item[ $\Gamma_{\pc}$ ]
+The desired direct dependencies of $\pc$, a set of patches.
+
+\item[ $\allpatches$ ]
+The set of all the patches we are dealing with (constructed
+during the update algorithm).
+
+\item[ $\tipcn, \tipcy$ ]
+The new tips of the git branches $\pcn$ and $\pcy$, containing
+all the correct commits (and the correct other patches), as
+generated by the Traversal phase of the update algorithm.
+
+\end{basedescript}
+
\section{Ranking phase}
We run the following algorithm:
\item Repeatedly:
\begin{enumerate}
\item Clear out the graph $\hasdirdep$ so it has no edges.
-\item Execute {\bf Rank-Recurse}($\pc_0$)
+\item Execute $\alg{Rank-Recurse}(\pc_0)$
\item Until $\allpatches$ remains unchanged.
\end{enumerate}
\end{enumerate}
-{\bf Rank-Recurse}($\pc$) is:
+$\alg{Rank-Recurse}(\pc)$ is:
\begin{enumerate}
-\item If we have already done {\bf Rank-Recurse}($\pc$) in this
+\item If we have already done $\alg{Rank-Recurse}(\pc)$ in this
ranking iteration, do nothing. Otherwise:
\item Add $\pc$ to $\allpatches$ if it is not there already.
-\item Let
+\item Set
$$
- \set S = h(\pcn)
+ \set S \iassign h(\pcn)
\cup
\bigcup_{\p \in \allpatches}
\bigcup_{H \in h(\pn) \lor H \in h(\py)}
\{ \baseof{E} \; | \; E \in \pendsof{H}{\pcy} \}
$$
-and $W = w(h(\pcn))$
+and $W \iassign w(h(\pcn))$
\item While $\exists_{S \in \set S} S \ge W$,
update $W \assign S$ and $\set S \assign \set S \, \backslash \{ S \}$
(This will often remove $W$ from $\set S$. Afterwards, $\set S$
is a collection of heads to be merged into $W$.)
-\item Choose an order of $\set S$, $S_i$ for $i=1 \ldots n$.
+\item Choose an ordering of $\set S$, $S_i$ for $i=1 \ldots n$.
\item For each $S_i$ in turn, choose a corresponding $M_i$
such that $$
M_i \le S_i \land \left[
- M_i \le W \lor \bigexists_{S_i, j<i} M_i \le S_i
+ M_i \le W \lor \bigexists_{j<i} M_i \le S_j
\right]
$$
-\item Set $\Gamma = \depsreqof{W}$.
+\item Set $\Gamma \iassign \depsreqof{W}$.
If there are multiple candidates we prefer $M_i \in \pcn$
if available.
\item For each $i \ldots 1..n$, update our putative direct
dependencies:
$$
-\Gamma \assign \text{\bf set-merge}\left[\Gamma,
- \left( \begin{cases}
- M_i \in \pcn : & \depsreqof{M_i} \\
- M_i \not\in \pcn : & \{ \}
- \end{cases} \right),
- \depsreqof{S_i}
- \right]
+\Gamma \assign \setmergeof{
+ \Gamma
+ }{
+ \begin{cases}
+ M_i \in \pcn : & \depsreqof{M_i} \\
+ M_i \not\in \pcn : & \{ \}
+ \end{cases}
+ }{
+ \depsreqof{S_i}
+ }
$$
-TODO define {\bf set-merge}
+TODO define $\setmerge$
\item Finalise our putative direct dependencies
$
\item Add an edge $\pc \hasdirdep \pd$ to the digraph (adding nodes
as necessary).
If this results in a cycle, abort entirely (as the function $g$ is
-inappropriate; a different $g$ could work.)
+inappropriate; a different $g$ could work).
+\item Run $\alg{Rank-Recurse}(\pd)$.
\end{enumerate}
-\item Run ${\text{\bf Rank-Recurse}}(\pd)$.
\end{enumerate}
into the partial order $\hasdep$.
\item
-For each $\pc \in \allpatches$, the base branch starting point commit $W_{\pcn} = W$.
+For each $\pc \in \allpatches$,
+the base branch starting point commit $W^{\pcn} = W$.
\item
For each $\pc$,
-the direct dependencies $\Gamma_{\pc}$.
+the direct dependencies $\Gamma^{\pc} = \Gamma$.
\item
For each $\pc$,
-the ordered set of base branch sources $\set S_{\pcn} = \set S,
-S_{\pcn,i} = S_i$
-and corresponding merge bases $M_{\pcn,i} = M_i$.
+the ordered set of base branch sources $\set S^{\pcn} = \set S,
+S^{\pcn}_i = S_i$
+and corresponding merge bases $M^{\pcn}_i = M_i$.
\end{itemize}
-\section{Traversal phase}
+\subsection{Proof of termination}
+
+$\alg{Rank-Recurse}(\pc)$ recurses but only downwards through the
+finite graph $\hasdirdep$, so it must terminate.
+
+The whole ranking algorithm iterates but each iteration involves
+adding one or more patches to $\allpatches$. Since there are
+finitely many patches and we never remove anything from $\allpatches$
+this must complete eventually.
+
+$\qed$
+
+\section{Traversal phase --- algorithm}
+(In general, unless stated otherwise below, when we generate a new
+commit $C$ using one of the commit kind algorith, we update
+$W \assign C$. In any such case where we say we're going to Merge
+with $L = W$, if $R \ge W$ we do not Merge but instead simply set
+$W \assign R$.)
+For each patch $\pc \in \allpatches$ in topological order by $\hasdep$,
+lowest first:
+\begin{enumerate}
-\section{Planning phase}
+\item Optionally, attempt
+ $\alg{Merge-Base}(\pc)$. This may or may not succeed.
-The results of the planning phase consist of:
-\begin{itemize*}
-\item{ The relation $\hasdirdep$ and hence the partial order $\hasdep$. }
-\item{ For each commit set $\pc$, a confirmed set of sources $\set S_{\pc}$. }
-\item{ For each commit set $\pc$, the order in which to merge the sources
- $E_{\pc,j} \in \set E_{\pc}$. }
-\item{ For each $E_{\pc,j}$ an intended merge base $M_{\pc,j}$. }
-\end{itemize*}
+\item If this didn't succeed, or was not attempted, execute
+ $\alg{Recreate-Base}(\pc)$.
-We use a recursive planning algorith, recursing over Topbloke commit
-sets (ie, sets $\py$ or $\pn$). We'll call the commit set we're
-processing at each step $\pc$.
-At each recursive step
-we make a plan to merge all $\set E_{\pc} = \{ E_{\pc,j \ldots} \}$
-and all the direct contributors of $\pc$ (as determined below)
-into $\tipzc$, to make $\tipfc$.
+\item Then in any case, execute
+ $\alg{Merge-Tip}(\pc)$.
-We start with $\pc = \pl$ where $\pl = \patchof{L}$.
+\end{enumerate}
+After processing each $\pc$ we will have created:
-\subsection{Direct contributors for $\pc = \pcn$}
+\begin{itemize}
-The direct contributors of $\pcn$ are the commit sets corresponding to
-the tip branches for the direct dependencies of the patch $\pc$. We
-need to calculate what the direct dependencies are going to be.
+\item $\tipcn$ and $\tipcy$ such that $\baseof{\tipcy} = \tipcn$.
-Choose an (arbitrary, but ideally somehow optimal in
-a way not discussed here) ordering of $\set E_{\pc}$, $E_{\pc,j}$
-($j = 1 \ldots m$).
-For brevity we will write $E_j$ for $E_{\pc,j}$.
-Remove from that set (and ordering) any $E_j$ which
-are $\le$ and $\neq$ some other $E_k$.
+\end{itemize}
-Initially let $\set D_0 = \depsreqof{\tipzc}$.
-For each $E_j$ starting with $j=1$ choose a corresponding intended
-merge base $M_j$ such that $M_j \le E_j \land M_j \le T_{\pc,j-1}$.
-Calculate $\set D_j$ as the 3-way merge of the sets $\set D_{j-1}$ and
-$\depsreqof{E_j}$ using as a base $\depsreqof{M_j}$. This will
-generate $D_m$ as the putative direct contributors of $\pcn$.
+\subsection{$\alg{Merge-Base}(\pc)$}
-However, the invocation may give instructions that certain direct
-dependencies are definitely to be included, or excluded. As a result
-the set of actual direct contributors is some arbitrary set of patches
-(strictly, some arbitrary set of Topbloke tip commit sets).
+This algorithm attempts to construct a suitably updated version of the
+base branch $\pcn$ using some existing version of $\pcn$ as a starting
+point.
-\subsection{Direct contributors for $\pc = \pcy$}
+It should be executed noninteractively. Specifically, if any step
+fails with a merge conflict, the whole thing should be abandoned.
+This avoids asking the user to resolve confusing conflicts. It also
+avoids asking the user to pointlessly resolve conflicts in situations
+where we will later discover that $\alg{Merge-Base}$ wasn't feasible
+after all.
-The sole direct contributor of $\pcy$ is $\pcn$.
+If $\pc$ has only one direct dependency, this algorithm should not be
+used as in that case $\alg{Recreate-Base}$ is trivial and guaranteed
+to generate a perfect answer, whereas this algorithm might involve
+merges and therefore might not produce a perfect answer if the
+situation is complicated.
-\subsection{Recursive step}
+Initially, set $W \iassign W^{\pcn}$.
-For each direct contributor $\p$, we add the edge $\pc \hasdirdep \p$
-and augment the ordering $\hasdep$ accordingly.
+\subsubsection{Bases and sources}
-If this would make a cycle in $\hasdep$, we abort . The operation must
-then be retried by the user, if desired, but with different or
-additional instructions for modifying the direct contributors of some
-$\pqn$ involved in the cycle.
+In some order, perhaps interleaving the two kinds of merge:
-For each such $\p$, after updating $\hasdep$, we recursively make a plan
-for $\pc' = \p$.
+\begin{enumerate}
+\item For each $\pd \isdirdep \pc$, find a merge base
+$M \le W,\; \le \tipdy$ and merge $\tipdy$ into $W$.
+That is, use $\alg{Merge}$ with $L = W,\; R = \tipdy$.
+(Dependency Merge.)
+\item For each $S \in S^{\pcn}_i$, merge it into $W$.
+That is, use $\alg{Merge}$ with $L = W,\; R = S,\; M = M^{\pcn}_i$.
+(Base Sibling Merge.)
-\section{Execution phase}
+\end{enumerate}
-We process commit sets from the bottom up according to the relation
-$\hasdep$. For each commit set $\pc$ we construct $\tipfc$ from
-$\tipzc$, as planned. By construction, $\hasdep$ has $\patchof{L}$
-as its maximum, so this operation will finish by updating
-$\tipca{\patchof{L}}$ with $\tipfa{\patchof{L}}$.
+\subsubsection{Fixup}
-After we are done with each commit set $\pc$, the
-new tip $\tipfc$ has the following properties:
-\[ \eqn{Tip Sources}{
- \bigforall_{E_i \in \set E_{\pc}} \tipfc \ge E_i
-}\]
-\[ \eqn{Tip Dependencies}{
- \bigforall_{\pc \hasdep \p} \tipfc \ge \tipfa \p
-}\]
-\[ \eqn{Perfect Contents}{
- \tipfc \haspatch \p \equiv \pc \hasdep \py
-}\]
+Execute $\alg{Fixup-Base}(W,\pc)$.
-For brevity we will sometimes write $\tipu$ for $\tipuc$, etc. We will start
-out with $\tipc = \tipz$, and at each step of the way construct some
-$\tipu$ from $\tipc$. The final $\tipu$ becomes $\tipf$.
-\subsection{Preparation}
+\subsection{$\alg{Recreate-Base}(\pc)$}
-Firstly, we will check each $E_i$ for being $\ge \tipc$. If
-it is, are we fast forward to $E_i$
---- formally, $\tipu = \text{max}(\tipc, E_i)$ ---
-and drop $E_i$ from the planned ordering.
+\begin{enumerate}
-Then we will merge the direct contributors and the sources' ends.
-This generates more commits $\tipuc \in \pc$, but none in any other
-commit set. We maintain
-$$
- \bigforall_{\p \isdep \pc}
- \pancsof{\tipcc}{\p} \subset
- \pancsof{\tipfa \p}{\p}
-$$
-\proof{
- For $\tipcc = \tipzc$, $T$ ...WRONG WE NEED $\tipfa \p$ TO BE IN $\set E$ SOMEHOW
-}
+\item
+
+Choose a $\hasdep$-maximal direct dependency $\pd$ of $\pc$.
+
+\item
-\subsection{Merge Contributors for $\pcy$}
+Use $\alg{Create Base}$ with $L$ = $\pdy,\; \pq = \pc$ to generate $C$
+and set $W \iassign C$. (Recreate Base Beginning.)
-Merge $\pcn$ into $\tipc$. That is, merge with
-$L = \tipc, R = \tipfa{\pcn}, M = \baseof{\tipc}$.
-to construct $\tipu$.
+\item
-Merge conditions:
+Execute the subalgorithm $\alg{Recreate-Recurse}(\pc)$.
-Ingredients satisfied by construction.
-Tip Merge satisfied by construction. Merge Acyclic follows
-from Perfect Contents and $\hasdep$ being acyclic.
+\item
-Removal Merge Ends: For $\p = \pc$, $M \nothaspatch \p$; OK.
-For $\p \neq \pc$, by Tip Contents,
-$M \haspatch \p \equiv L \haspatch \p$, so we need only
-worry about $X = R, Y = L$; ie $L \haspatch \p$,
-$M = \baseof{L} \haspatch \p$.
-By Tip Contents for $L$, $D \le L \equiv D \le M$. OK.~~$\qed$
+Declare that we contain all of the relevant information from the
+sources. That is, use $\alg{Pseudo-merge}$ with $L = W, \;
+\set R = \{ W \} \cup \set S^{\pcn}$.
+(Recreate Base Final Declaration.)
-WIP UP TO HERE
+\end{enumerate}
-Addition Merge Ends: If $\py \isdep \pcn$, we have already
-done the execution phase for $\pcn$ and $\py$. By
-Perfect Contents for $\pcn$, $\tipfa \pcn \haspatch \p$ i.e.
-$R \haspatch \p$. So we only need to worry about $Y = R = \tipfa \pcn$.
-By Tip Dependencies $\tipfa \pcn \ge \tipfa \py$.
-And by Tip Sources $\tipfa \py \ge $
+\subsubsection{$\alg{Recreate-Recurse}(\pd)$}
-want to prove $E \le \tipfc$ where $E \in \pendsof{\tipcc}{\py}$
+\begin{enumerate}
+
+\item Is $W \haspatch \pd$ ? If so, there is nothing to do: return.
-$\pancsof{\tipcc}{\py} = $
+\item TODO what about non-Topbloke base branches
+\item Use $\alg{Pseudo-Merge}$ with $L = W,\; \set R = \{ \tipdn \}$.
+(Recreate Base Dependency Base Declaration.)
-computed $\tipfa \py$, and by Perfect Contents for $\py$
+\item For all $\hasdep$-maximal $\pd' \isdirdep \pd$,
+execute $\alg{Recreate-Recurse}(\pd')$.
+\item Use $\alg{Merge}$ to apply $\pd$ to $W$. That is,
+$L = W, \; R = \tipdy, \; M = \baseof{R} = \tipdn$.
+(Recreate Reapply.)
-with $M=M_j, L=T_{\pc,j-1}, R=E_j$,
-and calculate what the resulting desired direct dependencies file
-(ie, the set of patches $\set D_j$)
-would be. Eventually we
+\end{enumerate}
-So, formally, we select somehow an order of sources $S_i$. For each
+\subsection{$\alg{Merge-Tip}(\pc)$}
-Make use of the following recursive algorithm, Plan
+\begin{enumerate}
+
+\item TODO CHOOSE/REFINE W AND S as was done during Ranking for bases
+
+\item $\alg{Merge}$ from $\tipcn$. That is, $L = W, \;
+R = \tipcn$ and choose any suitable $M$. (Tip Base Merge.)
+
+\item For each source $S \in \set S^{\pcy}$,
+$\alg{Merge}$ with $L = W, \; R = S$ and any suitable $M$.
+(Tip Source Merge.)
+
+\end{enumerate}
+\section{Traversal phase --- proofs}
+For each operation called for by the traversal algorithms, we prove
+that the commit generation preconditions are met.
- recursively make a plan to merge all $E = \pends$
+\subsection{Tip Base Merge}
-Specifically, in
~ian / topbloke-formulae.git / blobdiff