X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=3f066dc59b5275790551472e2735cf50ceeffc73;hb=2fdf30e540acfd5fb9feaee16ae1298bdf84ed8d;hp=44942ff2e6524da61a2d7cce059d249ab88aec61;hpb=b1e89d6e339d715529ba2653335d212a27e2738d;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index 44942ff..3f066dc 100644
--- a/article.tex
+++ b/article.tex
@@ -34,6 +34,10 @@
 \newcommand{\py}{\pay{P}}
 \newcommand{\pn}{\pan{P}}
 
+\newcommand{\pq}{\pa{Q}}
+\newcommand{\pqy}{\pay{Q}}
+\newcommand{\pqn}{\pan{Q}}
+
 \newcommand{\pr}{\pa{R}}
 \newcommand{\pry}{\pay{R}}
 \newcommand{\prn}{\pan{R}}
@@ -313,6 +317,24 @@ xxx proof tbd
   $A \le C$ so $D \le C$.
 }
 
+\[ \eqn{Simple Foreign Inclusion:}{
+  \left[
+    C \hasparents \{ L \}
+   \land
+    \bigforall_{D} D \isin C \equiv D \isin L \lor D = C
+  \right]
+ \implies
+   \bigforall_{D \text{ s.t. } \patchof{D} = \bot}
+     D \isin C \equiv D \le C
+}\]
+\proof{
+Consider some $D$ s.t. $\patchof{D} = \bot$.
+If $D = C$, trivially true.  For $D \neq C$,
+by Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
+And by Exact Ancestors $D \le L \equiv D \le C$.
+So $D \isin C \equiv D \le C$.
+}
+
 \[ \eqn{Totally Foreign Contents:}{
   \bigforall_{C \hasparents \set A}
    \left[
@@ -340,10 +362,10 @@ We annotate each Topbloke commit $C$ with:
 \gathnext
  \baseof{C}, \text{ if } C \in \py
 \gathnext
- \bigforall_{\pa{Q}} 
-   \text{ either } C \haspatch \pa{Q} \text{ or } C \nothaspatch \pa{Q}
+ \bigforall_{\pq}
+   \text{ either } C \haspatch \pq \text{ or } C \nothaspatch \pq
 \gathnext
- \bigforall_{\pay{Q} \not\ni C} \pendsof{C}{\pay{Q}}
+ \bigforall_{\pqy \not\ni C} \pendsof{C}{\pqy}
 \end{gather}
 
 $\patchof{C}$, for each kind of Topbloke-generated commit, is stated
@@ -352,14 +374,14 @@ 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}$
+$C \haspatch \pq$ or $\nothaspatch \pq$ is represented as the
+set $\{ \pq | C \haspatch \pq \}$.  Whether $C \haspatch \pq$
 is in stated
-(in terms of $I \haspatch \pa{Q}$ or $I \nothaspatch \pa{Q}$
+(in terms of $I \haspatch \pq$ or $I \nothaspatch \pq$
 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,
+$\pendsof{C}{\pq^+}$ 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$
@@ -464,7 +486,7 @@ Given $L$, create a Topbloke base branch initial commit $B$.
 \gathbegin
  B \hasparents \{ L \}
 \gathnext
- \patchof{B} = \pan{Q}
+ \patchof{B} = \pqn
 \gathnext
  D \isin B \equiv D \isin L \lor D = B
 \end{gather}
@@ -474,8 +496,8 @@ Given $L$, create a Topbloke base branch initial commit $B$.
 \[ \eqn{ Ingredients }{
  \patchof{L} = \pa{L} \lor \patchof{L} = \bot
 }\]
-\[ \eqn{ Non-recursion }{
- L \not\in \pa{Q}
+\[ \eqn{ Create Acyclic }{
+ L \not\haspatch \pq
 }\]
 
 \subsection{No Replay}
@@ -492,19 +514,15 @@ Not applicable.
 
 \subsection{Base Acyclic}
 
-Consider some $D \isin B$.  If $D = B$, $D \in \pn$, OK.
-
-If $D \neq B$, $D \isin L$.  By No Replay of $D$ in $L$, $D \le L$.
-Thus by Foreign Contents of $L$, $\patchof{D} = \bot$.  OK.
-
-xxx this is wrong
-
-$\qed$
+Consider some $D \isin B$.  If $D = B$, $D \in \pqn$.
+If $D \neq B$, $D \isin L$, and by Create Acyclic
+$D \not\in \pqy$.  $\qed$
 
 \subsection{Coherence and Patch Inclusion}
 
 Consider some $D \in \p$.
-$B \not\in \py$ so $D \neq B$.  So $D \isin B \equiv D \isin L$.
+$B \not\in \py$ so $D \neq B$.  So $D \isin B \equiv D \isin L$
+and $D \le B \equiv D \le L$.
 
 Thus $L \haspatch \p \implies B \haspatch P$
 and $L \nothaspatch \p \implies B \nothaspatch P$.
@@ -513,11 +531,7 @@ $\qed$.
 
 \subsection{Foreign Inclusion}
 
-Consider some $D$ s.t. $\patchof{D} = \bot$.  $D \neq B$
-so $D \isin B \equiv D \isin L$.
-By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
-And by Exact Ancestors $D \le L \equiv D \le B$.
-So $D \isin B \equiv D \le B$.  $\qed$
+Simple Foreign Inclusion applies. $\qed$
 
 \subsection{Foreign Contents}
 
@@ -529,7 +543,7 @@ Given a Topbloke base $B$, create a tip branch initial commit B.
 \gathbegin
  C \hasparents \{ B \}
 \gathnext
- \patchof{B} = \pay{Q}
+ \patchof{B} = \pqy
 \gathnext
  D \isin C \equiv D \isin B \lor D = C
 \end{gather}
@@ -537,7 +551,10 @@ Given a Topbloke base $B$, create a tip branch initial commit B.
 \subsection{Conditions}
 
 \[ \eqn{ Ingredients }{
- \patchof{B} = \pan{Q}
+ \patchof{B} = \pqn
+}\]
+\[ \eqn{ No Sneak }{
+ \pendsof{B}{\pqy} = \{ \}
 }\]
 
 \subsection{No Replay}
@@ -546,18 +563,46 @@ Ingredients Prevent Replay applies.  $\qed$
 
 \subsection{Unique Base}
 
-Trivially, $\pendsof{C}{\pan{Q}} = \{B\}$ so $\baseof{C} = B$.
+Trivially, $\pendsof{C}{\pqn} = \{B\}$ so $\baseof{C} = B$.  $\qed$
 
 \subsection{Tip Contents}
 
 Consider some arbitrary commit $D$.  If $D = C$, trivially satisfied.
 
 If $D \neq C$, $D \isin C \equiv D \isin B$.
-By Base Acyclic of $B$, $D \isin B \implies D \not\in \pay{Q}$.
+By Base Acyclic of $B$, $D \isin B \implies D \not\in \pqy$.
 So $D \isin C \equiv D \isin \baseof{B}$.
 
 $\qed$
 
+\subsection{Base Acyclic}
+
+Not applicable.
+
+\subsection{Coherence and Patch Inclusion}
+
+$$
+\begin{cases}
+  \p = \pq    \lor B \haspatch \p : & C \haspatch \p \\
+  \p \neq \pq \land B \nothaspatch \p : & C \nothaspatch \p
+\end{cases}
+$$
+
+\proofstarts
+~ Consider some $D \in \py$.
+
+\subsubsection{For $\p = \pq$:}
+
+By Base Acyclic, $D \not\isin B$.  So $D \isin C \equiv D = C$.
+By No Sneak, $D \le B \equiv D = C$.  Thus $C \haspatch \pq$.
+
+\subsubsection{For $\p \neq \pq$:}
+
+$D \neq C$.  So $D \isin C \equiv D \isin B$,
+and $D \le C \equiv D \le B$.
+
+$\qed$
+
 xxx up to here
 
 \section{Anticommit}