This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1655

pushrebase: remove check-bookmarks parts generator
ClosedPublic

Authored by ikostia on Dec 11 2017, 12:37 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX473dc7b7661a: pushrebase: remove check-bookmarks parts generator
Summary

[1] adds a new check which moves bookmarks race check earlier, and this conflicts
with pushrebase. In reality pushrebase-enabled repos don't need this check
anyway, so we can just remove this generator.

[1] https://www.mercurial-scm.org/repo/hg/rev/ad5f2b923b0d

Test Plan
  • run pushrebase tests, see them change their status from failing to passing

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

ikostia created this revision.Dec 11 2017, 12:37 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 11 2017, 12:37 PM
ikostia planned changes to this revision.Dec 11 2017, 12:55 PM
ikostia requested review of this revision.Dec 11 2017, 1:15 PM

This is needed, but only fixes tests together with the other fixes, so the description is slightly incorrect.

quark accepted this revision.Dec 11 2017, 2:54 PM
This revision is now accepted and ready to land.Dec 11 2017, 2:54 PM
Closed by commit rFBHGX473dc7b7661a: pushrebase: remove check-bookmarks parts generator (authored by ikostia). · Explain WhyDec 12 2017, 7:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/pushrebase.py (5 lines)

Diff 4407

hgext3rd/pushrebase.py

# rebase pack part must go before rebase part so it can write to the pack to # rebase pack part must go before rebase part so it can write to the pack to
# disk for reading. # disk for reading.
partorder.insert(partorder.index(rebaseparttype), partorder.insert(partorder.index(rebaseparttype),
partorder.pop(partorder.index(rebasepackparttype))) partorder.pop(partorder.index(rebasepackparttype)))
partorder.insert(0, partorder.pop(partorder.index(commonheadsparttype))) partorder.insert(0, partorder.pop(partorder.index(commonheadsparttype)))
if 'check-bookmarks' in partorder:
# check-bookmarks is intended for non-pushrebase scenarios when
# we can't push to a bookmark if it's changed in the meantime
partorder.pop(partorder.index('check-bookmarks'))
wrapfunction(discovery, 'checkheads', _checkheads) wrapfunction(discovery, 'checkheads', _checkheads)
# we want to disable the heads check because in pushrebase repos, we # we want to disable the heads check because in pushrebase repos, we
# expect the heads to change during the push and we should not abort. # expect the heads to change during the push and we should not abort.
# The check heads functions are used to verify that the heads haven't # The check heads functions are used to verify that the heads haven't
# changed since the client did the initial discovery. Pushrebase is meant # changed since the client did the initial discovery. Pushrebase is meant
# to allow concurrent pushes, so the heads may have very well changed. # to allow concurrent pushes, so the heads may have very well changed.
# So let's not do this check. # So let's not do this check.