From patchwork Fri Oct 21 19:36:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9389965 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5CD4260780 for ; Fri, 21 Oct 2016 19:38:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48A6A2A265 for ; Fri, 21 Oct 2016 19:38:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D8E12A276; Fri, 21 Oct 2016 19:38:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 51F3E2A265 for ; Fri, 21 Oct 2016 19:38:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 617AA6EDDD; Fri, 21 Oct 2016 19:37:39 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 85A2D6EDB0 for ; Fri, 21 Oct 2016 19:37:32 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id d199so210535wmd.1 for ; Fri, 21 Oct 2016 12:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=US4IlJ7z105TeYTUqk1jFHKN9EwV/cDtnXkc+CJlWqs=; b=O7BuL0J0o0Xo2WpICVGNDP67oL5Nc8HebTCVTDK8TBWVv2PocZ7V6IJf/JLPgZ6qfw EjlZXKznAoF3lKXvmAbwVlj+Yaa5BEBmIbWbY6A6dvWy/bmYQ7R1vmSHBmmr0fWtx+O6 5qMEyiznt6ZBJaQq342yW4FVLmhDJOQ178UoY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=US4IlJ7z105TeYTUqk1jFHKN9EwV/cDtnXkc+CJlWqs=; b=eJhfjUCT+nSg3Tkp3nVYBQiOkt1RAJlOq6ib2rtSguNK0hkXZwpDWTc1Ezp8cEeHM3 w0vy1PCEyWjvwJf5rBSg83cFm0GWe2awtzIMxgfYScHrTLWU5P7dpCdUFm8dXcCGcnu8 ePhSer4MXOSWO7OM+bT+1uCMSS5s1+D4gXl16lCeILb+S7lXIU3r/nwx9gI8DUGDsJA0 fr1JP/vwI6lOxc9w9sRv0FREVhfKYXH9tj4mUHsoX1MCrP8cfpZ/1eQenXz62efKaIJK NToPksX8mL3iZblfp/ChkltPcFMFT22NMfMRSU5Hmj3vgkuXhDNcQi+fgp/aKhxkSxuC bVhQ== X-Gm-Message-State: ABUngvcJTUOhHUUzmEwHJgTkF8uscMr3d5PDJH2SajlpcGifYovNP9TBsWcO6t+GchNbpQ== X-Received: by 10.194.79.67 with SMTP id h3mr2060910wjx.142.1477078650739; Fri, 21 Oct 2016 12:37:30 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id q134sm5756630wme.3.2016.10.21.12.37.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Oct 2016 12:37:30 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Fri, 21 Oct 2016 21:36:57 +0200 Message-Id: <20161021193700.22100-16-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161021193700.22100-1-daniel.vetter@ffwll.ch> References: <20161021193700.22100-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 15/18] dim: support multiple remotes for branches 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-Virus-Scanned: ClamAV using ClamSMTP Still left to do is fixing up create-branch and remove-branch. Everything else should work here now. Signed-off-by: Daniel Vetter --- dim | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dim b/dim index 4d5008ecce11..fc99108b6e55 100755 --- a/dim +++ b/dim @@ -163,7 +163,8 @@ if [ "$subcommand" != "setup" -a "$subcommand" != "help" -a "$subcommand" != "us # dim_branches=`(source $DIM_PREFIX/drm-rerere/nightly.conf ; echo $nightly_branches) | \ - xargs -n 1 echo | grep '^origin' | sed -e 's/^origin\///'` + xargs -n 1 echo | grep '^\(drm-intel\|drm-misc\)' | \ + sed -e 's/^\(drm-intel\|drm-misc\)\///'` fi function dim_uptodate @@ -209,6 +210,14 @@ function get_remote_name echo $remote } +function get_remote_for_branch +{ + local remote=`git rev-parse --abbrev-ref --symbolic-full-name $1@{upstream}` + remote=${remote%%/*} + + echo $remote +} + # get message id from file # $1 = file message_get_id () @@ -434,12 +443,14 @@ function dim_push_branch exit 1 fi - branch=$1 + local branch=$1 shift assert_branch $branch - git push $DRY_RUN $DIM_DRM_INTEL_REMOTE $branch "$@" + local remote=`get_remote_for_branch $branch` + + git push $DRY_RUN $remote $branch "$@" dim_rebuild_nightly } @@ -715,7 +726,11 @@ function dim_checkout dim_cd $1 if [[ `git branch --list $1` == "" ]] ; then - git checkout -t $DIM_DRM_INTEL_REMOTE/$1 + if [[ `git branch --list --remote $1` == "" ]] ; then + git checkout -t $DIM_DRM_INTEL_REMOTE/$1 + else + git checkout -t $1 + fi else git checkout $1 fi @@ -999,8 +1014,9 @@ function dim_pull_request exit 1 fi - branch=$1 - upstream=$2 + local branch=$1 + local upstream=$2 + local remote=`get_remote_for_branch $1` if [ "$branch" != "drm-intel-next" ]; then assert_branch $branch @@ -1013,13 +1029,13 @@ function dim_pull_request if [ "$branch" = "drm-intel-next" ]; then # drm-intel-next pulls have been tagged using dim update-next - drm_intel_next_tags=`git log $DIM_DRM_INTEL_REMOTE/drm-intel-next ^$upstream --decorate | grep "(.*tag: drm-intel-next-" | sed -e "s/^.*(.*tag: \(drm-intel-next-[^ ,]*\).*)$/\1/"` + drm_intel_next_tags=`git log $branch@{upstream} ^$upstream --decorate | grep "(.*tag: drm-intel-next-" | sed -e "s/^.*(.*tag: \(drm-intel-next-[^ ,]*\).*)$/\1/"` prep_pull_mail $drm_intel_next_tags - tag=`git describe --all --exact $DIM_DRM_INTEL_REMOTE/drm-intel-next` + tag=`git describe --all --exact $branch@{upstream}` else tag=$branch-$today - $DRY git tag -f $tag $DIM_DRM_INTEL_REMOTE/$branch - $DRY git push -f $DIM_DRM_INTEL_REMOTE $tag + $DRY git tag -f $tag $branch@{upstream} + $DRY git push -f $remote $tag prep_pull_mail fi