This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1660

pushrebase: set legacy.exchange config when pushrebase is used
ClosedPublic

Authored by ikostia on Dec 11 2017, 2:17 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXef4822445810: pushrebase: set legacy.exchange config when pushrebase is used
Summary

For now pushrebase only supports the legacy exchnage mode.

Test Plan
  • fewer tests fail after this change

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Test Errors

Event Timeline

ikostia created this revision.Dec 11 2017, 2:17 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 11 2017, 2:17 PM
quark accepted this revision.Dec 11 2017, 2:52 PM
quark added a subscriber: quark.
quark added inline comments.
hgext3rd/pushrebase.py
158

Just use legexc here. That avoids some round-trip escaping issues.

tests/test-pushrebase-remotenames.t
37

Unrelated change

This revision is now accepted and ready to land.Dec 11 2017, 2:52 PM
Closed by commit rFBHGXef4822445810: pushrebase: set legacy.exchange config when pushrebase is used (authored by ikostia). · Explain WhyDec 12 2017, 7:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 4360

hgext3rd/pushrebase.py

wrapfunction(hg, '_peerorrepo', _peerorrepo) wrapfunction(hg, '_peerorrepo', _peerorrepo)
def reposetup(ui, repo): def reposetup(ui, repo):
if repo.ui.configbool('pushrebase', 'blocknonpushrebase'): if repo.ui.configbool('pushrebase', 'blocknonpushrebase'):
repo.ui.setconfig('hooks', 'prechangegroup.blocknonpushrebase', repo.ui.setconfig('hooks', 'prechangegroup.blocknonpushrebase',
blocknonpushrebase) blocknonpushrebase)
# https://www.mercurial-scm.org/repo/hg/rev/a1e70c1dbec0
# and related commits added a new way to pushing bookmarks
# Since pushrebase for now uses pushkey, we want to set this config
# (T24314128 tracks this)
legexc = repo.ui.configlist('devel', 'legacy.exchange', [])
if 'bookmarks' not in legexc:
legexc.append('bookmarks')
repo.ui.setconfig('devel', 'legacy.exchange',
','.join(legexc), 'pushrebase')
quarkUnsubmitted
Not Done

Just use legexc here. That avoids some round-trip escaping issues.

quark: Just use `legexc` here. That avoids some round-trip escaping issues.
def blocknonpushrebase(ui, repo, **kwargs): def blocknonpushrebase(ui, repo, **kwargs):
if not repo.ui.configbool('pushrebase', pushrebasemarker): if not repo.ui.configbool('pushrebase', pushrebasemarker):
raise error.Abort(_("this repository requires that you enable the " raise error.Abort(_("this repository requires that you enable the "
"pushrebase extension and push using " "pushrebase extension and push using "
"'hg push --to'")) "'hg push --to'"))
def _peerorrepo(orig, ui, path, create=False, **kwargs): def _peerorrepo(orig, ui, path, create=False, **kwargs):
# Force hooks to use a bundle repo # Force hooks to use a bundle repo

tests/test-pushrebase-remotenames.t

$ hg book master $ hg book master
$ cd .. $ cd ..
Set up client repository Set up client repository
$ hg clone --config 'extensions.remotenames=' ssh://user@dummy/server client -q $ hg clone --config 'extensions.remotenames=' ssh://user@dummy/server client -q
Test that pushing to a remotename gets rebased Test that pushing to a remotename gets rebased
quarkUnsubmitted
Not Done

Unrelated change

quark: Unrelated change
$ cd server $ cd server
$ hg up -q master $ hg up -q master
$ echo x >> a && hg commit -m "master's commit" $ echo x >> a && hg commit -m "master's commit"
$ cd ../client $ cd ../client
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [extensions] > [extensions]
> remotenames = > remotenames =
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py