[PATCH 0/1 V2] git.py: create a branch when checkout

[PATCH 0/1 V2] git.py: create a branch when checkout

[Robert Yang]

* V2:
    - Use upstream name
    - Track remote branch

* V1:
    - Initial version

// Robert

The following changes since commit 0aaa67a790ab211b35eed58173efa115ceb6e243:

  oeqa/bbtests: Fix to ensure DL_DIR is set (2015-07-08 13:09:28 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib rbt/git
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/git

Robert Yang (1):
  git.py: create a branch when checkout

 bitbake/lib/bb/fetch2/git.py |    7 +++++++
 1 file changed, 7 insertions(+)

-- 
1.7.9.5

[PATCH 1/1] git.py: create a branch when checkout

[Robert Yang]

* Create a branch and named as upstream branch when checkout source
* Set the branch to track remote branch.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 bitbake/lib/bb/fetch2/git.py |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 2e53882..afa3d0a 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -279,8 +279,15 @@ class Git(FetchMethod):
             if subdir != "":
                 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)
+            elif not ud.nobranch:
+                branchname =  ud.branches[ud.names[0]]
+                runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \
+                            ud.revisions[ud.names[0]]), d)
+                runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \
+                            branchname), d)
             else:
                 runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d)
+
         return True
 
     def clean(self, ud, d):
-- 
1.7.9.5

Re: [PATCH 1/1] git.py: create a branch when checkout

[Paul Eggleton]

On Thursday 09 July 2015 00:18:01 Robert Yang wrote:
> * Create a branch and named as upstream branch when checkout source
> * Set the branch to track remote branch.
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  bitbake/lib/bb/fetch2/git.py |    7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
> index 2e53882..afa3d0a 100644
> --- a/bitbake/lib/bb/fetch2/git.py
> +++ b/bitbake/lib/bb/fetch2/git.py
> @@ -279,8 +279,15 @@ class Git(FetchMethod):
>              if subdir != "":
>                  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) 
> +            elif not ud.nobranch:
> +                branchname =  ud.branches[ud.names[0]]
> +                runfetchcmd("%s checkout -B %s %s" % (ud.basecmd,
> branchname, \ 
> +                            ud.revisions[ud.names[0]]), d)
> +                runfetchcmd("%s branch --set-upstream %s origin/%s" %
> (ud.basecmd, branchname, \ 
> +                            branchname), d)

Doesn't git checkout support a --track option so we could do this in one 
command rather than two?

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 1/1] git.py: create a branch when checkout

[Robert Yang]

On 07/10/2015 12:54 AM, Paul Eggleton wrote:
> On Thursday 09 July 2015 00:18:01 Robert Yang wrote:
>> * Create a branch and named as upstream branch when checkout source
>> * Set the branch to track remote branch.
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   bitbake/lib/bb/fetch2/git.py |    7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
>> index 2e53882..afa3d0a 100644
>> --- a/bitbake/lib/bb/fetch2/git.py
>> +++ b/bitbake/lib/bb/fetch2/git.py
>> @@ -279,8 +279,15 @@ class Git(FetchMethod):
>>               if subdir != "":
>>                   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)
>> +            elif not ud.nobranch:
>> +                branchname =  ud.branches[ud.names[0]]
>> +                runfetchcmd("%s checkout -B %s %s" % (ud.basecmd,
>> branchname, \
>> +                            ud.revisions[ud.names[0]]), d)
>> +                runfetchcmd("%s branch --set-upstream %s origin/%s" %
>> (ud.basecmd, branchname, \
>> +                            branchname), d)
>
> Doesn't git checkout support a --track option so we could do this in one
> command rather than two?

I'm afraid that we can use --track here, the supported commands are:
git checkout -b <branch> --track <remote>/<branch>
or
git checkout -b <branch> <start point>

What we need is something like:
git checkout -b <branch> --track <remote>/<branch> <start point>
but git doesn't support this.

// Robert

>
> Cheers,
> Paul
>

Re: [PATCH 1/1] git.py: create a branch when checkout

[Paul Eggleton]

On Friday 10 July 2015 08:00:35 Robert Yang wrote:
> On 07/10/2015 12:54 AM, Paul Eggleton wrote:
> > On Thursday 09 July 2015 00:18:01 Robert Yang wrote:
> >> * Create a branch and named as upstream branch when checkout source
> >> * Set the branch to track remote branch.
> >> 
> >> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> >> ---
> >> 
> >>   bitbake/lib/bb/fetch2/git.py |    7 +++++++
> >>   1 file changed, 7 insertions(+)
> >> 
> >> diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
> >> index 2e53882..afa3d0a 100644
> >> --- a/bitbake/lib/bb/fetch2/git.py
> >> +++ b/bitbake/lib/bb/fetch2/git.py
> >> 
> >> @@ -279,8 +279,15 @@ class Git(FetchMethod):
> >>               if subdir != "":
> >>                   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)
> >> +            elif not ud.nobranch:
> >> +                branchname =  ud.branches[ud.names[0]]
> >> +                runfetchcmd("%s checkout -B %s %s" % (ud.basecmd,
> >> branchname, \
> >> +                            ud.revisions[ud.names[0]]), d)
> >> +                runfetchcmd("%s branch --set-upstream %s origin/%s" %
> >> (ud.basecmd, branchname, \
> >> +                            branchname), d)
> > 
> > Doesn't git checkout support a --track option so we could do this in one
> > command rather than two?
> 
> I'm afraid that we can use --track here, the supported commands are:
> git checkout -b <branch> --track <remote>/<branch>
> or
> git checkout -b <branch> <start point>
> 
> What we need is something like:
> git checkout -b <branch> --track <remote>/<branch> <start point>
> but git doesn't support this.

Ah ok, fair enough - thanks for checking.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

[PATCH 0/1] git.py: create a branch when checkout

[Robert Yang]

The following changes since commit 7a402301c9c8fa9a5262d6d29b2ea199ff0dc07a:

  distro/package_regex.inc: Use GNOME_STABLE rule for vala (2015-07-02 23:08:41 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib rbt/git
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/git

Robert Yang (1):
  git.py: create a branch when checkout

 bitbake/lib/bb/fetch2/git.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
1.7.9.5

[PATCH 1/1] git.py: create a branch when checkout

[Robert Yang]

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 <liezhi.yang@windriver.com>
---
 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
 
     def clean(self, ud, d):
-- 
1.7.9.5

Re: [PATCH 1/1] git.py: create a branch when checkout

[Richard Purdie]

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 <liezhi.yang@windriver.com>
> ---
>  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?

Cheers,

Richard
 

Re: [PATCH 1/1] git.py: create a branch when checkout

[Paul Eggleton]

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 <liezhi.yang@windriver.com>
> > ---
> > 
> >  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.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 1/1] git.py: create a branch when checkout

[Robert Yang]

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 <liezhi.yang@windriver.com>
>>> ---
>>>
>>>   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 ?

// Robert

>
> Cheers,
> Paul
>

Re: [PATCH 1/1] git.py: create a branch when checkout

[Richard Purdie]

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 <liezhi.yang@windriver.com>
> >>> ---
> >>>
> >>>   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

Re: [PATCH 1/1] git.py: create a branch when checkout

[Robert Yang]

Thanks, I will send a V2.

// Robert

On 07/08/2015 04:28 PM, Richard Purdie wrote:
> 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 <liezhi.yang@windriver.com>
>>>>> ---
>>>>>
>>>>>    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
>
>
>