X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=73217528caf6f8329960297c22fc687353e5fecf;hb=7e264f9f37a7ed8ccf3c72366e9bccf03e4abeb3;hp=b4f7beb8b8ea8ea6a82a3422bfaedd37cfeb853b;hpb=b4e0205d32b8d7fd7176523f07f5acb8cff6df02;p=topbloke-formulae.git diff --git a/article.tex b/article.tex index b4f7beb..7321752 100644 --- a/article.tex +++ b/article.tex @@ -95,8 +95,6 @@ \section{Notation} -xxx make all conditions be in conditions, not in (or also in) intro - \begin{basedescript}{ \desclabelwidth{5em} \desclabelstyle{\nextlinelabel} @@ -324,8 +322,6 @@ $\qed$ \section{Commit annotation} -xxx need to compute annotation for every commit type - We annotate each Topbloke commit $C$ with: \gathbegin \patchof{C} @@ -338,10 +334,25 @@ We annotate each Topbloke commit $C$ with: \bigforall_{\pay{Q} \not\ni C} \pendsof{C}{\pay{Q}} \end{gather} +$\patchof{C}$, for each kind of Topbloke-generated commit, is stated +in the summary in the section for that kind of commit. + +Whether $\baseof{C}$ is required, and if so what the value is, is +stated in the proof of Unique Base for each kind of commit. + +$C \haspatch \pa{Q}$ or $\nothaspatch \pa{Q}$ is represented as the +set $\{ \pa{Q} | C \haspatch \pa{Q} \}$. Whether $C \haspatch \pa{Q}$ +is in stated +(in terms of $I \haspatch \pa{Q}$ or $I \nothaspatch \pa{Q}$ +for the ingredients $I$), +in the proof of Coherence for each kind of commit. + +$\pendsof{C}{\pa{Q}^+}$ is computed, for all Topbloke-generated commits, +using the lemma Calculation of Ends, above. We do not annotate $\pendsof{C}{\py}$ for $C \in \py$. Doing so would make it wrong to make plain commits with git because the recorded $\pends$ -would have to be updated. The annotation is not needed because -$\forall_{\py \ni C} \; \pendsof{C}{\py} = \{C\}$. +would have to be updated. The annotation is not needed in that case +because $\forall_{\py \ni C} \; \pendsof{C}{\py} = \{C\}$. \section{Simple commit} @@ -358,7 +369,10 @@ Topbloke strips the metadata when exporting. Trivial. \subsection{Unique Base} -If $A, C \in \py$ then $\baseof{C} = \baseof{A}$. $\qed$ +If $A, C \in \py$ then by Calculation of Ends for +$C, \py, C \not\in \py$: +$\pendsof{C}{\pn} = \pendsof{A}{\pn}$ so +$\baseof{C} = \baseof{A}$. $\qed$ \subsection{Tip Contents} We need to consider only $A, C \in \py$. From Tip Contents for $A$: @@ -385,7 +399,9 @@ Need to consider only $A, C \in \pn$. For $D = C$: $D \in \pn$ so $D \not\in \py$. OK. For $D \neq C$: $D \isin C \equiv D \isin A$, so by Base Acyclic for -$A$, $D \isin C \implies D \not\in \py$. $\qed$ +$A$, $D \isin C \implies D \not\in \py$. + +$\qed$ \subsection{Coherence and patch inclusion} @@ -424,10 +440,55 @@ $\qed$ If $D = C$, trivial. For $D \neq C$: $D \isin C \equiv D \isin A \equiv D \le A \equiv D \le C$. $\qed$ +\section{Create Base} + +Given $L$, create a Topbloke base branch initial commit $B$. +\gathbegin + B \hasparents \{ L \} +\gathnext + \patchof{B} = \pa{B} +\gathnext + D \isin B \equiv D \isin L \lor D = B +\end{gather} + +\subsection{Conditions} + +\[ \eqn{ Ingredients }{ + \patchof{L} = \pa{L} \lor \patchof{L} = \bot +}\] +\[ \eqn{ Non-recursion }{ + L \not\in \pa{B} +}\] + +\subsection{No Replay} + +If $\patchof{L} = \pa{L}$, trivial by Base Acyclic for $L$. + +If $\patchof{L} = \bot$, xxx + +Trivial from Base Acyclic for $L$. $\qed$ + +\subsection{Unique Base} + +Not applicable. $\qed$ + +\subsection{Tip Contents} + +Not applicable. $\qed$ + +\subsection{Base Acyclic} + +xxx + +xxx unfinished + +\section{Create Tip} + +xxx tbd + \section{Anticommit} -Given $L, R^+, R^-$ where -$R^+ \in \pry, R^- = \baseof{R^+}$. +Given $L$ and $\pr$ as represented by $R^+, R^-$. Construct $C$ which has $\pr$ removed. Used for removing a branch dependency. \gathbegin @@ -440,6 +501,9 @@ Used for removing a branch dependency. \subsection{Conditions} +\[ \eqn{ Ingredients }{ +R^+ \in \pry \land R^- = \baseof{R^+} +}\] \[ \eqn{ Into Base }{ L \in \pn }\] @@ -454,9 +518,10 @@ Used for removing a branch dependency. By Unique Tip, $R^+ \le L$. By definition of $\base$, $R^- \le R^+$ so $R^- \le L$. So $R^+ \le C$ and $R^- \le C$. +$\qed$ -(Note that the merge base $R^+ \not\le R^-$, i.e. the merge base is -later than one of the branches to be merged.) +(Note that $R^+ \not\le R^-$, i.e. the merge base +is a descendant, not an ancestor, of the 2nd parent.) \subsection{No Replay} @@ -531,18 +596,22 @@ So $L \nothaspatch \p \implies C \nothaspatch \p$. Whereas if $L \haspatch \p$, $D \isin L \equiv D \le L$. so $L \haspatch \p \implies C \haspatch \p$. -\section{Foreign Inclusion} +$\qed$ + +\subsection{Foreign Inclusion} Consider some $D$ s.t. $\patchof{D} = \bot$. $D \neq C$. So by Desired Contents $D \isin C \equiv D \isin L$. By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$. And $D \le C \equiv D \le L$. -Thus $D \isin C \equiv D \le C$. $\qed$ +Thus $D \isin C \equiv D \le C$. + +$\qed$ \section{Merge} -Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$): +Merge commits $L$ and $R$ using merge base $M$: \gathbegin C \hasparents \{ L, R \} \gathnext @@ -553,7 +622,9 @@ Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$): We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$. \subsection{Conditions} - +\[ \eqn{ Ingredients }{ + M \le L, M \le R +}\] \[ \eqn{ Tip Merge }{ L \in \py \implies \begin{cases} @@ -716,7 +787,9 @@ $C \in \pn$ when $L \in \pn$ so by Merge Acyclic, $R \nothaspatch \p$. Consider some $D \in \py$. By Base Acyclic of $L$, $D \not\isin L$. By the above, $D \not\isin -R$. And $D \neq C$. So $D \not\isin C$. $\qed$ +R$. And $D \neq C$. So $D \not\isin C$. + +$\qed$ \subsection{Tip Contents}