From patchwork Mon May 29 08:02:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Bart=C5=82omiej_Piotrowski?= X-Patchwork-Id: 186 Return-Path: Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org (Dovecot) with LMTP id w5MBHZTVK1m7dQAAtiB/HQ for ; Mon, 29 May 2017 10:02:28 +0200 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 55F74402A5; Mon, 29 May 2017 10:02:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=2.5 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Mon, 29 May 2017 10:02:27 +0200 (CEST) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 07B0E20871; Mon, 29 May 2017 08:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1496044947; bh=gmtKsvcPm5GgEfjBqt4DO+hz0GjTBbR58MMCEiB2pro=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Reply-To; b=hHBCwmpL1jvsvbatROnldKxBYjCth4s2rwfEQtpDcrKcF6oBbQIgORgGIq437P7Nf wLgokhjqcHeXptV+XuCLBELhAOkI8pVDZHMCUQnF1PsTdtZBrZ+nQve+DLqT3hxZ84 /tR4HCS4Li95ptPDVRU2udWoh5UyZoCzIzgkavfjAhZxjZ7AHGfpmoOwZzkwMiPaj5 Ls6h7Y4IAH3Ct/B/oUQ6NS5VEQVae/qmqdYQgLI+xO2tBosYVCV0LnrJPHptJgHYvY m2zTccEZqF/G4D4n4W+n6SDGKtUYGKm+5EOyrn6jCIaib7CBjGit7VUJ8G7C7Mcc7b Vu9ft9mcyb5QqaNI98Hjz4TBKH6DuNr3EN6zlw97FayWI32yHXosmQcRXKDLMtzBYp w6NawqY84/u6Ipau1Fnx+uybpzpTO6VJqw9y8pqeIFQs6jKvOltEO6AFB237S1kBhW 6HUbk/XXnYhO8px44qJYquZl6U3ia0hy15/N+VWZtuPAx0uJYBlphfDnV3icV0up61 AFWTJRyZ8/XtwzcOO95ZKo6qglPMfCVoPLV0bHNt/I50L9LbkCc2dJN7a0MxQ/2Jgm gQ/SQvPJyPMmZoyrGjyHa8LP2V/6SnWkRYI44R3YXvf11tLVGDqg6LmfNQW/+ThnbZ z8iVe9pG3+jceUCHBEiVtWdQ= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 7537D20867 for ; Mon, 29 May 2017 08:02:24 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [89.238.67.251]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 29 May 2017 08:02:24 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 2F53B4023A for ; Mon, 29 May 2017 10:02:22 +0200 (CEST) Received: from manimuru.bud.mirantis.net (static-trzyjeden-piec1.echostar.pl [109.232.31.51]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) (Authenticated sender: bpiotrowski) by nymeria.archlinux.org (Postfix) with ESMTPSA id E8FB740183 for ; Mon, 29 May 2017 10:02:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=nymeria2; t=1496044942; bh=gmtKsvcPm5GgEfjBqt4DO+hz0GjTBbR58MMCEiB2pro=; h=From:To:Subject:Date; b=bR00lRHry0umisxxaFMCrSlI/jRmz5Rkv5a1VmxcEhbH+MRIwHNYngzPXrkJ6H80H SVUOfSj9AXhDLDmQr8G+s3rNAq7TLkwRbEejL4YcDHXaPaAXAm0RGvP9sTSjdm4Il0 Dj3+Daj9e4jnOM+XD0eVSVkVmeqvrAw8fpjrZiC/JZBKNZ79pYYcQjmNv0w/dqOgns KUH0/anCjiTnQFrRoZ2r2+q4TN490ed4Wa2CgBUiIMfqXVMH24IYNMLGMFN3Qa/A3I z3i3KouWy7qjkDXxasUvpEnDH9YJR1YpNNmJeakyj8tBZFLX42fv/Dcv7ZerxNk22d rGwJ1VTe3wIbKEW6l1CAeqcYd+iIFU5+qccG5ooWl6+Yc9daWofQoW3IJFQmgGOVHg gXXx++AQnYOlsmh6geiD1zkOqyFbzjMna18ir0OmZNHO+jmapCt/XbGXGxZnJoVXXl ABshm2BlQaPGc+Dvm2mv8CY8Zko3wQNsMOdi9sdPrKYtIQr3ZYnILO0LFq6DmC/Ptd z3VTkmVuZxSbMg+dM2ZO1nBS9PEWgQIZ+MmAJC/zH81j5QrYF3JtqxasJDvgR7pN8f EAKQuEPtlUJJsuIxrLlYkR6a6r3RMuXOhcz40L9HFPg6+JpZ6ECPXqX7oJzM5FwHvR rQGw61uHVxRBLgxV1qBg4sVU= From: =?utf-8?q?Bart=C5=82omiej_Piotrowski?= To: arch-projects@archlinux.org Date: Mon, 29 May 2017 10:02:06 +0200 Message-Id: <20170529080206.2187-1-bpiotrowski@archlinux.org> X-Mailer: git-send-email 2.13.0 MIME-Version: 1.0 Subject: [arch-projects] [devtools] commitpkg: make commit message more compact X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Arch Linux projects development discussion Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" X-UID: 430 Status: X-Keywords: Content-Length: 997 If message is passed via argument, combine it with version in one line for better display on svn2git. Otherwise append new two lines for manual editing as it was before. Signed-off-by: Bartłomiej Piotrowski --- commitpkg.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/commitpkg.in b/commitpkg.in index 1f9492c..ad23c83 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -99,14 +99,14 @@ if [[ -z $server ]]; then fi if [[ -n $(svn status -q) ]]; then - msgtemplate="upgpkg: $pkgbase $(get_full_version)"$'\n\n' + msgtemplate="$(get_full_version)" if [[ -n $1 ]]; then stat_busy 'Committing changes to trunk' - svn commit -q -m "${msgtemplate}${1}" || die + svn commit -q -m "${msgtemplate}: ${1}" || die stat_done else msgfile="$(mktemp)" - echo "$msgtemplate" > "$msgfile" + echo "$msgtemplate"$'\n\n' > "$msgfile" if [[ -n $SVN_EDITOR ]]; then $SVN_EDITOR "$msgfile" elif [[ -n $VISUAL ]]; then