From patchwork Fri Jan 29 07:40:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 8159891 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 71A219F440 for ; Fri, 29 Jan 2016 07:40:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9AA85202FE for ; Fri, 29 Jan 2016 07:40:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BAEAC202C8 for ; Fri, 29 Jan 2016 07:40:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D1AA96E920; Thu, 28 Jan 2016 23:40:44 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id B806C6E920 for ; Thu, 28 Jan 2016 23:40:43 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 28 Jan 2016 23:40:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,362,1449561600"; d="scan'208";a="903669383" Received: from kmkhan-mobl.ger.corp.intel.com (HELO localhost) ([10.252.58.150]) by fmsmga002.fm.intel.com with ESMTP; 28 Jan 2016 23:40:41 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 29 Jan 2016 09:40:32 +0200 Message-Id: <1454053232-8894-1-git-send-email-jani.nikula@intel.com> X-Mailer: git-send-email 2.1.4 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Cc: jani.nikula@intel.com Subject: [Intel-gfx] [maintainer-tools RFC PATCH] dim: add cherry-pick-[next-]fixes subcommands 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 Add two new subcommands for cherry-picking fixes from dinq to drm-intel-fixes and drm-intel-next-fixes. The only difference in the subcommands is the assert branch check to ensure the user is on the right branch. The commands scan dinq for commits Cc'd to stable or drm-intel-fixes, checks whether they've already been backported, attempts cherry-pick, and asks for directions on failed cherry-pick. It's still rough around the edges and slow as molasses due to unlimited scan for backports (should just check a release or two back at most), and an aborted run just starts over next time (though it should take the freshly backported commits into account). Signed-off-by: Jani Nikula --- Undecided whether we should apply this already or not. It's crude, but I use it. --- dim | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dim b/dim index 203c6b60cf1b..c64f6e86af62 100755 --- a/dim +++ b/dim @@ -473,6 +473,55 @@ function dim_cherry_pick $DRY git cherry-pick $1 } +function dim_cherry_pick_branch +{ + for commit in $(git log --reverse --format=format:%h --grep="drm-intel-fixes@lists.freedesktop.org" --grep="stable@vger.kernel.org" origin/master..$DIM_DRM_INTEL_REMOTE/drm-intel-next-queued -- drivers/gpu/drm/i915); do + echo "Considering $(git --no-pager log --oneline -1 $commit)" + log=$(mktemp) + # note *local* branches to account for unpushed ones + git log drm-intel-fixes --oneline --grep="cherry picked .* $commit" > $log + git log drm-intel-next-fixes --oneline --grep="cherry picked .* $commit" >> $log + if [ "$(cat $log)" = "" ]; then + if ! git cherry-pick -e -x -s $commit; then + select choice in "Diff" "Resolve" "Skip" "Abort"; do + case $choice in + Diff) + git diff + ;; + Resolve) + exit + ;; + Skip) + git cherry-pick --abort + break + ;; + Abort) + git cherry-pick --abort + exit + ;; + esac + done + fi + else + echo "Already backported as:" + sed 's/^/\t/' < $log + fi + rm -f $log + done +} + +function dim_cherry_pick_fixes +{ + assert_branch drm-intel-fixes + dim_cherry_pick_branch "$@" +} + +function dim_cherry_pick_next_fixes +{ + assert_branch drm-intel-next-fixes + dim_cherry_pick_branch "$@" +} + dim_alias_ar=apply-resolved function dim_apply_resolved {