1 \documentclass[a4paper,leqno]{strayman}
2 \let\numberwithin=\notdef
10 \renewcommand{\ge}{\geqslant}
11 \renewcommand{\le}{\leqslant}
13 \newcommand{\has}{\sqsupseteq}
14 \newcommand{\isin}{\sqsubseteq}
16 \newcommand{\nothaspatch}{\mathrel{\,\not\!\not\relax\haspatch}}
17 \newcommand{\notpatchisin}{\mathrel{\,\not\!\not\relax\patchisin}}
18 \newcommand{\haspatch}{\sqSupset}
19 \newcommand{\patchisin}{\sqSubset}
21 \newcommand{\set}[1]{\mathbb #1}
22 \newcommand{\pa}[1]{\varmathbb #1}
23 \newcommand{\pay}[1]{\pa{#1}^+}
24 \newcommand{\pan}[1]{\pa{#1}^-}
26 \newcommand{\p}{\pa{P}}
27 \newcommand{\py}{\pay{P}}
28 \newcommand{\pn}{\pan{P}}
30 %\newcommand{\hasparents}{\underaccent{1}{>}}
31 %\newcommand{\hasparents}{{%
32 % \declareslashed{}{_{_1}}{0}{-0.8}{>}\slashed{>}}}
33 \newcommand{\hasparents}{>_{\mkern-7.0mu _1}}
34 \newcommand{\areparents}{<_{\mkern-14.0mu _1\mkern+5.0mu}}
36 \renewcommand{\implies}{\Rightarrow}
37 \renewcommand{\equiv}{\Leftrightarrow}
38 \renewcommand{\land}{\wedge}
39 \renewcommand{\lor}{\vee}
41 \newcommand{\pancs}[2]{{\mathcal A} ( #1 , #2 ) }
42 \newcommand{\pends}[2]{{\mathcal E} ( #1 , #2 ) }
44 \newcommand{\patchof}[1]{{\mathcal P} ( #1 ) }
45 \newcommand{\baseof}[1]{{\mathcal B} ( #1 ) }
47 \newcommand{\eqn}[2]{ #2 \tag*{\mbox{#1}} }
49 \newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
57 \desclabelstyle{\nextlinelabel}
59 \item[ $ C \hasparents \set X $ ]
60 The parents of commit $C$ are exactly the set
64 $C$ is a descendant of $D$ in the git commit
65 graph. This is a partial order, namely the transitive closure of
66 $ D \in \set X $ where $ C \hasparents \set X $.
69 Informally, the tree at commit $C$ contains the change
70 made in commit $D$. Does not take account of deliberate reversions by
71 the user or in non-Topbloke-controlled branches; these are considered
72 normal, forward, commits. For merges and Topbloke-generated
73 anticommits, the ``change made'' is only to be thought of as any
74 conflict resolution. This is not a partial order because it is not
77 \item[ $ \p, \py, \pn $ ]
78 A patch $\p$ consists of two sets of commits $\pn$ and $\py$, which
79 are respectively the base and tip git branches. $\p$ may be used
80 where the context requires a set, in which case the statement
81 is to be taken as applying to both $\py$ and $\pn$.
82 All these sets are distinct. Hence:
84 \item[ $ \patchof{ C } $ ]
85 Either $\p$ s.t. $ C \in \p $, or $\bot$.
86 A function from commits to sets $\p$.
88 \item[ $ \pancs{C}{\set P} $ ]
89 $ \{ A \; | \; A \le C \land A \in \set P \} $
90 i.e. all the ancestors of $C$
91 which are in $\set P$.
93 \item[ $ \pends{C}{\set P} $ ]
94 $ \{ E \; | \; E \in \pancs{C}{\set P}
95 \land \mathop{\not\exists}_{A \in \pancs{C}{\set P}}
96 A \neq E \land E \le A \} $
97 i.e. all $\le$-maximal commits in $\pancs{C}{\set P}$.
99 \item[ $ \baseof{C} $ ]
100 $ \pends{C}{\pn} = \{ \baseof{C} \} $ where $ C \in \py $.
101 A partial function from commits to commits.
102 See ``unique base'', below.
104 \item[ $ C \haspatch \p $ ]
105 $ \bigforall_{D \in \py} D \isin C \equiv D \le C $.
106 Informally, $C$ has the contents of $\p$.
108 \item[ $\displaystyle C \nothaspatch \p $ ]
109 $\displaystyle \bigforall_{D \in \py} D \not\isin C $.
110 ~ Informally, $C$ has none of the contents of $\p$.
117 C \has D \implies C \ge D
119 \[\eqn{Unique base:}{
120 \bigforall_{C \in \py} \pends{C}{\pn} = \{ B \}
122 \[\eqn{Tip contents:}{
123 \bigforall_{C \in \py} D \isin C \equiv
124 { D \isin \baseof{C} \lor \atop
125 (D \in \py \land D \le C) }
127 \[\eqn{Base non-circ:}{
128 \bigforall_{B \in \pn} D \isin B \implies D \notin \py
131 \section{Test more symbols}
135 $ C \nothaspatch \p $
139 $ \p \notpatchisin C $
141 $ \{ B \} \areparents C $