Merge remote-tracking branch 'upstream/master' into draft-event

# Conflicts:
#	README.md

1 files changed, 56 insertions, 6 deletions

diff --git a/34.md b/34.md
index 651407d..fcc2cec 100644
--- a/34.md
+++ b/34.md
@@ -17,17 +17,21 @@ Git repositories are hosted in Git-enabled servers, but their existence can be a
   "kind": 30617,
   "content": "",
   "tags": [
-    ["d", "<repo-id>"],
+    ["d", "<repo-id>"], // usually kebab-case short name
     ["name", "<human-readable project name>"],
     ["description", "brief human-readable project description>"],
     ["web", "<url for browsing>", ...], // a webpage url, if the git server being used provides such a thing
     ["clone", "<url for git-cloning>", ...], // a url to be given to `git clone` so anyone can clone it
     ["relays", "<relay-url>", ...] // relays that this repository will monitor for patches and issues
+    ["r", "<earliest-unique-commit-id>", "euc"]
+    ["maintainers", "<other-recognized-maintainer>", ...]
   ]
 }
 ```
 
-The tags `web`, `clone`, `relays` can have multiple values.
+The tags `web`, `clone`, `relays`, `maintainers` can have multiple values.
+
+The `r` tag annotated with the `"euc"` marker should be the commit ID of the earliest unique commit of this repo, made to identify it among forks and group it with other repositories hosted elsewhere that may represent essentially the same project. In most cases it will be the root commit of a repository. In case of a permanent fork between two projects, then the first commit after the fork should be used.
 
 Except `d`, all tags are optional.
 
@@ -35,23 +39,30 @@ Except `d`, all tags are optional.
 
 Patches can be sent by anyone to any repository. Patches to a specific repository SHOULD be sent to the relays specified in that repository's announcement event's `"relays"` tag. Patch events SHOULD include an `a` tag pointing to that repository's announcement address.
 
+Patches in a patch set SHOULD include a NIP-10 `e` `reply` tag pointing to the previous patch.
+
+The first patch revision in a patch revision SHOULD include a NIP-10 `e` `reply` to the original root patch.
+
 ```jsonc
 {
   "kind": 1617,
   "content": "<patch>", // contents of <git format-patch>
   "tags": [
     ["a", "30617:<base-repo-owner-pubkey>:<base-repo-id>"],
+    ["r", "<earliest-unique-commit-id-of-repo>"] // so clients can subscribe to all patches sent to a local git repo
     ["p", "<repository-owner>"],
     ["p", "<other-user>"], // optionally send the patch to another user to bring it to their attention
 
-    // for the first patch in a thread or series
-    ["t", "root"],
+    ["t", "root"], // ommited for additional patches in a series
+    // for the first patch in a revision
+    ["t", "root-revision"],
 
     // optional tags for when it is desirable that the merged patch has a stable commit id
     // these fields are necessary for ensuring that the commit resulting from applying a patch
     // has the same id as it had in the proposer's machine -- all these tags can be omitted
     // if the maintainer doesn't care about these things
     ["commit", "<current-commit-id>"],
+    ["r", "<current-commit-id>"] // so clients can find existing patches for a specific commit
     ["parent-commit", "<parent-commit-id>"],
     ["commit-pgp-sig", "-----BEGIN PGP SIGNATURE-----..."], // empty string for unsigned commit
     ["committer", "<name>", "<email>", "<timestamp>", "<timezone offset in minutes>"],
@@ -59,6 +70,8 @@ Patches can be sent by anyone to any repository. Patches to a specific repositor
 }
 ```
 
+The first patch in a series MAY be a cover letter in the format produced by `git format-patch`.
+
 ## Issues
 
 Issues are Markdown text that is just human-readable conversational threads related to the repository: bug reports, feature requests, questions or comments of any kind. Like patches, these SHOULD be sent to the relays specified in that repository's announcement event's `"relays"` tag.
@@ -94,9 +107,46 @@ Replies are also Markdown text. The difference is that they MUST be issued as re
 }
 ```
 
+## Status
+
+Root Patches and Issues have a Status that defaults to 'Open' and can be set by issuing Status events.
+
+```jsonc
+{
+  "kind": 1630, // Open
+  "kind": 1631, // Applied / Merged for Patches; Resolved for Issues
+  "kind": 1632, // Closed
+  "kind": 1633, // Draft
+  "content": "<markdown text>",
+  "tags": [
+    ["e", "<issue-or-original-root-patch-id-hex>", "", "root"],
+    ["e", "<accepted-revision-root-id-hex>", "", "reply"], // for when revisions applied
+    ["p", "<repository-owner>"],
+    ["p", "<root-event-author>"],
+    ["p", "<revision-author>"],
+
+    // optional for improved subscription filter efficiency
+    ["a", "30617:<base-repo-owner-pubkey>:<base-repo-id>", "<relay-url>"],
+    ["r", "<earliest-unique-commit-id-of-repo>"]
+
+    // optional for `1631` status
+    ["e", "<applied-or-merged-patch-event-id>", "", "mention"], // for each
+    // when merged
+    ["merge-commit", "<merge-commit-id>"]
+    ["r", "<merge-commit-id>"]
+    // when applied
+    ["applied-as-commits", "<commit-id-in-master-branch>", ...]
+    ["r", "<applied-commit-id>"] // for each
+  ]
+}
+```
+
+The Status event with the largest created_at date is valid.
+
+The Status of a patch-revision defaults to either that of the root-patch, or `1632` (Closed) if the root-patch's Status is `1631` and the patch-revision isn't tagged in the `1631` event.
+
+
 ## Possible things to be added later
 
-- "status" kind (for letting people know a patch was merged or an issue was fixed or won't be fixed)
 - "branch merge" kind (specifying a URL from where to fetch the branch to be merged)
-- "cover letter" kind (to which multiple patches can refer and serve as a unifying layer to them)
 - inline file comments kind (we probably need one for patches and a different one for merged files)