codereview: make commit -a the default; warn about uncommitted changes at upload

also update README.md for github

Change-Id: I7d578a902ffed7f6d69780721e29a1972b6f6992
This commit is contained in:
Russ Cox 2014-11-16 21:39:05 -05:00
parent 294f22a470
commit 0edb04685b
3 changed files with 38 additions and 25 deletions

View file

@ -1,6 +1,7 @@
This is a port of many Plan 9 libraries and programs to Unix. This is a port of many Plan 9 libraries and programs to Unix.
* Installation Installation
------------
To install, run ./INSTALL. It builds mk and then uses mk to To install, run ./INSTALL. It builds mk and then uses mk to
run the rest of the installation. run the rest of the installation.
@ -8,7 +9,8 @@ run the rest of the installation.
For more details, see install(1), at install.txt in this directory For more details, see install(1), at install.txt in this directory
and at http://swtch.com/plan9port/man/man1/install.html. and at http://swtch.com/plan9port/man/man1/install.html.
* Documentation Documentation
-------------
See http://swtch.com/plan9port/man/ for more documentation. See http://swtch.com/plan9port/man/ for more documentation.
(Documentation is also in this tree, but you need to run (Documentation is also in this tree, but you need to run
@ -17,21 +19,28 @@ a successful install first. After that, "9 man 1 intro".)
Intro(1) contains a list of man pages that describe new features Intro(1) contains a list of man pages that describe new features
or differences from Plan 9. or differences from Plan 9.
* Helping out Helping out
-----------
If you'd like to help out, great! The TODO file contains a small list. If you'd like to help out, great! The TODO file contains a small list.
If you port this code to other architectures, please share your changes If you port this code to other architectures, please share your changes
so others can benefit. so others can benefit.
Please use diff -u or CVS (see below) to prepare patches. Please use codereview(1) to prepare patches.
* CVS Git
---
You can use CVS to keep your local copy up-to-date as we make You can use Git to keep your local copy up-to-date as we make
changes and fix bugs. See the cvs(1) man page here ("9 man cvs") changes and fix bugs. See the git(1) man page here ("9 man git")
for details on using cvs. for details on using Git.
* Contact Contact
-------
Russ Cox <rsc@swtch.com> * Mailing list: http://groups.google.com/group/plan9port-dev
* Issue tracker: http://code.swtch.com/plan9port/issues/
* Submitting changes: http://swtch.com/go/codereview
* Russ Cox <rsc@swtch.com>

View file

@ -59,7 +59,7 @@ case create
if($show) { if($show) {
echo '% git branch '$branch' && git commit || git branch -d '$branch >[1=2] echo '% git branch '$branch' && git commit || git branch -d '$branch >[1=2]
} }
git branch $branch && git checkout $branch && git commit $* || git branch -d $branch git branch $branch && git checkout $branch && git commit -a $* || git branch -d $branch
case commit case commit
shift shift
@ -72,7 +72,7 @@ case commit
$git commit $* $git commit $*
exit $status exit $status
} }
$git commit --amend $* $git commit --amend -a $*
exit $status exit $status
case upload case upload
@ -88,6 +88,10 @@ case upload
if(! 9 grep 'machine plan9port-review.googlesource.com' $HOME/.netrc >/dev/null >[2=1]) { if(! 9 grep 'machine plan9port-review.googlesource.com' $HOME/.netrc >/dev/null >[2=1]) {
echo 'codereview: warning: cannot find plan9port-review in netrc' >[1=2] echo 'codereview: warning: cannot find plan9port-review in netrc' >[1=2]
} }
if(! git status | 9 grep 'nothing to commit, working directory clean' >/dev/null) {
echo 'codereview: warning: local changes not yet committed' >[1=2]
git status
}
$git push https://plan9port-review.googlesource.com/plan9 HEAD:refs/for/master >[2=1] | 9 sed 's/.* //' $git push https://plan9port-review.googlesource.com/plan9 HEAD:refs/for/master >[2=1] | 9 sed 's/.* //'
case sync case sync

View file

@ -13,18 +13,12 @@ codereview \- review of submitted changes (experimental)
] ]
.B create .B create
.I name .I name
[
.B -a
]
.PP .PP
.B codereview .B codereview
[ [
.B -v .B -v
] ]
.B commit .B commit
[
.B -a
]
.PP .PP
.B codereview .B codereview
[ [
@ -60,6 +54,10 @@ and then commits them to a ``feature branch''
using using
.I codereview .I codereview
.IR create . .IR create .
Once a feature branch is created, files can still be edited, but they must then be
incorporated into the change by using
.I codereview
.IR commit .
.I Git .I Git
requires that changes be added to a ``staging area'' before the initial commit, requires that changes be added to a ``staging area'' before the initial commit,
using commands such as using commands such as
@ -69,16 +67,18 @@ and
.I git .I git
.IR rm . .IR rm .
The The
.B -a
option causes
.I codereview .I codereview
.I create .I create
to add all local modifications to the staging area as part of the initial commit. and
.PP
Once a feature branch is created, files can still be edited, but they must then be
incorporated into the change by using
.I codereview .I codereview
.IR commit . .I commit
commands
automatically move all local modifications to the staging area
as part of the commit,
using
.I git
.I commit
.IR -a .
.PP .PP
If other changes have been committed since the feature branch was created, If other changes have been committed since the feature branch was created,
.I codereview .I codereview