Commits

Michał Górny committed 0872aa0

Create ChangeLog entries via repoman if possible.

Comments (0)

Files changed (1)

 # Guess what!
 main() {
 	local no_check_spelling commitmsg force monochrome noprepend noupdate \
-		trivial print_diff
+		trivial print_diff repoman_changelog
 	unset SC_NOASK SC_VERBOSE SC_WANT_CHANGELOG
 
 	# Command-line parsing.
 					fi
 				fi
 
-				if [ -z "${trivial}" ]; then
-					local ecopts
-					[ ${SC_WANT_CHANGELOG} = force ] && ecopts=--no-strict
-					sayv '...and appending to it.'
-					echangelog --vcs ${SC_VCS} ${ecopts} -- "${commitmsg}" \
-						|| die 'Please correct the problems shown by echangelog.'
-					echo
+				# create ChangeLog entries using repoman if possible
+				repoman --version --echangelog=y >/dev/null 2>&1
+				if [ ${?} -ne 2 ]; then
+					if [ -z "${trivial}" ]; then
+						repoman_changelog='--echangelog=y'
+					else
+						repoman_changelog='--echangelog=n'
+					fi
+				else
+					if [ -z "${trivial}" ]; then
+						local ecopts
+						[ ${SC_WANT_CHANGELOG} = force ] && ecopts=--no-strict
+						sayv '...and appending to it.'
+						echangelog --vcs ${SC_VCS} ${ecopts} -- "${commitmsg}" \
+							|| die 'Please correct the problems shown by echangelog.'
+						echo
+					fi
 				fi
 			fi
 
 			${old_repoman+confirm}
 
 			sayv "Now, let's let repoman do its job..."
-			exec repoman commit ${old_repoman-${SC_NOASK--a}} ${force+-f} -m "${noprepend-${SC_CP}: }${commitmsg}"
+			exec repoman commit ${old_repoman-${SC_NOASK--a}} ${force+-f} ${repoman_changelog} -m "${noprepend-${SC_CP}: }${commitmsg}"
 			;;
 
 		# Clean removal of a package set.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.