Page MenuHomePhabricator

pushrebase: handle pushing phases through separate bundle2 part
ClosedPublic

Authored by stash on Oct 23 2017, 7:08 AM.

Details

Summary

In 537de0b14030868e3e850ae388b08f88cabc88e8 upstream hg commit phase pushes
started to use separate bundle2 part. Because of that:

  1. pushkey hook is not called when updating phases.
  2. pushkey bundle2 part doesn't process phases anymore, 'phase-heads' part do

it instead.

It caused breakages in pushrebase. This diff fixes it.

Test Plan

Run tests test-pushrebase* and test-treemanifest*

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

stash created this revision.Oct 23 2017, 7:08 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 23 2017, 7:08 AM
stash edited the summary of this revision. (Show Details)Oct 23 2017, 7:09 AM
durham added a subscriber: durham.Oct 23 2017, 1:21 PM

Was this breaking the tests? Is this the check:phase thing we shipped? If we shipped this bug, why didn't the tests fail? Do we need a new test?

hgext3rd/pushrebase.py
131

Seems like a non-lambda function declaration would be the exact same number of lines, without the funky '/' right? I know you're just keeping with the style above though

durham added inline comments.Oct 23 2017, 1:27 PM
hgext3rd/pushrebase.py
1054

Maybe add a comment about what this is summing? At first glance, making a dict of a sum seems odd.

durham accepted this revision.Oct 23 2017, 1:29 PM

Looks like this is a different issue from the check:phase error. Accepting, though I still think a commented would help in that dict(sum()) spot.

This revision is now accepted and ready to land.Oct 23 2017, 1:29 PM
stash edited the summary of this revision. (Show Details)Oct 23 2017, 1:35 PM
stash updated this revision to Diff 3053.
This revision was automatically updated to reflect the committed changes.