From: Richard Ipsum <richard.ipsum@codethink.co.uk>
To: git@vger.kernel.org
Cc: Richard Ipsum <richard.ipsum@codethink.co.uk>
Subject: [PATCH 2/2] contrib/git-candidate: Add README
Date: Wed, 14 Oct 2015 18:30:45 +0100 [thread overview]
Message-ID: <1444843845-8017-3-git-send-email-richard.ipsum@codethink.co.uk> (raw)
In-Reply-To: <1444843845-8017-1-git-send-email-richard.ipsum@codethink.co.uk>
Describes motivation for git-candidate and shows an example workflow.
Signed-off-by: Richard Ipsum <richard.ipsum@codethink.co.uk>
---
contrib/git-candidate/README.md | 153 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 153 insertions(+)
create mode 100644 contrib/git-candidate/README.md
diff --git a/contrib/git-candidate/README.md b/contrib/git-candidate/README.md
new file mode 100644
index 0000000..3291a12
--- /dev/null
+++ b/contrib/git-candidate/README.md
@@ -0,0 +1,153 @@
+git-candidate
+=============
+
+git-candidate provides candidate review and patch tracking,
+it differs from other tools that provide this by storing _all_
+content within git.
+
+## Why?
+
+Existing tools such as Github's pull-requests and Gerrit are already
+in wide use, why bother with something new?
+
+We are concerned that whilst git is a distributed version control
+system the systems used to store comments and reviews for content
+under version control are usually centralised,
+git-candidate aims to solve this by storing
+all patch-tracking data in git proper.
+
+## Example review process
+
+### Contributor - Submits a candidate
+
+ (hack hack hack)
+
+ (feature)$ git commit -m "Add archived repo"
+ (feature)$ git candidate create archivedrepo master
+ -m "Add support for archived repo"
+ Candidate archivedrepo created successfully.
+ (feature)$ git candidate submit archivedrepo origin
+ Candidate was submitted successfully.
+
+### Upstream - Reviews candidate
+
+ (master)$ git candidate fetch origin
+ (master)$ git candidate status archiverepo origin
+ Revision: 6239bd72d597357af901718becae91cee2a32b73
+ Ref: candidates/origin/archiverepo
+ Status: active
+ Land: master
+
+ Add archived repo support
+
+ lib/gitano/command.lua | 28 ++++++++++++++++++++++------
+ 1 file changed, 22 insertions(+), 6 deletions(-)
+
+ (master)$ git show candidates/origin/archiverepo
+ commit 2db28539c8fa7b81122382bcc526c6706c9e113a
+ Author: Richard Ipsum <richard.ipsum@codethink.co.uk>
+ Date: Thu Oct 8 10:43:22 2015 +0100
+
+ Add support for archived repository masking in `ls`
+
+ By setting `project.archived` to something truthy, a repository
+ is thusly masked from `ls` output unless --all is passed in.
+
+ Signed-off-by: Richard Ipsum <richard.ipsum@codethink.co.uk>
+ ....
+ ....
+
+
+ (master)$ git candidate review archiverepo origin --vote -1
+ -m "Sorry, I'll need to see tests before I can accept this"
+ Review added successfully
+
+### Contributor - Revises candidate
+
+ (master)$ git candidate fetch origin
+ (master)$ git candidate status archiverepo origin
+ Revision: 6239bd72d597357af901718becae91cee2a32b73
+ Ref: candidates/origin/archiverepo
+ Status: active
+ Land: master
+
+ Add archived repo support
+
+ lib/gitano/command.lua | 28 ++++++++++++++++++++++------
+ 1 file changed, 22 insertions(+), 6 deletions(-)
+
+ --------------------------------------------------------------------------------
+ 1 review
+ --------------------------------------------------------------------------------
+
+ Author: Emmet Hikory <persia@shipstone.jp>
+ Date: Tue Oct 13 10:09:45 2015 +0100
+ Vote: -1
+
+ Sorry, I'll need to see tests before I can accept this
+
+ --------------------------------------------------------------------------------
+
+ (hack hack hack add tests)
+
+ (feature_v2)$ git log --oneline -1
+ Ensure the `ls` yarn checks for archived repos
+
+ (feature_v2)$ git candidate revise archiverepo origin
+ -m "Add archived repo support with tests"
+ Candidate archiverepo revised successfully.
+
+ (feature_v2)$ git candidate submit archiverepo origin
+ Candidate was submitted successfully.
+
+### Upstream - Merges candidate
+
+ (master)$ git candidate fetch origin
+ (master)$ git candidate status archiverepo origin
+ Revision: 4cd3d1197d399005a713ca55f126a9086356a072
+ Ref: candidates/origin/archiverepo
+ Status: active
+ Land: master
+
+ Add archived repo support with tests
+
+ lib/gitano/command.lua | 28 ++++++++++++++++++++++------
+ testing/02-commands-ls.yarn | 19 +++++++++++++++++++
+ 2 files changed, 41 insertions(+), 6 deletions(-)
+
+ (master)$ git candidate review archiverepo origin --vote +2
+ -m "Looks good, merging. Thanks for your efforts"
+ Review added successfully
+
+ (master)$ git candidate submit archiverepo origin
+ Candidate was submitted successfully.
+
+ (master)$ git merge candidates/origin/archiverepo
+ (master)$ git push origin master
+
+### Contributor - Observes candidate has been accepted
+
+ (feature_v2)$ git candidate fetch origin
+ (feature_v2)$ git candidate status archiverepo origin
+ Revision: 4cd3d1197d399005a713ca55f126a9086356a072
+ Ref: candidates/origin/archiverepo
+ Status: active
+ Land: master
+
+ Add archived repo support with tests
+
+ lib/gitano/command.lua | 28 ++++++++++++++++++++++------
+ testing/02-commands-ls.yarn | 19 +++++++++++++++++++
+ 2 files changed, 41 insertions(+), 6 deletions(-)
+
+ --------------------------------------------------------------------------------
+ 1 review
+ --------------------------------------------------------------------------------
+
+ Author: Emmet Hikory <persia@shipstone.jp>
+ Date: Tue Oct 13 10:35:00 2015 +0100
+ Vote: +2
+
+ Looks good, merging. Thanks for your efforts
+
+ --------------------------------------------------------------------------------
--
2.1.4
next prev parent reply other threads:[~2015-10-14 17:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-14 17:30 [RFC] Git based patch tracking and review Richard Ipsum
2015-10-14 17:30 ` [PATCH 1/2] contrib: Add git-candidate subcommand Richard Ipsum
2015-10-14 17:30 ` Richard Ipsum [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-11-10 12:56 [PATCH 0/2] git-candidate: git based patch tracking and review Richard Ipsum
2015-11-10 12:56 ` [PATCH 2/2] contrib/git-candidate: Add README Richard Ipsum
2015-11-10 20:19 ` David Turner
2015-11-11 9:48 ` Richard Ipsum
2015-11-11 20:15 ` David Turner
2016-01-06 20:50 ` Sebastian Schuberth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444843845-8017-3-git-send-email-richard.ipsum@codethink.co.uk \
--to=richard.ipsum@codethink.co.uk \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).