This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2107

infinitepush: drop the `--create` flag to push command
ClosedPublic

Authored by pulkit on Feb 9 2018, 6:47 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG78c2e9418278: infinitepush: drop the `--create` flag to push command
Summary

The extension added a --create flag for creating a new bookmark on the
bundlestore. This patch changes the bahviour to create a bookmark if it does not
exists and removes the requirement of the --create and then drop the logic
around the --create flag.

Tests are changed to drop the usage of --create flag.

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.Feb 9 2018, 6:47 AM
indygreg accepted this revision.Feb 9 2018, 10:08 PM
This revision is now accepted and ready to land.Feb 9 2018, 10:08 PM
Closed by commit rHG78c2e9418278: infinitepush: drop the `--create` flag to push command (authored by pulkit). · Explain WhyMar 30 2018, 3:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7423

hgext/infinitepush/__init__.py

default='', default='',
) )
configitem('infinitepush', 'metadatafilelimit', configitem('infinitepush', 'metadatafilelimit',
default=100, default=100,
) )
configitem('experimental', 'server-bundlestore-bookmark', configitem('experimental', 'server-bundlestore-bookmark',
default='', default='',
) )
configitem('experimental', 'server-bundlestore-create',
default='',
)
configitem('experimental', 'infinitepush-scratchpush', configitem('experimental', 'infinitepush-scratchpush',
default=False, default=False,
) )
configitem('experimental', 'non-forward-move', configitem('experimental', 'non-forward-move',
default=False, default=False,
) )
experimental = 'experimental' experimental = 'experimental'
configbookmark = 'server-bundlestore-bookmark' configbookmark = 'server-bundlestore-bookmark'
configcreate = 'server-bundlestore-create'
configscratchpush = 'infinitepush-scratchpush' configscratchpush = 'infinitepush-scratchpush'
confignonforwardmove = 'non-forward-move' confignonforwardmove = 'non-forward-move'
scratchbranchparttype = bundleparts.scratchbranchparttype scratchbranchparttype = bundleparts.scratchbranchparttype
cmdtable = infinitepushcommands.cmdtable cmdtable = infinitepushcommands.cmdtable
revsetpredicate = registrar.revsetpredicate() revsetpredicate = registrar.revsetpredicate()
templatekeyword = registrar.templatekeyword() templatekeyword = registrar.templatekeyword()
_scratchbranchmatcher = lambda x: False _scratchbranchmatcher = lambda x: False
if not any(a for a in entry[1] if a[1] == 'to'): if not any(a for a in entry[1] if a[1] == 'to'):
entry[1].append(('', 'to', '', _('push revs to this bookmark'))) entry[1].append(('', 'to', '', _('push revs to this bookmark')))
if not any(a for a in entry[1] if a[1] == 'non-forward-move'): if not any(a for a in entry[1] if a[1] == 'non-forward-move'):
entry[1].append(('', 'non-forward-move', None, entry[1].append(('', 'non-forward-move', None,
_('allows moving a remote bookmark to an ' _('allows moving a remote bookmark to an '
'arbitrary place'))) 'arbitrary place')))
if not any(a for a in entry[1] if a[1] == 'create'):
entry[1].append(
('', 'create', None, _('create a new remote bookmark')))
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.wrapcommand(commands.table, 'update', _update)
extensions.wrapfunction(discovery, 'checkheads', _checkheads) extensions.wrapfunction(discovery, 'checkheads', _checkheads)
repo._bookmarks.applychanges(repo, tr, changes) repo._bookmarks.applychanges(repo, tr, changes)
def _findcommonincoming(orig, *args, **kwargs): def _findcommonincoming(orig, *args, **kwargs):
common, inc, remoteheads = orig(*args, **kwargs) common, inc, remoteheads = orig(*args, **kwargs)
return common, True, remoteheads return common, True, remoteheads
def _push(orig, ui, repo, dest=None, *args, **opts): def _push(orig, ui, repo, dest=None, *args, **opts):
bookmark = opts.get('to') or '' bookmark = opts.get('to') or ''
create = opts.get('create') or False
oldphasemove = None oldphasemove = None
overrides = {(experimental, configbookmark): bookmark, overrides = {(experimental, configbookmark): bookmark}
(experimental, configcreate): create}
with ui.configoverride(overrides, 'infinitepush'): with ui.configoverride(overrides, 'infinitepush'):
scratchpush = opts.get('bundle_store') scratchpush = opts.get('bundle_store')
if _scratchbranchmatcher(bookmark): if _scratchbranchmatcher(bookmark):
scratchpush = True scratchpush = True
# bundle2 can be sent back after push (for example, bundle2 # bundle2 can be sent back after push (for example, bundle2
# containing `pushkey` part to update bookmarks) # containing `pushkey` part to update bookmarks)
ui.setconfig(experimental, 'bundle2.pushback', True) ui.setconfig(experimental, 'bundle2.pushback', True)
published.""" published."""
if phase != phases.public: if phase != phases.public:
orig(pushop, nodes, phase) orig(pushop, nodes, phase)
@exchange.b2partsgenerator(scratchbranchparttype) @exchange.b2partsgenerator(scratchbranchparttype)
def partgen(pushop, bundler): def partgen(pushop, bundler):
bookmark = pushop.ui.config(experimental, configbookmark) bookmark = pushop.ui.config(experimental, configbookmark)
create = pushop.ui.configbool(experimental, configcreate)
scratchpush = pushop.ui.configbool(experimental, configscratchpush) scratchpush = pushop.ui.configbool(experimental, configscratchpush)
if 'changesets' in pushop.stepsdone or not scratchpush: if 'changesets' in pushop.stepsdone or not scratchpush:
return return
if scratchbranchparttype not in bundle2.bundle2caps(pushop.remote): if scratchbranchparttype not in bundle2.bundle2caps(pushop.remote):
return return
pushop.stepsdone.add('changesets') pushop.stepsdone.add('changesets')
nonforwardmove = pushop.force or pushop.ui.configbool(experimental, nonforwardmove = pushop.force or pushop.ui.configbool(experimental,
confignonforwardmove) confignonforwardmove)
scratchparts = bundleparts.getscratchbranchparts(pushop.repo, scratchparts = bundleparts.getscratchbranchparts(pushop.repo,
pushop.remote, pushop.remote,
pushop.outgoing, pushop.outgoing,
nonforwardmove, nonforwardmove,
pushop.ui, pushop.ui,
bookmark, bookmark)
create)
for scratchpart in scratchparts: for scratchpart in scratchparts:
bundler.addpart(scratchpart) bundler.addpart(scratchpart)
def handlereply(op): def handlereply(op):
# server either succeeds or aborts; no code to read # server either succeeds or aborts; no code to read
pushop.cgresult = 1 pushop.cgresult = 1
bundle = None bundle = None
try: # guards bundle try: # guards bundle
bundlepath = "bundle:%s+%s" % (op.repo.root, bundlefile) bundlepath = "bundle:%s+%s" % (op.repo.root, bundlefile)
bundle = hg.repository(op.repo.ui, bundlepath) bundle = hg.repository(op.repo.ui, bundlepath)
bookmark = params.get('bookmark') bookmark = params.get('bookmark')
bookprevnode = params.get('bookprevnode', '') bookprevnode = params.get('bookprevnode', '')
create = params.get('create')
force = params.get('force') force = params.get('force')
if bookmark: if bookmark:
oldnode = index.getnode(bookmark) oldnode = index.getnode(bookmark)
if not oldnode and not create:
raise error.Abort("unknown bookmark %s" % bookmark,
hint="use --create if you want to create one")
else: else:
oldnode = None oldnode = None
bundleheads = bundle.revs('heads(bundle())') bundleheads = bundle.revs('heads(bundle())')
if bookmark and len(bundleheads) > 1: if bookmark and len(bundleheads) > 1:
raise error.Abort( raise error.Abort(
_('cannot push more than one head to a scratch branch')) _('cannot push more than one head to a scratch branch'))
revs = _getrevs(bundle, oldnode, force, bookmark) revs = _getrevs(bundle, oldnode, force, bookmark)
elapsedms=(time.time() - parthandlerstart) * 1000, elapsedms=(time.time() - parthandlerstart) * 1000,
errormsg=str(e)) errormsg=str(e))
raise raise
finally: finally:
if bundle: if bundle:
bundle.close() bundle.close()
@bundle2.parthandler(scratchbranchparttype, @bundle2.parthandler(scratchbranchparttype,
('bookmark', 'bookprevnode' 'create', 'force', ('bookmark', 'bookprevnode', 'force',
'pushbackbookmarks', 'cgversion')) 'pushbackbookmarks', 'cgversion'))
def bundle2scratchbranch(op, part): def bundle2scratchbranch(op, part):
'''unbundle a bundle2 part containing a changegroup to store''' '''unbundle a bundle2 part containing a changegroup to store'''
bundler = bundle2.bundle20(op.repo.ui) bundler = bundle2.bundle20(op.repo.ui)
cgversion = part.params.get('cgversion', '01') cgversion = part.params.get('cgversion', '01')
cgpart = bundle2.bundlepart('changegroup', data=part.read()) cgpart = bundle2.bundlepart('changegroup', data=part.read())
cgpart.addparam('version', cgversion) cgpart.addparam('version', cgversion)

