779752 - Adjust TBPL push to prod script so it outputs the list of changesets/files in the push

Status: RESOLVED FIXED

(Infrastructure & Operations Graveyard :: WebOps: Other, task, P4)

Description

[Ed Morley [:emorley]]

For an example of the current script output, see bug 779658 comment 1.

In that instance, another changeset was pushed to prod along with bhearsum's needed fix (which wasn't a problem, since we wanted the other fix at some point), but it would be good if this was clearer in the output, so bhearsum would have known to close the other bug.

As such, please may we use -v on the |hg update| to list the files changed, and also have a list of the changesets affected by hg update.

For the latter, it would seem that it isn't possible to get hg update to list the changesets itself, so we'd need to do something like an hg log between the working directory revision and the changeset we're updating to. However, after playing around with this, the closest I got using revsets was:

$ hg log -r .::<changeset_target> --template '{node|short} | {desc|firstline}\n'

...which listed the current working directory changeset as well, not just the descendents of it.

I guess a simper alternative is just to switch the script from doing:
  hg pull
  hg update -r <cset>
to
  hg incoming -r <cset> --template '{node|short} | {desc|firstline}\n'
  hg pull -r <cset> -u -v

That way we let hg incoming do the hard work.

With this solution, we can also remove the |hg parent| line (added by bug 758197), since we'd never end up in a situation where the working directory != repo tip.

(Btw not urgent, can sit for a few weeks if needs be :-))

Comment 1

[Ed Morley [:emorley]]

(In reply to Ed Morley [:edmorley] from comment #0)
> With this solution, we can also remove the |hg parent| line (added by bug
> 758197), since we'd never end up in a situation where the working directory
> != repo tip.

Thinking about it, we'd probably want that left in as well, so that the cron job output for the 'no changes found' case still has a record of what changeset we're at, for https://tbpl-dev.allizom.org/cache/revision_info.txt - especially given that the update has been known to get stuck.

Comment 2

[Shyam Mani [:fox2mike]]

I'll update this on dev first, then prod.

Comment 3

[Shyam Mani [:fox2mike]]

Going to toss this over to Webops, they'll probably get to this faster than I can at this point :|

Comment 4

[Daniel Maher [:phrawzty]]

Hello,

I have made the modifications to the push script as outlined above.  For reference, the meat of the update script is (now) as follows :

    cd $CODE_DIR
    hg incoming -r $CSET --template '{node|short} | {desc|firstline}\n'
    hg pull -r $CSET -u -v

    cd $CODE_DIR
    hg parent

Sorry for the delay on getting to this bug.  If you have any further comments or concerns, please don't hesitate to let us know.  Have a nice day !

Comment 5

[Ed Morley [:emorley]]

Looks perfect, thank you (example in bug 821491 comment 1) :-)