From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id CA72D73B10 for ; Wed, 8 Jul 2015 08:28:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id t688SLaE021899; Wed, 8 Jul 2015 09:28:21 +0100 Received: from dan.rpsys.net ([127.0.0.1]) by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id C4Y7H4fu00AU; Wed, 8 Jul 2015 09:28:20 +0100 (BST) Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0) by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id t688S5vo021895 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 8 Jul 2015 09:28:17 +0100 Message-ID: <1436344085.27597.207.camel@linuxfoundation.org> From: Richard Purdie To: Robert Yang Date: Wed, 08 Jul 2015 09:28:05 +0100 In-Reply-To: <559C7CD3.5080100@windriver.com> References: <1436282262.27597.183.camel@linuxfoundation.org> <10060998.dTQVzXkhxA@peggleto-mobl.ger.corp.intel.com> <559C7CD3.5080100@windriver.com> X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Cc: Paul Eggleton , bitbake-devel@lists.openembedded.org Subject: Re: [PATCH 1/1] git.py: create a branch when checkout X-BeenThere: bitbake-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussion that advance bitbake development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2015 08:28:26 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Wed, 2015-07-08 at 09:28 +0800, Robert Yang wrote: > > On 07/08/2015 12:56 AM, Paul Eggleton wrote: > > On Tuesday 07 July 2015 16:17:42 Richard Purdie wrote: > >> On Mon, 2015-07-06 at 18:33 -0700, Robert Yang wrote: > >>> Create a branch named oebuild_SRCREV when checkout the source, this > >>> makes debug easier than "(no branch)" when look into the source. > >>> > >>> Signed-off-by: Robert Yang > >>> --- > >>> > >>> bitbake/lib/bb/fetch2/git.py | 3 ++- > >>> 1 file changed, 2 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py > >>> index 2e53882..12087dd 100644 > >>> --- a/bitbake/lib/bb/fetch2/git.py > >>> +++ b/bitbake/lib/bb/fetch2/git.py > >>> > >>> @@ -280,7 +280,8 @@ class Git(FetchMethod): > >>> runfetchcmd("%s read-tree %s%s" % (ud.basecmd, > >>> ud.revisions[ud.names[0]], readpathspec), d) > >>> runfetchcmd("%s checkout-index -q -f -a" % ud.basecmd, > >>> d) > >>> > >>> else: > >>> - runfetchcmd("%s checkout %s" % (ud.basecmd, > >>> ud.revisions[ud.names[0]]), d) + runfetchcmd("%s checkout > >>> %s -b oebuild_%s" % (ud.basecmd, \ + > >>> ud.revisions[ud.names[0]], ud.revisions[ud.names[0]]), d)> > >>> return True > >> > >> Would it not make more sense to set the branch to the upstream branch > >> name here? > > > > I'd go one step further, use the upstream branch name and also set it to track > > the remote branch as well. > > Hi Paul and RP, > > I'm afraid that the ud.revisions[ud.names[0]] which is SRCREV may > not point to an upstream branch or tag, please ? ud.revisions might not, but ud.branches should. I think you want something like: branchcmd = "" if not ud.nobranch: branchcmd = "-b %s" % ud.branches[ud.names[0]] runfetchcmd("%s checkout %s %s" % (ud.basecmd, ud.revisions[ud.names[0]], branchcmd), d) However as Paul notes, setting it to track the upstream remote branch would also be ideal. Cheers, Richard