hgext/infinitepush/bundleparts.py

from . import common from . import common
isremotebooksenabled = common.isremotebooksenabled isremotebooksenabled = common.isremotebooksenabled
scratchbranchparttype = 'b2x:infinitepush' scratchbranchparttype = 'b2x:infinitepush'
def getscratchbranchparts(repo, peer, outgoing, confignonforwardmove, def getscratchbranchparts(repo, peer, outgoing, confignonforwardmove,
ui, bookmark, create): ui, bookmark):
if not outgoing.missing: if not outgoing.missing:
raise error.Abort(_('no commits to push')) raise error.Abort(_('no commits to push'))
if scratchbranchparttype not in bundle2.bundle2caps(peer): if scratchbranchparttype not in bundle2.bundle2caps(peer):
raise error.Abort(_('no server support for %r') % scratchbranchparttype) raise error.Abort(_('no server support for %r') % scratchbranchparttype)
_validaterevset(repo, revsetlang.formatspec('%ln', outgoing.missing), _validaterevset(repo, revsetlang.formatspec('%ln', outgoing.missing),
bookmark) bookmark)
params = {} params = {}
params['cgversion'] = cgversion params['cgversion'] = cgversion
if bookmark: if bookmark:
params['bookmark'] = bookmark params['bookmark'] = bookmark
# 'prevbooknode' is necessary for pushkey reply part # 'prevbooknode' is necessary for pushkey reply part
params['bookprevnode'] = '' params['bookprevnode'] = ''
if bookmark in repo: if bookmark in repo:
params['bookprevnode'] = repo[bookmark].hex() params['bookprevnode'] = repo[bookmark].hex()
if create:
params['create'] = '1'
if confignonforwardmove: if confignonforwardmove:
params['force'] = '1' params['force'] = '1'
# Do not send pushback bundle2 part with bookmarks if remotenames extension # Do not send pushback bundle2 part with bookmarks if remotenames extension
# is enabled. It will be handled manually in `_push()` # is enabled. It will be handled manually in `_push()`
if not isremotebooksenabled(ui): if not isremotebooksenabled(ui):
params['pushbackbookmarks'] = '1' params['pushbackbookmarks'] = '1'

