Cherrypicked commits don't get picked up

[cvan]

On Monday we tag master (-dev).
On Tuesday we push to prod Monday's tag and then cherrypick any crucial commits.
Because the cherrypicked commits have different SHAs, they won't appear in the list of commits returned by the GitHub API.

I guess you could compare commit.message, commit.author or something.
I'm not sure if this is a problem worth solving, but I noticed some discrepancies here - and at least on AMO/Marketplace we want to know which commits have been cherrypicked.

[edmorley]

I think trying to compare cherrypicked commits against their originating commits would be hard.

However even just displaying something when commits have been cherrypicked would be an improvement - since at the moment we just get a blank column for the instance where we've cherrypicked. We also can't even see what the base commit between the two is.

[peterbe]

Embarrassingly, I can't see how this works. A tag is a commit on a branch (e.g. "master"), but you have on prod, a git branch that presumably is a continuation of that tag plus some extra commits. Do you make that branch available remotely? E.g. on github? Or is it only available on the server?

Perhaps there's something something about security that determines that you don't public this branch, but if you had a branch dedicated for prod pushed to github you'd be able to point to that in whatsdeployed if we add some extensions.

[edmorley]

The branch is on github, it just doesn't display in the what's deployed ui

[peterbe]

So, do we simply need to tell whatsdeployed to not traverse master but some other branch?
That way it'd be able to find out what all the commits are until it reaches a common commit.
Can you show me this branch on github?

[edmorley]

An example that is currently broken:
https://whatsdeployed.paas.allizom.org/?owner=mozilla&repo=treeherder&name[]=Stage&url[]=https://treeherder.allizom.org/revision.txt&name[]=Prod&url[]=https://treeherder.mozilla.org/revision.txt

Master is on:
656a91e837d5d4befad60b4054b43f24309f798f

Stage:
a75906a2f2b8333f80fc6c017036c372005ba9d0

Prod:
e7ee4144c6fe937eb3246d034d280c9f76523260

I can get the commit ranges from GitHub using...
Stage: mozilla/treeherder@a75906a...master
Prod: mozilla/treeherder@e7ee414...master

[peterbe]

When I open mozilla/treeherder@a75906a...master is says "There isn’t anything to compare."

[edmorley]

Since that comment we've done a deploy unfortunately.

[edmorley]

(Which has overwritten the branch; we grunt build then force push to a stage/production branch). I'll try and come up with a reproducible example soon.

[peterbe]

So, a75906a2f2b8333f80fc6c017036c372005ba9d0 is a commit on a different branch (e.g. the "stage" branch).

What Whatsdeployed does is that it starts at the head of the master branch (aka the HEAD) and travels back in time one commit at a time until it encounters the dev, stage or prod commits. That will never happen for your project.

What we need, perhaps is to specify branches.