This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2954

infinitepush: drop the wrapping of update command on client side
ClosedPublic

Authored by pulkit on Mar 27 2018, 8:37 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG95cc57a74363: infinitepush: drop the wrapping of update command on client side
Summary

The extension wraps update command to client side to add functionality to pull
and checkout to a revision if it does not present locally. There is a twist to
that, only changesets which can resolve to remotenames can be pulled using this.

Diff Detail

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

Event Timeline

pulkit created this revision.Mar 27 2018, 8:37 AM
indygreg accepted this revision.Mar 30 2018, 1:55 PM
This revision is now accepted and ready to land.Mar 30 2018, 1:55 PM
Closed by commit rHG95cc57a74363: infinitepush: drop the wrapping of update command on client side (authored by pulkit). · Explain WhyMar 30 2018, 3:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7426

hgext/infinitepush/__init__.py

import errno import errno
import functools import functools
import logging import logging
import os import os
import random import random
import re import re
import socket import socket
import subprocess import subprocess
import sys
import tempfile import tempfile
import time import time
from mercurial.node import ( from mercurial.node import (
bin, bin,
hex, hex,
) )
_('allows moving a remote bookmark to an ' _('allows moving a remote bookmark to an '
'arbitrary place'))) 'arbitrary place')))
entry[1].append( entry[1].append(
('', 'bundle-store', None, ('', 'bundle-store', None,
_('force push to go to bundle store (EXPERIMENTAL)'))) _('force push to go to bundle store (EXPERIMENTAL)')))
extensions.wrapcommand(commands.table, 'pull', _pull) extensions.wrapcommand(commands.table, 'pull', _pull)
extensions.wrapcommand(commands.table, 'update', _update)
extensions.wrapfunction(discovery, 'checkheads', _checkheads) extensions.wrapfunction(discovery, 'checkheads', _checkheads)
wireproto.wirepeer.listkeyspatterns = listkeyspatterns wireproto.wirepeer.listkeyspatterns = listkeyspatterns
partorder = exchange.b2partsgenorder partorder = exchange.b2partsgenorder
index = partorder.index('changeset') index = partorder.index('changeset')
partorder.insert( partorder.insert(
except Exception as inst: except Exception as inst:
if repo.bundlestore.index.getbundle(localkey): if repo.bundlestore.index.getbundle(localkey):
return "%s %s\n" % (1, localkey) return "%s %s\n" % (1, localkey)
else: else:
r = str(inst) r = str(inst)
return "%s %s\n" % (0, r) return "%s %s\n" % (0, r)
return _lookup return _lookup
def _update(orig, ui, repo, node=None, rev=None, **opts):
if rev and node:
raise error.Abort(_("please specify just one revision"))
if not opts.get('date') and (rev or node) not in repo:
mayberemote = rev or node
mayberemote = _tryhoist(ui, mayberemote)
dopull = False
kwargs = {}
if _scratchbranchmatcher(mayberemote):
dopull = True
kwargs['bookmark'] = [mayberemote]
elif len(mayberemote) == 40 and _maybehash(mayberemote):
dopull = True
kwargs['rev'] = [mayberemote]
if dopull:
ui.warn(
_("'%s' does not exist locally - looking for it " +
"remotely...\n") % mayberemote)
# Try pulling node from remote repo
try:
cmdname = '^pull'
pullcmd = commands.table[cmdname][0]
pullopts = dict(opt[1:3] for opt in commands.table[cmdname][1])
pullopts.update(kwargs)
pullcmd(ui, repo, **pullopts)
except Exception:
ui.warn(_('pull failed: %s\n') % sys.exc_info()[1])
else:
ui.warn(_("'%s' found remotely\n") % mayberemote)
return orig(ui, repo, node, rev, **opts)
def _pull(orig, ui, repo, source="default", **opts): def _pull(orig, ui, repo, source="default", **opts):
# Copy paste from `pull` command # Copy paste from `pull` command
source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
scratchbookmarks = {} scratchbookmarks = {}
unfi = repo.unfiltered() unfi = repo.unfiltered()
unknownnodes = [] unknownnodes = []
for rev in opts.get('rev', []): for rev in opts.get('rev', []):

tests/test-infinitepush.t

adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets a79b6597f322:c70aee6da07d new changesets a79b6597f322:c70aee6da07d
(run 'hg heads .' to see heads, 'hg merge' to merge) (run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg log -r scratch/scratchontopofpublic -T '{phase}' $ hg log -r scratch/scratchontopofpublic -T '{phase}'
draft (no-eol) draft (no-eol)
Strip scratchontopofpublic commit and do hg update
$ hg log -r tip -T '{node}\n'
c70aee6da07d7cdb9897375473690df3a8563339
$ echo "[extensions]" >> .hg/hgrc
$ echo "strip=" >> .hg/hgrc
$ hg strip -q tip
$ hg up c70aee6da07d7cdb9897375473690df3a8563339
'c70aee6da07d7cdb9897375473690df3a8563339' does not exist locally - looking for it remotely...
pulling from ssh://user@dummy/repo
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets c70aee6da07d
(run 'hg update' to get a working copy)
'c70aee6da07d7cdb9897375473690df3a8563339' found remotely
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
Trying to pull from bad path
$ hg strip -q tip
$ hg --config paths.default=badpath up c70aee6da07d7cdb9897375473690df3a8563339
'c70aee6da07d7cdb9897375473690df3a8563339' does not exist locally - looking for it remotely...
pulling from $TESTTMP/client2/badpath (glob)
pull failed: repository $TESTTMP/client2/badpath not found
abort: unknown revision 'c70aee6da07d7cdb9897375473690df3a8563339'!
[255]
Strip commit and pull it using hg update with bookmark name
$ hg strip -q d8fde0ddfc96
$ hg book -d scratch/mybranch
$ hg up scratch/mybranch
'scratch/mybranch' does not exist locally - looking for it remotely...
pulling from ssh://user@dummy/repo
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 2 files
new changesets d8fde0ddfc96
(run 'hg update' to get a working copy)
'scratch/mybranch' found remotely
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
(activating bookmark scratch/mybranch)
$ hg log -r scratch/mybranch -T '{node}'
d8fde0ddfc962183977f92d2bc52d303b8840f9d (no-eol)