OXYGENHUB
# a0a1601eb5a5 oxygenhub / templates / help.html
13.0 KiB · HTML · last changed feat: backups for users and organisations, to a directory, with restore (refs #169) 22 days ago source blame history raw
43e8ca33 Andy McCall ↶ 1
{% extends "base.html" %}
2
{% block title %}Help{% endblock %}
3
{% block content %}
4
<div class="head"><h1>Help <small>using {{ shell.site }}</small></h1></div>
5
<div class="sectioned help">
6
<nav class="section-nav" aria-label="Sections">
7
  <a href="#start">Getting started</a>
8
  <a href="#identity">Your identity</a>
9
  <a href="#push">Pushing</a>
10
  <a href="#clone">Cloning</a>
11
  <a href="#proposals">Proposals</a>
12
  <a href="#delegate">Letting the hub act for you</a>
13
  <a href="#flow">Pipelines</a>
14
  <a href="#keys">Keyboard</a>
d7d18246 Andy McCall ↶ 15
  <a href="#backups">Backups</a>
43e8ca33 Andy McCall ↶ 16
  <a href="#glossary">Coming from GitHub</a>
17
</nav>
18
<div class="sections">
19
20
<section class="panel" id="start">
21
  <h2>Getting started</h2>
22
  <p>{{ shell.site }} hosts <strong>Oxygen</strong> repositories. You work with them through <code>oxy</code>, the Oxygen client; the hub shows them, reviews them and runs their pipelines. Every command below is filled in for this hub.</p>
23
  <ol>
24
    <li>Install <code>oxy</code>: build it from the <code>oxygen</code> repository with <code>cargo build --release</code> and put <code>target/release/oxy</code> on your path.</li>
25
    <li>Say who you are and make a signing identity (next section).</li>
26
    <li>{% if shell.user.is_some() %}Create a <a href="/settings/tokens">personal access token</a>{% else %}<a href="/register">Register</a>, then create a personal access token under Settings › Tokens{% endif %} with <code>repo:write</code>. It is shown once; keep it in <code>oxy</code>'s configuration, not in scripts.</li>
27
    <li>{% if shell.user.is_some() %}<a href="/new">Create a repository</a>{% else %}Create a repository with <strong>+ NEW</strong>{% endif %} and push to it (below). An empty repository shows the same commands, with its own address.</li>
28
  </ol>
29
  <p class="small mute"><code>oxy doctor</code> checks your identity, configuration and remotes, and says what to do about any problem.</p>
30
</section>
31
32
<section class="panel" id="identity">
33
  <h2>Your identity</h2>
34
  <p>Oxygen changes are signed. Your identity is a key pair (Ed25519 with ML-DSA-65) kept under <code>~/.config/oxy</code>; the public part travels with your changes.</p>
35
  {% let cmd = "oxy config --user author.name \"Your Name\"\noxy config --user author.email [email protected]\noxy identity create\noxy config --user core.sign change" %}
36
  <div class="cmds"><pre><code>{{ cmd }}</code></pre><button class="small" data-copy="{{ cmd }}">copy</button></div>
37
  <p>Link the key to your account under {% if shell.user.is_some() %}<a href="/settings/keys">Settings › Keys</a>{% else %}Settings › Keys{% endif %}: the page gives you a challenge to sign with <code>oxy identity sign-challenge</code>, which proves you hold the key. Linked keys show on your profile, and the hub can then tell which signed changes are yours.</p>
38
</section>
39
40
<section class="panel" id="push">
41
  <h2>Pushing</h2>
42
  {% let ca = self.ca_setup() %}
43
  {% if !ca.is_empty() %}
44
  <p>This hub uses a self-signed certificate. Save it once, and point each remote at it:</p>
45
  <div class="cmds"><pre><code>{{ ca }}</code></pre><button class="small" data-copy="{{ ca }}">copy</button></div>
46
  {% endif %}
47
  <p>From a checkout, add the repository as a remote, give it your token, and push:</p>
48
  {% let cmd = q.connect(self.repo_url().as_str()) %}
49
  <div class="cmds"><pre><code>{{ cmd }}</code></pre><button class="small" data-copy="{{ cmd }}">copy</button></div>
50
  <p>An empty repository takes its identity from the first push, so every later clone shares it. <code>oxy push {{ q.remote }}</code> sends the current bookmark; <code>oxy push {{ q.remote }} --bookmark NAME</code> another one. Tags travel with pushes.</p>
51
  <p class="small mute">A Git history comes across with <code>oxy git import --branch main path/to/git-checkout NAME</code>: every commit becomes a change, and the result can be pushed like any other repository.</p>
52
</section>
53
54
<section class="panel" id="clone">
55
  <h2>Cloning</h2>
56
  {% let cmd = self.clone_cmd() %}
57
  <div class="cmds"><pre><code>{{ cmd }}</code></pre><button class="small" data-copy="{{ cmd }}">copy</button></div>
58
  <p>Public repositories clone without a token. For private ones, and to push back, set <code>oxy config remote.origin.token YOUR-TOKEN</code>{% if q.ca_url.is_some() %} and <code>oxy config remote.origin.ca {{ q.ca_file }}</code>{% endif %} in the clone. <code>oxy pull origin</code> brings in what others pushed; there is no merge commit, because Oxygen changes combine by themselves.</p>
59
</section>
60
61
<section class="panel" id="proposals">
62
  <h2>Proposals</h2>
63
  <p>A proposal asks for a bookmark's changes to be added to another bookmark, like a pull request. Push your bookmark, then open one from the repository's Proposals tab, from the compare page's <strong>Propose this</strong>, or from a fork.</p>
64
  <ul>
65
    <li>A proposal is always tested and reviewed on its <strong>projected state</strong>: exactly what the target will hold once it lands. It never goes stale, and there is nothing to rebase.</li>
66
    <li>Review comments are anchored to lines' atoms, so they stay on the right line through later pushes.</li>
67
    <li>An approval can be a <strong>seal</strong>: your signature over the proposal's changes (<code>oxy seal</code>), which anyone can check offline.</li>
68
    <li>Land from the page, or from a client with <code>oxy proposal land URL</code>, which signs the landing with your own key.</li>
7d2eb590 Andy McCall ↶ 69
    <li>Where the site, an organisation or a repository has set up <strong>AI assistants</strong> (Settings), you can ask one to review under Reviewers, or have it draft the description; its answer is recorded as yours <em>via</em> the assistant, with an <span class="tag">agent</span> badge. Only people approve.</li>
43e8ca33 Andy McCall ↶ 70
  </ul>
71
</section>
66fd9d6b Andy McCall ↶ 72
<section class="panel" id="wiki">
73
  <h2>Wiki</h2>
74
  <p>A repository's wiki is Markdown pages kept as an Oxygen repository of their own: edit them under the <strong>Wiki</strong> tab (every edit is a signed change, so it needs the same delegation as editing code), or clone and push them as <code>oxy clone {{ shell.base_url }}/OWNER/NAME.wiki</code>. Pages are <code>Name.md</code> on <code>main</code>; <code>_Sidebar.md</code> is the sidebar; link between pages with <code>[Other](Other)</code>.</p>
75
</section>
43e8ca33 Andy McCall ↶ 76
77
<section class="panel" id="delegate">
78
  <h2>Letting the hub act for you</h2>
79
  <p>Edits in the browser and landings from the proposal page are changes too, and they must be signed. The hub signs them as your <strong>delegate</strong>, only if you allow it. Allowing it is a one-off step:</p>
80
  {% let cmd = self.delegate_cmd() %}
81
  <div class="cmds"><pre><code>{{ cmd }}</code></pre><button class="small" data-copy="{{ cmd }}">copy</button></div>
82
  <p>Then link your identity again under Settings › Keys, so the hub sees the delegation. You can withdraw it at any time with <code>oxy identity delegate remove</code>; a repository's trust policy still decides whether a delegated change may update a bookmark.</p>
83
</section>
84
85
<section class="panel" id="flow">
86
  <h2>Pipelines</h2>
87
  <p>Pipelines run in <strong>OxygenFlow</strong>. Put a pipeline in <code>.flow/pipeline.kdl</code> and push: each job runs in its own microVM with no network, and its result shows on the repository's Flow tab and as a check named <code>flow/JOB</code> on proposals. A site administrator enables Flow for a repository.</p>
88
  <p>Instead of a badge, a README can carry a <strong>state stamp</strong>:</p>
89
  {% let cmd = "[![flow](.flow/stamp)](.flow/run)" %}
90
  <div class="cmds"><pre><code>{{ cmd }}</code></pre><button class="small" data-copy="{{ cmd }}">copy</button></div>
91
  <p>It shows the result for the state you are looking at (a tag shows the tag's result), names that state, and carries each job's receipt hash.</p>
92
</section>
93
94
<section class="panel" id="keys">
95
  <h2>Keyboard</h2>
96
  <table class="list">
97
    <tbody>
98
      <tr><td><kbd>/</kbd></td><td>Search</td></tr>
99
      <tr><td><kbd>g</kbd> <kbd>c</kbd></td><td>The repository's code</td></tr>
100
      <tr><td><kbd>g</kbd> <kbd>h</kbd></td><td>History of the bookmark you are on</td></tr>
101
      <tr><td><kbd>g</kbd> <kbd>p</kbd></td><td>Proposals</td></tr>
102
      <tr><td><kbd>g</kbd> <kbd>i</kbd></td><td>Issues</td></tr>
103
      <tr><td><kbd>g</kbd> <kbd>b</kbd></td><td>Bookmarks</td></tr>
104
      <tr><td><kbd>g</kbd> <kbd>t</kbd></td><td>Trust</td></tr>
105
      <tr><td><kbd>y</kbd></td><td>Replace the address with a permalink to this exact state (files and trees)</td></tr>
106
      <tr><td>click a line number, <kbd>Shift</kbd>-click another</td><td>Select lines; copy them or a permalink to them</td></tr>
107
      <tr><td><kbd>?</kbd></td><td>The keyboard sheet</td></tr>
108
    </tbody>
109
  </table>
110
</section>
111
d7d18246 Andy McCall ↶ 112
<section class="panel" id="backups">
113
  <h2>Backups</h2>
114
  <p>Under Settings › Backups (or an organisation's settings) you choose where your repositories are copied and how often. Each run copies every repository you own, its wiki, issues, proposals, releases and settings, but never a secret value. Only what changed travels, and every kept run can be restored with <code>oxygenhub admin backup restore</code>.</p>
115
  <p>A Google Cloud Storage bucket needs no key: the hub signs in as <code>backup:YOU</code> with a token it issues itself, which Google trusts through workload identity federation. Once per project, create a pool and an OIDC provider whose issuer is this hub's address; once per bucket, grant <code>roles/storage.objectAdmin</code> to the principal <code>…/subject/backup:YOU</code>. The exact commands are in the hub's <code>docs/backups.md</code> §6.</p>
116
</section>
117
43e8ca33 Andy McCall ↶ 118
<section class="panel" id="glossary">
119
  <h2>Coming from GitHub</h2>
120
  <table class="list glossary">
121
    <thead><tr><th>GitHub</th><th>Here</th><th>What is different</th></tr></thead>
122
    <tbody>
123
      <tr><td>commit</td><td><strong>change</strong></td><td>A change records edits, not a snapshot, and names the changes it depends on. Changes that do not touch the same lines combine in any order with the same result, so there are no merge commits. A change keeps its identity when it is rebased or squashed.</td></tr>
124
      <tr><td>commit SHA, tree</td><td><strong>state</strong></td><td>The files a set of changes makes. A state is addressed by its heads (<code>a1b2…+c3d4…</code>); checks, stamps and permalinks belong to states.</td></tr>
125
      <tr><td>branch</td><td><strong>bookmark</strong></td><td>A name for a state. It can have several <strong>heads</strong> (changes nothing else depends on); the tree is their union, not a conflict.</td></tr>
126
      <tr><td>tag</td><td><strong>tag</strong></td><td>An immutable named state, usually signed.</td></tr>
127
      <tr><td>merge, rebase</td><td><code>oxy merge</code>, <code>oxy pull</code></td><td>Uniting bookmarks adds the other side's changes. Nothing is rewritten and no merge change is made.</td></tr>
128
      <tr><td>merge conflict</td><td><strong>conflict</strong> in the state</td><td>A conflict is recorded in the history instead of blocking you. It stays visible (the Conflicts tab) until a change resolves it, and anyone can resolve it later.</td></tr>
129
      <tr><td>pull request</td><td><strong>proposal</strong></td><td>Reviewed and tested on its projected state. It cannot go stale, and approvals can be signed seals.</td></tr>
130
      <tr><td>branch protection</td><td><strong>trust policy</strong></td><td>Signed rules in the repository itself: who may move which bookmark, with how many signatures. Every client enforces them, not only the hub.</td></tr>
131
      <tr><td>Actions, CI badge</td><td><strong>OxygenFlow</strong>, state stamp</td><td>Jobs run in microVMs on exact states; results are receipts, and the stamp says which state they belong to.</td></tr>
c9aacc0e Andy McCall ↶ 132
      <tr><td>git submodule</td><td><strong>subrepo</strong></td><td>Another Oxygen repository pinned at a path by its heads, listed in <code>.oxymodules</code>. The pin is a change like any other, so bumping it combines with your other work instead of conflicting with it.</td></tr>
133
      <tr><td>Renovate, Dependabot</td><td><strong>Diffusion</strong></td><td>Built into the hub, not a bot you install. When a subrepo you pin moves on its default bookmark, the hub works out the bump, runs your checks on it and opens a proposal labelled <code>dependencies</code> with the upstream's changelog. Choose per repository under Settings › Diffusion (when the upstream is green, on every move, or off), or per subrepo in <code>.oxymodules</code>; it never lands anything for you. The Diffusion tab shows both directions: what you pin, and who pins you.</td></tr>
43e8ca33 Andy McCall ↶ 134
      <tr><td>git blame</td><td><strong>blame</strong></td><td>Exact through rebases and squashes: each line is an atom with one authoring change, so there is no "ignore revisions" file.</td></tr>
135
      <tr><td>fork</td><td><strong>fork</strong></td><td>A copy under your name with its own identity and bookmarks, sharing the stored objects. Its proposals go upstream as <code>you/name:bookmark</code>; the upstream's trust policy is not copied.</td></tr>
136
      <tr><td>personal access token</td><td><strong>token</strong></td><td>For pushing and the API. Your signing key is what proves authorship; a token only authorises.</td></tr>
137
    </tbody>
138
  </table>
139
</section>
140
141
</div>
142
</div>
143
{% endblock %}