tests/test-infinitepush-bundlestore.t

Check that we can send a scratch on the server and it does not show there in Check that we can send a scratch on the server and it does not show there in
the history but is stored on disk the history but is stored on disk
$ setupserver $ setupserver
$ cd .. $ cd ..
$ hg clone ssh://user@dummy/repo client -q $ hg clone ssh://user@dummy/repo client -q
$ cd client $ cd client
$ mkcommit initialcommit $ mkcommit initialcommit
$ hg push -r . --create $ hg push -r .
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files
$ mkcommit scratchcommit $ mkcommit scratchcommit
$ hg push -r . --to scratch/mybranch --create $ hg push -r . --to scratch/mybranch
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 commit:
remote: 20759b6926ce scratchcommit remote: 20759b6926ce scratchcommit
$ hg log -G $ hg log -G
@ changeset: 1:20759b6926ce @ changeset: 1:20759b6926ce
| bookmark: scratch/mybranch | bookmark: scratch/mybranch
| tag: tip | tag: tip
$ scratchnodes $ scratchnodes
1de1d7d92f8965260391d0513fe8a8d5973d3042 bed63daed3beba97fff2e819a148cf415c217a85 1de1d7d92f8965260391d0513fe8a8d5973d3042 bed63daed3beba97fff2e819a148cf415c217a85
20759b6926ce827d5a8c73eb1fa9726d6f7defb2 bed63daed3beba97fff2e819a148cf415c217a85 20759b6926ce827d5a8c73eb1fa9726d6f7defb2 bed63daed3beba97fff2e819a148cf415c217a85
$ scratchbookmarks $ scratchbookmarks
scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042
Push scratch bookmark with no new revs Push scratch bookmark with no new revs
$ hg push -r . --to scratch/anotherbranch --create $ hg push -r . --to scratch/anotherbranch
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 2 commits: remote: pushing 2 commits:
remote: 20759b6926ce scratchcommit remote: 20759b6926ce scratchcommit
remote: 1de1d7d92f89 new scratch commit remote: 1de1d7d92f89 new scratch commit
$ hg log -G -T '{desc} {phase} {bookmarks}' $ hg log -G -T '{desc} {phase} {bookmarks}'
@ new scratch commit draft scratch/anotherbranch scratch/mybranch @ new scratch commit draft scratch/anotherbranch scratch/mybranch
| |

