This is an archive of the discontinued Mercurial Phabricator instance.

Differential D424

push: respect pushvars
ClosedPublic

Authored by quark on Aug 16 2017, 7:20 PM.
Tags
None
Subscribers
None

Details

Reviewers
ryanmce
Summary

The pushvars feature was recently added in core. This patch adds
corresponding support in remotenames.

Depends on D423.

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Aug 16 2017, 7:20 PM
ryanmce edited edge metadata.Aug 17 2017, 7:57 AM

Why wasn't this needed when this was an extension in fb-hgext?

It seems that we shouldn't need every other extension to be aware of pushvars. This seems like a step backwards to me.

ryanmce requested changes to this revision.Aug 17 2017, 7:57 AM

Back to you for discussion

This revision now requires changes to proceed.Aug 17 2017, 7:57 AM
quark added a comment.EditedAug 17 2017, 10:32 AM

The pushvars extension was doing wrapcommand('push', ...). Now the pushvars logic is in core Mecurial push command. remotenames bypasses the entire core Mercurial push command implementation when --to is provided.

ryanmce accepted this revision.Aug 17 2017, 2:51 PM

Yuck. Oh well.

This revision is now accepted and ready to land.Aug 17 2017, 2:51 PM
ryanmce added a comment.Aug 18 2017, 6:48 AM

This is now in our hotfixes while we wait for the core changes to get in to unblock this stuff.

quark updated this revision to Diff 1176.Aug 22 2017, 11:55 PM
quark closed this revision.Sep 10 2017, 7:08 PM

Revision Contents
Changeset List

PathPackages
Mremotenames.py (10 lines)

Diff 1176

remotenames.py

return (checkout, movemarkfrom) return (checkout, movemarkfrom)
def expush(orig, repo, remote, *args, **kwargs): def expush(orig, repo, remote, *args, **kwargs):
res = orig(repo, remote, *args, **kwargs) res = orig(repo, remote, *args, **kwargs)
pullremotenames(repo, remote, remote.listkeys('bookmarks')) pullremotenames(repo, remote, remote.listkeys('bookmarks'))
return res return res
def expushop(orig, pushop, repo, remote, force=False, revs=None, def expushop(orig, pushop, repo, remote, force=False, revs=None,
newbranch=False, bookmarks=(), **kwargs): newbranch=False, bookmarks=(), pushvars=None, **kwargs):
orig(pushop, repo, remote, force, revs, newbranch, bookmarks) orig(pushop, repo, remote, force, revs, newbranch, bookmarks, pushvars)
for flag in ['to', 'delete', 'create', 'allowanon', 'nonforwardmove']: for flag in ['to', 'delete', 'create', 'allowanon', 'nonforwardmove']:
setattr(pushop, flag, kwargs.pop(flag, None)) setattr(pushop, flag, kwargs.pop(flag, None))
def _isselectivepull(ui): def _isselectivepull(ui):
return ui.configbool('remotenames', 'selectivepull', False) return ui.configbool('remotenames', 'selectivepull', False)
def _getselectivepulldefaultbookmarks(ui): def _getselectivepulldefaultbookmarks(ui):
if opts.get('bookmark'): if opts.get('bookmark'):
msg = _('do not specify --to/-t and --bookmark/-B at the same time') msg = _('do not specify --to/-t and --bookmark/-B at the same time')
raise error.Abort(msg) raise error.Abort(msg)
if opts.get('branch'): if opts.get('branch'):
msg = _('do not specify --to/-t and --branch/-b at the same time') msg = _('do not specify --to/-t and --branch/-b at the same time')
raise error.Abort(msg) raise error.Abort(msg)
# if we are not using the original push command implementation, make sure
# pushvars is included in opargs
pushvars = opts.get('pushvars')
if pushvars:
opargs['pushvars'] = pushvars
if revs: if revs:
revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
else: else:
revs = _pushrevs(repo, ui, '.') revs = _pushrevs(repo, ui, '.')
if len(revs) != 1: if len(revs) != 1:
msg = _('--to requires exactly one rev to push') msg = _('--to requires exactly one rev to push')
hint = _('use --rev BOOKMARK or omit --rev for current commit (.)') hint = _('use --rev BOOKMARK or omit --rev for current commit (.)')
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)