diff options
author | Vladimir Kotal <Vladimir.Kotal@Sun.COM> | 2010-02-22 19:28:08 +0100 |
---|---|---|
committer | Vladimir Kotal <Vladimir.Kotal@Sun.COM> | 2010-02-22 19:28:08 +0100 |
commit | 9d3952ab10f8677fdabc8594d26cc1e7d6acdfc4 (patch) | |
tree | 0eb1a3b248a6db199e461658ccc04de776c410a5 /usr/src | |
parent | 69112edd987c28fa551d4f8d9362a84a45365f17 (diff) | |
download | illumos-gate-9d3952ab10f8677fdabc8594d26cc1e7d6acdfc4.tar.gz |
6928402 add a section to webrev(1) about remote webrev deletion
6928313 webrev -Uo foo/ may upload to a destination one path element too high
6928394 webrev fails to create nested remote directories
Diffstat (limited to 'usr/src')
-rw-r--r-- | usr/src/tools/scripts/webrev.1 | 25 | ||||
-rw-r--r-- | usr/src/tools/scripts/webrev.sh | 8 |
2 files changed, 28 insertions, 5 deletions
diff --git a/usr/src/tools/scripts/webrev.1 b/usr/src/tools/scripts/webrev.1 index 9832914fbe..e83acd80f8 100644 --- a/usr/src/tools/scripts/webrev.1 +++ b/usr/src/tools/scripts/webrev.1 @@ -18,11 +18,11 @@ .\" .\" CDDL HEADER END .\" -.\" Copyright 2009 Sun Microsystems, Inc. All rights reserved. +.\" Copyright 2010 Sun Microsystems, Inc. All rights reserved. .\" Use is subject to license terms. .\" .\" -.TH webrev 1 "24 Mar 2009" +.TH webrev 1 "22 Feb 2010" .SH NAME webrev \- Generate HTML codereview materials .SH SYNOPSIS @@ -433,6 +433,27 @@ for example: User vkotal .fi +.SH DELETING WEBREVS +When deleting a webrev directory on remote site which has a different name +than the basename of local repository it is necessary to specify the output +option: +.IP +.nf +\f(CW$ webrev -Do webrev-foo.onnv +.fi +.PP +Otherwise \fBwebrev\fR will attempt to remove remote directory with the same +name as basename of the local repository. +.PP +For the nested directory case it is necessary to specify the full target: +.IP +.nf +\f(CW$ webrev -D -t \\ + ssh://user@cr.opensolaris.org:foo/bar/bugfix.onnv +.fi +.PP +This will remove just the \fIbugfix.onnv\fR directory. + .SH SEE ALSO .BR putback "(1)," .BR workspace "(1)," diff --git a/usr/src/tools/scripts/webrev.sh b/usr/src/tools/scripts/webrev.sh index 9f4dba861b..eb0060963d 100644 --- a/usr/src/tools/scripts/webrev.sh +++ b/usr/src/tools/scripts/webrev.sh @@ -21,7 +21,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -215,6 +215,7 @@ function rsync_upload function remote_mkdirs { typeset -r dir_spec=$1 + typeset -r host_spec=$2 # # If the supplied path is absolute we assume all directories are @@ -304,7 +305,7 @@ function ssh_upload # Create remote directories. Any error reporting will be done # in remote_mkdirs function. # - remote_mkdirs ${dir_spec} + remote_mkdirs ${dir_spec} ${host_spec} if (( $? != 0 )); then return 1 fi @@ -2224,7 +2225,8 @@ do O) Oflag=1;; o) oflag=1 - WDIR=$OPTARG;; + # Strip the trailing slash to correctly form remote target. + WDIR=${OPTARG%/};; p) pflag=1 codemgr_parent=$OPTARG;; |