Re: zk-merge-pr.py

[tison]

... and this is the related API endpoint
https://docs.github.com/en/rest/pulls/pulls?apiVersion=2022-11-28#merge-a-pull-request

Best,
tison.


tison  于2023年6月17日周六 04:09写道：

> For issuing GitHub API calls, I use https://github.com/yanyongyu/githubkit
> that generated from GitHub API definitions and the maintainer is active.
>
> Best,
> tison.
>
>
> Andor Molnar  于2023年6月17日周六 04:06写道：
>
>> Hi all,
>>
>> The greatest advantage of our merge script is the ability of
>> backporting to other branches.
>>
>> The greatest disadvantage of our merge script is it closes the pull
>> request (red color) instead of "merging" (purple color).
>>
>> We could replace the current pure git approach of merging the main
>> commit and call a github API to squash-and-merge. Do you know about a
>> good python lib for doing this?
>>
>> Andor
>>
>>
>>

Re: zk-merge-pr.py

[tison]

For issuing GitHub API calls, I use https://github.com/yanyongyu/githubkit
that generated from GitHub API definitions and the maintainer is active.

Best,
tison.


Andor Molnar  于2023年6月17日周六 04:06写道：

> Hi all,
>
> The greatest advantage of our merge script is the ability of
> backporting to other branches.
>
> The greatest disadvantage of our merge script is it closes the pull
> request (red color) instead of "merging" (purple color).
>
> We could replace the current pure git approach of merging the main
> commit and call a github API to squash-and-merge. Do you know about a
> good python lib for doing this?
>
> Andor
>
>
>

zk-merge-pr.py

[Andor Molnar]

Hi all,

The greatest advantage of our merge script is the ability of
backporting to other branches. 

The greatest disadvantage of our merge script is it closes the pull
request (red color) instead of "merging" (purple color).

We could replace the current pure git approach of merging the main
commit and call a github API to squash-and-merge. Do you know about a
good python lib for doing this?

Andor

[jira] [Created] (ZOOKEEPER-4212) add committer checklist to zk-merge-pr.py

[Ling Mao (Jira)]

Ling Mao created ZOOKEEPER-4212:
---

 Summary: add committer checklist to zk-merge-pr.py
 Key: ZOOKEEPER-4212
 URL: https://issues.apache.org/jira/browse/ZOOKEEPER-4212
 Project: ZooKeeper
  Issue Type: Improvement
Reporter: Ling Mao
Assignee: Ling Mao






--
This message was sent by Atlassian Jira
(v8.3.4#803005)

[jira] [Created] (ZOOKEEPER-3782) Replace filter with list comprehension for returning list in zk-merge-pr.py

[Zili Chen (Jira)]

Zili Chen created ZOOKEEPER-3782:


 Summary: Replace filter with list comprehension for returning list 
in zk-merge-pr.py
 Key: ZOOKEEPER-3782
 URL: https://issues.apache.org/jira/browse/ZOOKEEPER-3782
 Project: ZooKeeper
  Issue Type: Bug
Reporter: Zili Chen
Assignee: Zili Chen


After Py3, {{filter}} return a {{filter object}} instead of {{list object}}, 
which causes

TypeError: 'filter' object is not subscriptable

We can replace filter with list comprehension to fix it.



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

Re: Merge pull request using zk-merge-pr.py script

[Michael Han]

Maybe it's a good time to automate change log generation. Example:
https://issues.apache.org/jira/browse/HADOOP-11731

On Thu, Dec 15, 2016 at 10:04 PM, Rakesh Radhakrishnan <
rakeshr.apa...@gmail.com> wrote:

> Before migrating to git, committer has to update the CHANGE.TXT file
> manually and then push this along with the approved patch as a single
> commit.
>
> Thanks,
> Rakesh
>
> On 16-Dec-2016 11:16 AM, "Michael Han"  wrote:
>
> Good catch, I think a couple of recent commits on master branch missing
> editing of CHANGE.TXT
>
> How is CHANGE.TXT edited before migrating to git during a commit? Is it
> done automatically or manually (that a committer has to update the file)?
>
> On Thu, Dec 15, 2016 at 8:32 PM, Rakesh Radhakrishnan 
> wrote:
>
> > Hi,
> >
> > I have an observation about the merge PR python script.
> > https://cwiki.apache.org/confluence/display/ZOOKEEPER/Committing+changes
> >
> > I could see the commit made using this automated merge script is missing
> to
> > edit the 'CHANGES.TXT' file and then add the jira details that correspond
> > to the patch. I feel, there is an inconsistency between the commit that
> > goes via manually and automated script. Welcome comments?
> >
> > Thanks & Regards,
> > Rakesh
> >
>
>
>
> --
> Cheers
> Michael.
>



-- 
Cheers
Michael.

Re: Merge pull request using zk-merge-pr.py script

[Rakesh Radhakrishnan]

Before migrating to git, committer has to update the CHANGE.TXT file
manually and then push this along with the approved patch as a single
commit.

Thanks,
Rakesh

On 16-Dec-2016 11:16 AM, "Michael Han"  wrote:

Good catch, I think a couple of recent commits on master branch missing
editing of CHANGE.TXT

How is CHANGE.TXT edited before migrating to git during a commit? Is it
done automatically or manually (that a committer has to update the file)?

On Thu, Dec 15, 2016 at 8:32 PM, Rakesh Radhakrishnan 
wrote:

> Hi,
>
> I have an observation about the merge PR python script.
> https://cwiki.apache.org/confluence/display/ZOOKEEPER/Committing+changes
>
> I could see the commit made using this automated merge script is missing
to
> edit the 'CHANGES.TXT' file and then add the jira details that correspond
> to the patch. I feel, there is an inconsistency between the commit that
> goes via manually and automated script. Welcome comments?
>
> Thanks & Regards,
> Rakesh
>



--
Cheers
Michael.

Re: Merge pull request using zk-merge-pr.py script

[Michael Han]

Good catch, I think a couple of recent commits on master branch missing
editing of CHANGE.TXT

How is CHANGE.TXT edited before migrating to git during a commit? Is it
done automatically or manually (that a committer has to update the file)?

On Thu, Dec 15, 2016 at 8:32 PM, Rakesh Radhakrishnan 
wrote:

> Hi,
>
> I have an observation about the merge PR python script.
> https://cwiki.apache.org/confluence/display/ZOOKEEPER/Committing+changes
>
> I could see the commit made using this automated merge script is missing to
> edit the 'CHANGES.TXT' file and then add the jira details that correspond
> to the patch. I feel, there is an inconsistency between the commit that
> goes via manually and automated script. Welcome comments?
>
> Thanks & Regards,
> Rakesh
>



-- 
Cheers
Michael.

Merge pull request using zk-merge-pr.py script

[Rakesh Radhakrishnan]

Hi,

I have an observation about the merge PR python script.
https://cwiki.apache.org/confluence/display/ZOOKEEPER/Committing+changes

I could see the commit made using this automated merge script is missing to
edit the 'CHANGES.TXT' file and then add the jira details that correspond
to the patch. I feel, there is an inconsistency between the commit that
goes via manually and automated script. Welcome comments?

Thanks & Regards,
Rakesh