Support --noformat and --quiet.

This commit is contained in:
Michał Górny 2010-07-13 12:26:14 +02:00
parent b7bac5aeed
commit d16eb30d2b
2 changed files with 18 additions and 3 deletions

View File

@ -213,6 +213,8 @@ Options:
-C, --nocolor disable colorful output, -C, --nocolor disable colorful output,
-d, --noupdate disable updating the repository, -d, --noupdate disable updating the repository,
-f, --force force repoman to proceed with the commit, -f, --force force repoman to proceed with the commit,
-m, --noformat do not prepend the commit message with package names,
-q, --quiet backwards compat (ignored),
-t, --trivial trivial changes (do not add a ChangeLog entry), -t, --trivial trivial changes (do not add a ChangeLog entry),
-v, --verbose enable verbose output. -v, --verbose enable verbose output.
_EOH_ _EOH_
@ -240,7 +242,7 @@ confirm() {
# Guess what! # Guess what!
main() { main() {
local commitmsg force monochrome noupdate trivial local commitmsg force monochrome noprepend noupdate trivial
unset SC_VERBOSE unset SC_VERBOSE
while [ ${#} -gt 0 ]; do while [ ${#} -gt 0 ]; do
@ -266,6 +268,11 @@ main() {
-f|--force) -f|--force)
force=1 force=1
;; ;;
-m|--noformat)
noprepend=
;;
-q|--quiet)
;;
-t|--trivial) -t|--trivial)
trivial=1 trivial=1
;; ;;
@ -380,7 +387,7 @@ main() {
fi fi
sayv "Now, let's let repoman do its job..." sayv "Now, let's let repoman do its job..."
exec repoman commit ${old_repoman--a} ${force+-f} -m "${SC_CP}: ${commitmsg}" exec repoman commit ${old_repoman--a} ${force+-f} -m "${noprepend-${SC_CP}: }${commitmsg}"
;; ;;
package-removal) package-removal)
vcs_status ${SC_CHANGE_LIST} vcs_status ${SC_CHANGE_LIST}
@ -394,7 +401,7 @@ main() {
vcs_update ${SC_CHANGE_LIST} vcs_update ${SC_CHANGE_LIST}
fi fi
vcs_commit "${SC_CP}: ${commitmsg}" ${SC_CHANGE_LIST} vcs_commit "${noprepend-${SC_CP}: }${commitmsg}" ${SC_CHANGE_LIST}
;; ;;
esac esac
} }

View File

@ -54,6 +54,14 @@ force proceeding with the commit even if QA violations occur. This
means ignoring `\fIrepoman full\fP' results and passing \fB--force\fP to means ignoring `\fIrepoman full\fP' results and passing \fB--force\fP to
`\fIrepoman commit\fP' `\fIrepoman commit\fP'
.IP "\fB-m\fP, \fB--noformat\fP"
disable prepending the commit message with package names
.IP "\fB-q\fP, \fB--quiet\fP"
ignored (provided for backwards compatibility)
.IP "\fB-t\fP, \fB--trivial\fP" .IP "\fB-t\fP, \fB--trivial\fP"
assume the changes are trivial and thus do not require a ChangeLog assume the changes are trivial and thus do not require a ChangeLog