tests/test-infinitepush.t

Create two new scratch bookmarks Create two new scratch bookmarks
$ hg up 0 $ hg up 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo scratchfirstpart > scratchfirstpart $ echo scratchfirstpart > scratchfirstpart
$ hg ci -Am "scratchfirstpart" $ hg ci -Am "scratchfirstpart"
adding scratchfirstpart adding scratchfirstpart
created new head created new head
$ hg push -r . --to scratch/firstpart --create $ hg push -r . --to scratch/firstpart
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 commit:
remote: 176993b87e39 scratchfirstpart remote: 176993b87e39 scratchfirstpart
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo scratchsecondpart > scratchsecondpart $ echo scratchsecondpart > scratchsecondpart
$ hg ci -Am "scratchsecondpart" $ hg ci -Am "scratchsecondpart"
adding scratchsecondpart adding scratchsecondpart
created new head created new head
$ hg push -r . --to scratch/secondpart --create $ hg push -r . --to scratch/secondpart
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 commit:
remote: 8db3891c220e scratchsecondpart remote: 8db3891c220e scratchsecondpart
Pull two bookmarks from the second client Pull two bookmarks from the second client
$ cd .. $ cd ..
$ hg clone ssh://user@dummy/repo client2 -q $ hg clone ssh://user@dummy/repo client2 -q
$ echo testpullbycommithash1 > testpullbycommithash1 $ echo testpullbycommithash1 > testpullbycommithash1
$ hg ci -Am "testpullbycommithash1" $ hg ci -Am "testpullbycommithash1"
adding testpullbycommithash1 adding testpullbycommithash1
created new head created new head
$ hg log -r '.' -T '{node}\n' > ../testpullbycommithash1 $ hg log -r '.' -T '{node}\n' > ../testpullbycommithash1
$ echo testpullbycommithash2 > testpullbycommithash2 $ echo testpullbycommithash2 > testpullbycommithash2
$ hg ci -Aqm "testpullbycommithash2" $ hg ci -Aqm "testpullbycommithash2"
$ hg push -r . --to scratch/mybranch --create -q $ hg push -r . --to scratch/mybranch -q
Create third client and pull by commit hash. Create third client and pull by commit hash.
Make sure testpullbycommithash2 has not fetched Make sure testpullbycommithash2 has not fetched
$ cd .. $ cd ..
$ hg clone ssh://user@dummy/repo client3 -q $ hg clone ssh://user@dummy/repo client3 -q
$ cd client3 $ cd client3
$ hg pull -r `cat ../testpullbycommithash1` $ hg pull -r `cat ../testpullbycommithash1`
pulling from ssh://user@dummy/repo pulling from ssh://user@dummy/repo
| o testpullbycommithash1 draft 33910bfe6ffe | o testpullbycommithash1 draft 33910bfe6ffe
|/ |/
@ initialcommit public 67145f466344 @ initialcommit public 67145f466344
$ hg up a79b6597f322 $ hg up a79b6597f322
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo scratchontopofpublic > scratchontopofpublic $ echo scratchontopofpublic > scratchontopofpublic
$ hg ci -Aqm "scratchontopofpublic" $ hg ci -Aqm "scratchontopofpublic"
$ hg push -r . --to scratch/scratchontopofpublic --create $ hg push -r . --to scratch/scratchontopofpublic
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 1 commit: remote: pushing 1 commit:
remote: c70aee6da07d scratchontopofpublic remote: c70aee6da07d scratchontopofpublic
$ cd ../client2 $ cd ../client2
$ hg pull -B scratch/scratchontopofpublic $ hg pull -B scratch/scratchontopofpublic
pulling from ssh://user@dummy/repo pulling from ssh://user@dummy/repo
searching for changes searching for changes
> [infinitepush] > [infinitepush]
> fillmetadatabranchpattern=re:scratch/fillmetadata/.* > fillmetadatabranchpattern=re:scratch/fillmetadata/.*
> EOF > EOF
$ cd ../client $ cd ../client
$ echo tofillmetadata > tofillmetadata $ echo tofillmetadata > tofillmetadata
$ hg ci -Aqm "tofillmetadata" $ hg ci -Aqm "tofillmetadata"
$ hg log -r . -T '{node}\n' $ hg log -r . -T '{node}\n'
d2b0410d4da084bc534b1d90df0de9eb21583496 d2b0410d4da084bc534b1d90df0de9eb21583496
$ hg push -r . --to scratch/fillmetadata/fill --create $ hg push -r . --to scratch/fillmetadata/fill
pushing to ssh://user@dummy/repo pushing to ssh://user@dummy/repo
searching for changes searching for changes
remote: pushing 6 commits: remote: pushing 6 commits:
remote: 33910bfe6ffe testpullbycommithash1 remote: 33910bfe6ffe testpullbycommithash1
remote: d8fde0ddfc96 testpullbycommithash2 remote: d8fde0ddfc96 testpullbycommithash2
remote: 3edfe7e9089a add and rm files remote: 3edfe7e9089a add and rm files
remote: c7ac39f638c6 cpfile and mvfile remote: c7ac39f638c6 cpfile and mvfile
remote: 09904fb20c53 add many files remote: 09904fb20c53 add many files
remote: d2b0410d4da0 tofillmetadata remote: d2b0410d4da0 tofillmetadata
Make sure background process finished Make sure background process finished
$ sleep 3 $ sleep 3
$ cd ../repo $ cd ../repo
$ cat .hg/scratchbranches/index/nodemetadatamap/d2b0410d4da084bc534b1d90df0de9eb21583496 $ cat .hg/scratchbranches/index/nodemetadatamap/d2b0410d4da084bc534b1d90df0de9eb21583496
{"changed_files": {"tofillmetadata": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}}} (no-eol) {"changed_files": {"tofillmetadata": {"adds": 1, "isbinary": false, "removes": 0, "status": "added"}}} (no-eol)