--- prcs-1.3.2.orig/contrib/prcs-move/prcs-move.sgml +++ prcs-1.3.2/contrib/prcs-move/prcs-move.sgml @@ -10,7 +10,14 @@ 1 - + + prcs-move + + Tools to help dealing with file renamings in combination with PRCS + + + + prcs-mv src --- prcs-1.3.2.orig/contrib/rprcs/rprcs.1 +++ prcs-1.3.2/contrib/rprcs/rprcs.1 @@ -16,19 +16,19 @@ is a front end for prcs that uses rsh and rsync to communicate with a remote site and do prcs's checkins and checkouts at the remote site. For the moment rprcs is one shell script that manages all related files, -there is no real client and server as e.g. in prcs2. +there is no real client and server as e.g. in prcs2. .P -.B rprcs +.B rprcs requires that a server containing the remote repository and running prcs -and rsync be available. (See /usr/share/doc/prcs/README.rprcs for more +and rsync be available. (See /usr/share/doc/prcs-utils/README for more information about the setup.) .SH "EXAMPLES" -See /usr/share/doc/prcs/rprcs_session.log for an example of a session using -rprcs. +See /usr/share/doc/prcs-utils/rprcs_session.log for an example of a session +using rprcs. .SH "SEE ALSO" .BR prcs (1) .P -/usr/share/doc/prcs/README.rprcs +/usr/share/doc/prcs-utils/README .SH AUTHOR This manual page was written by Rafael Laboissiere , for the Debian GNU/Linux system (but may be used by others). --- prcs-1.3.2.orig/contrib/visualtree/prcs_tree_info.pl +++ prcs-1.3.2/contrib/visualtree/prcs_tree_info.pl @@ -162,8 +162,8 @@ } else { # Local version branches are black, merge branches are blue - ($fv = $from) =~ s/\..*//; - ($tv = $to) =~ s/\..*//; + ($fv = $from) =~ s/(.*)\..*/$1/; + ($tv = $to) =~ s/(.*)\..*/$1/; if ($fv eq $tv) { printf " color: black"; } --- prcs-1.3.2.orig/contrib/visualtree/prcs_tree_draw +++ prcs-1.3.2/contrib/visualtree/prcs_tree_draw @@ -7,14 +7,21 @@ # Copyright Keith Owens , released under GPL. # Tue Sep 29 16:14:43 EST 1998 # +# Modified by Rafael Laboissiere +# Fixed paths for ./prcs_tree_info and xvcg. +# Sat May 11 18:42:34 CEST 2002 +# +# Fixes contributed by Yann Dirson to support +# branch names containing dots. +# Thu Jun 13 10:04:38 CEST 2002 project=${1:?"Project is required"} prcs info $project > /tmp/$$a -start=${2:-`sed -ne '1{ s/[^ ]* //; s/\..*//; p; }' /tmp/$$a`} -end=${3:-`sed -ne '${ s/[^ ]* //; s/\..*//; p; }' /tmp/$$a`} -range=`sed -ne "/^[^ ]* $start\./,/^[^ ]* $end\./{ s/^[^ ]* //; s/\..*//; p; }" /tmp/$$a | sort -nu` +start=${2:-`sed -ne '1{ s/[^ ]* //; s/\.[^.]* .*//; p; }' /tmp/$$a`} +end=${3:-`sed -ne '${ s/[^ ]* //; s/\.[^.]* .*//; p; }' /tmp/$$a`} +range=`sed -ne "/^[^ ]* $start\./,/^[^ ]* $end\./{ s/^[^ ]* //; s/\.[^.]* .*//; p; }" /tmp/$$a | sort -nu` echo prcs info on $project for range $range starting at $start, ending at $end rm /tmp/$$a -for i in $range ; do prcs info -l -r $i $project ; echo ; done | ./prcs_tree.pl > /tmp/$$a -/other/vcg/vcg.1.30/src/xvcg /tmp/$$a +for i in $range ; do prcs info -l -r $i.@ $project ; echo ; done | prcs_tree_info > /tmp/$$a +xvcg /tmp/$$a rm /tmp/$$a --- prcs-1.3.2.orig/contrib/visualtree/prcs-visualtree.1 +++ prcs-1.3.2/contrib/visualtree/prcs-visualtree.1 @@ -31,11 +31,15 @@ .SH SYNOPSIS .B prcs info -l .RI [ project ] -.B | prcs_tree_info | xvcg +.B | prcs_tree_info | xvcg - .br .B prcs_tree_draw .RI " project" .br +.B prcs-show-tree +.RI [[-r ] ...] +.RI [args] +.br .SH DESCRIPTION This manual page documents briefly the .B prcs-visualtree @@ -69,10 +73,25 @@ \fBprcs_tree_draw\fP is a quick and dirty shell script which takes a project name, optional start and end version numbers, extracts the prcs info -l data, runs prcs_tree and calls xvcg on the result. +.PP +The \fBprcs-show-tree\fP is a more elaborated script that just runs +prcs_tree_info as shown above, avoiding the cumbersome command-line which is +quite annoying to enter. +.PP +Without leading -r options, it graphs the full project. With -r options, it +only graphs the branches whose names match the given patterns. +.PP +"args" are additional args to pass to "prcs -l" if needed. Typically this +can be a project name. "-r" options should not be specified there. .SH SEE ALSO .BR prcs (1), .BR xvcg (1). .br .SH AUTHOR +.PP +Keith Owens wrote the prcs_tree* scripts. +.PP +Yann Dirson contributed the prcs-show-tree script. +.PP This manual page was written by Rafael Laboissiere , for the Debian GNU/Linux system (but may be used by others). --- prcs-1.3.2.orig/contrib/visualtree/prcs-show-tree +++ prcs-1.3.2/contrib/visualtree/prcs-show-tree @@ -0,0 +1,46 @@ +#!/bin/sh + +branches= +while [ $# -gt 0 ] +do + case "$1" in + -r) + branches="$branches $2" + shift + ;; + -*) + echo >&2 "unkown option $1" + exit 1 + ;; + *) + break + ;; + esac + shift +done + +( + if [ -z "$branches" ] + then + if [ $# = 0 ] + then + prcs info -l + else + prcs info -l "$@" + fi + else + for b in $branches + do + if [ $# = 0 ] + then + prcs info -l --plain-format -r $b + else + prcs info -l --plain-format -r $b "$@" + fi + done + fi +) | prcs_tree_info | xvcg - + + + + --- prcs-1.3.2.orig/contrib/visualtree/prcs-show-tree.1 +++ prcs-1.3.2/contrib/visualtree/prcs-show-tree.1 @@ -0,0 +1 @@ +.so man1/prcs-visualtree.1 --- prcs-1.3.2.orig/emacs/Makefile.am +++ prcs-1.3.2/emacs/Makefile.am @@ -1,6 +1,8 @@ lisp_LISP=prcs.el prcs-ediff.el prcs-hooks.el # Seems not to distribute $(bin_SCRIPTS)! -EXTRA_DIST=prcs.elc prcs-ediff.elc prcs-hooks.elc prcs.el prcs-ediff.el prcs-hooks.el 1.60.log TODO prcs-el-todo.txt $(bin_SCRIPTS) +EXTRA_DIST=prcs.elc prcs-ediff.elc prcs-hooks.elc prcs.el prcs-ediff.el prcs-hooks.el 1.60.log TODO prcs-el-todo.txt $(bin_SCRIPTS) $(man_MANS) bin_SCRIPTS = prcs-callback prcs-emerge prcs-ediff + +man_MANS = prcs-callback.1 prcs-emerge.1 prcs-ediff.1 --- prcs-1.3.2.orig/emacs/prcs-callback.1 +++ prcs-1.3.2/emacs/prcs-callback.1 @@ -0,0 +1,45 @@ +.\" -*- Nroff -*- +.de Vb +.ft CW +.nf +.ne \\$1 +.. +.de Ve +.ft R + +.fi +.. +.TH PRCS-CALLBACK 1 "PRCS Utilities" "Jun/03/1999" "PRCS Utilities" +.SH NAME +prcs-callback \- Callback script for Ediff support in prcs.el +.SH SYNOPSIS +.B (setq prcs-callback-program "prcs-callback") +.SH "DESCRIPTION" +This manual page documents briefly the +.BR prcs-merge-command , +script. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B prcs-callback +is associated with \fIprcs.el\fR. When called with some +number of arguments, this script: +.PP +.Vb 4 +\& 1. Prints a special magic token on a line by itself. +\& 2. Prints the number of args on a line by itself. +\& 3. Prints each of the args in turn on their own lines. +\& 4. Waits for input. +\& 5. Reads a line (should be an integer), and exits with +\& that status. +.Ve +It is used by \fIprcs.el\fR as a value for $PRCS_DIFF_COMMAND or +$PRCS_MERGE_COMMAND. The token is used to identify its execution in a +general comint buffer. +.SH "SEE ALSO" +prcs(1), +.PP +Info documentation for PRCS (type "info prcs") +.SH AUTHOR +This manual page was written by Rafael Laboissiere , +for the Debian GNU/Linux system (but may be used by others). --- prcs-1.3.2.orig/emacs/prcs-emerge.1 +++ prcs-1.3.2/emacs/prcs-emerge.1 @@ -0,0 +1,38 @@ +.\" -*- Nroff -*- +.de Vb +.ft CW +.nf +.ne \\$1 +.. +.de Ve +.ft R + +.fi +.. +.TH PRCS-EMERGE 1 "PRCS Utilities" "2001-10-28" "PRCS Utilities" +.SH NAME +prcs-emerge \- Sophisticated merge command for PRCS +.SH SYNOPSIS +.B PRCS_MERGE_COMMAND=prcs-emerge prcs merge +[\fI...\fR] +.SH "DESCRIPTION" +This manual page documents briefly the +.BR prcs-emerge , +script. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B prcs-emerge +is a sophisticated diff command for the +.BR prcs (1) +command, using the Ediff package for Emacs-Lisp through +.BR gnudoit (1) +and the \fIprcs.el\fR package. +.SH "SEE ALSO" +.BR prcs (1), +.BR gnudoit (1), +.PP +Info documentation for PRCS (type "info prcs") +.SH AUTHOR +This manual page was written by Rafael Laboissiere , +for the Debian GNU/Linux system (but may be used by others). --- prcs-1.3.2.orig/emacs/prcs-ediff.1 +++ prcs-1.3.2/emacs/prcs-ediff.1 @@ -0,0 +1,38 @@ +.\" -*- Nroff -*- +.de Vb +.ft CW +.nf +.ne \\$1 +.. +.de Ve +.ft R + +.fi +.. +.TH PRCS-EDIFF 1 "PRCS Utilities" "2001-10-28" "PRCS Utilities" +.SH NAME +prcs-ediff \- Sophisticated merge command for PRCS +.SH SYNOPSIS +.B PRCS_DIFF_COMMAND=prcs-ediff prcs diff +[\fI...\fR] +.SH "DESCRIPTION" +This manual page documents briefly the +.BR prcs-ediff , +script. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B prcs-ediff +is a sophisticated diff command for the +.BR prcs (1) +command, using the Ediff package for Emacs-Lisp through +.BR gnudoit (1) +and the \fIprcs.el\fR package. +.SH "SEE ALSO" +.BR prcs (1), +.BR gnudoit (1), +.PP +Info documentation for PRCS (type "info prcs") +.SH AUTHOR +This manual page was written by Rafael Laboissiere , +for the Debian GNU/Linux system (but may be used by others).