From patchwork Thu Jan 28 13:27:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 8150351 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 58681BEEE5 for ; Thu, 28 Jan 2016 13:28:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8E78220364 for ; Thu, 28 Jan 2016 13:28:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id AF5442034C for ; Thu, 28 Jan 2016 13:28:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 386386E894; Thu, 28 Jan 2016 05:28:53 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id A01546E890 for ; Thu, 28 Jan 2016 05:28:49 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 28 Jan 2016 05:28:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,358,1449561600"; d="scan'208";a="903003895" Received: from jnikula-mobl.fi.intel.com (HELO localhost) ([10.237.72.67]) by fmsmga002.fm.intel.com with ESMTP; 28 Jan 2016 05:28:47 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Thu, 28 Jan 2016 15:27:19 +0200 Message-Id: <80ce6521559a228eb15152aa8e65758925b0ec88.1453985388.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Cc: jani.nikula@intel.com Subject: [Intel-gfx] [maintainer-tools PATCH v2 25/33] dim: abstract dim_cherry_pick X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jani Nikula --- dim | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dim b/dim index 4942b1684f74..69c8d6a49495 100755 --- a/dim +++ b/dim @@ -453,6 +453,22 @@ function dim_apply_next_fixes dim_apply_branch drm-intel-next-fixes "$@" } +function dim_cherry_pick +{ + if [[ "x$1" = "x" ]]; then + echo "usage: $0 $subcommand commit-ish" + exit 1 + fi + sha=`git rev-parse $1` + sha_short=${sha:0:8} + + # need latest -nightly + git fetch $DIM_DRM_INTEL_REMOTE + echo Possible fixup patches for your cherry-pick: + git log --grep=$sha_short --pretty=oneline $sha..$DIM_DRM_INTEL_REMOTE/drm-intel-nightly + $DRY git cherry-pick $1 +} + dim_alias_ar=apply-resolved function dim_apply_resolved { @@ -915,20 +931,6 @@ fi # XXX: abscract each case to a dim_ prefixed function, and turn the help|*) case # into an else branch in the above check for functions. case "$subcmd" in - cherry-pick) - if [[ "x$1" = "x" ]]; then - echo "usage: $0 $subcommand commit-ish" - exit 1 - fi - sha=`git rev-parse $1` - sha_short=${sha:0:8} - - # need latest -nightly - git fetch $DIM_DRM_INTEL_REMOTE - echo Possible fixup patches for your cherry-pick: - git log --grep=$sha_short --pretty=oneline $sha..$DIM_DRM_INTEL_REMOTE/drm-intel-nightly - $DRY git cherry-pick $1 - ;; pull-request-next) upstream=${1:-$DIM_DRM_UPSTREAM_REMOTE/drm-next} dim_pull_request drm-intel-next $upstream