handle squash-merge and rebase-merge PR #25

Activity

1. Carreau commented on Oct 31, 2017

   

   Carreau

   on Oct 31, 2017

   Member

   More actions

   Squash merge should now be handled.
2. Carreau commented on Oct 31, 2017

   

   Carreau

   on Oct 31, 2017

   Member

   More actions

   (not rebase one though).
3. Carreau

   added a commit that references this issue on Jul 24, 2019

   Merge pull request #25 from Carreau/dependabot/pip/mock-3.0.5

   ...

   ab7faf1
4. ivirshup commented on Feb 2, 2021

   

   ivirshup

   on Feb 2, 2021

   More actions

   As a temporary fix, could the bot report an error in this case instead of opening a bad PR?
5. Carreau commented on Feb 2, 2021

   

   Carreau

   on Feb 2, 2021

   Member

   More actions

   As a temporary fix, could the bot report an error in this case instead of opening a bad PR?

   Probably I would have to dive into the code and figure out how to detect that ; and post a message.
   Feel free to send a PR if you have the time.
6. ivirshup commented on Feb 2, 2021

   

   ivirshup

   on Feb 2, 2021

   Last edited by ivirshup

   More actions

   I took a quick look and couldn't figure out how to tell if a merge commit came from a rebase or squash (at least from the github rest api) (pull request docs). Either way, the merge_commit_sha exists on the target branch, and does not exist in the PR commits.

   Closest alternative I thought of would be to sidestep this, do the equivalent of gh pr checkout {pr}, and cherry-pick the commits from the branch this creates. Not really sure of the ways this could fail, however.

   note to self

   Relevant code from this project:

   https://github.com/MeeseeksBox/MeeseeksDev/blob/34fa2c7d26a0e376b2ff92fbc36c69cfe2ebf187/meeseeksdev/meeseeksbox/commands.py#L711-L729

   From the GraphQL API, associatedPullRequests of commits created from rebasing will point to the correct PR. This might be an alternative solution.

   Getting a rebased-commits associated PR

   {
     repository(owner: "theislab", name: "scanpy") {
       pullRequest(number: 1601) {
         mergeCommit {
           # It says last: 10, but it's direct parents so there is only one result
           parents(first: 10) {
             nodes {
               message
               oid
             }
             edges {
               node {
                 associatedPullRequests(first: 10) {
                   nodes {
                     number
                   }
                 }
               }
             }
           }
         }
       }
     }
   }