Date: Tue, 13 Mar 2001 14:29:03 +0100 (CET) From: Johan Karlsson <k@numeri.campus.luth.se> To: FreeBSD-gnats-submit@freebsd.org Subject: bin/25771: Let mergemaster not display diffs Message-ID: <200103131329.f2DDT3P04592@numeri.campus.luth.se>
next in thread | raw e-mail | index | archive | help
>Number: 25771
>Category: bin
>Synopsis: Let mergemaster not display diffs
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 13 05:30:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Johan Karlsson
>Release: FreeBSD 4.3-BETA i386
>Organization:
>Environment:
System: FreeBSD numeri.campus.luth.se 4.3-BETA FreeBSD 4.3-BETA #2: Sat Mar 10 10:14:21 CET 2001 root@numeri.campus.luth.se:/usr/obj/usr/src/sys/NUMERI i386
>Description:
Sometimes I do not want to have to read all the diff
when running mergemaster but still be able to choose to
see some diffs.
I have added an option to mergemaster do disable the
default view of diff and still allow the user to view
the diff for the specific files he/she want to see.
Maybe another letter should be choosed for this option
but -V is the most natural to me :-)
>How-To-Repeat:
>Fix:
--- mergemaster.orig Tue Mar 13 13:54:11 2001
+++ mergemaster Tue Mar 13 14:21:45 2001
@@ -31,6 +31,7 @@
echo " -u N Specify a numeric umask"
echo " -w N Specify a screen width in columns to sdiff"
echo ' -D /path/directory Specify the destination directory to install files to'
+ echo ' -V do not view diffs by default'
echo ''
}
@@ -103,7 +104,7 @@
# options
diff_loop () {
- HANDLE_COMPFILE=v
+ HANDLE_COMPFILE=${VIEW_DIFF}
while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o "${HANDLE_COMPFILE}" = "NOT V" ]; do
if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then
@@ -225,7 +226,7 @@
# Check the command line options
#
-while getopts ":ascrvhim:t:du:w:D:" COMMAND_LINE_ARGUMENT ; do
+while getopts ":ascrvhim:t:du:w:D:V" COMMAND_LINE_ARGUMENT ; do
case "${COMMAND_LINE_ARGUMENT}" in
s)
STRICT=yes
@@ -271,6 +272,9 @@
D)
DESTDIR=${OPTARG}
;;
+ V)
+ VIEW_DIFF="NOT V"
+ ;;
*)
display_usage
exit 1
@@ -343,6 +347,10 @@
# Assign the diff flag once so we will not have to keep testing it
#
DIFF_FLAG=${DIFF_FLAG:--u}
+
+# Assign the choice to view diff so we will not have to keep testing it
+#
+VIEW_DIFF=${VIEW_DIFF:-v}
# Assign the source directory
#
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103131329.f2DDT3P04592>