This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2875

remotenames: introduce a config option to allow creation of remote bookmarks
Needs RevisionPublic

Authored by pulkit on Mar 15 2018, 9:49 AM.

Details

Reviewers
indygreg
marmoute
Group Reviewers
hg-reviewers
Summary

This patch introduces another config option which if set to true, we can create
new bookmarks on the server using push command. An earlier patch added
capability to push to a certain bookmark on the server. If bookmark was not
already present on the server, we errored out. With
remotenames.createremotebookmark config set, the push will create that bookmark
on the server.

This series serves as a great feature for people who use bookmarks as after this
you can push changesets to a bookmark which does not exists locally. In other
words, you can push your changesets to a bookmark without having it locally.

This series will help people in having a non-local bookmark workflow involving
remotenames.

The functionality added in this patch is equivalent to --create flag to push
command added by hgremotenames extension.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Mar 15 2018, 9:49 AM
pulkit updated this revision to Diff 7105.Mar 19 2018, 4:36 AM
pulkit updated this revision to Diff 7251.Mar 22 2018, 3:35 AM
pulkit updated this revision to Diff 7288.Mar 26 2018, 7:47 AM
indygreg accepted this revision.Apr 11 2018, 1:35 PM
This revision is now accepted and ready to land.Apr 11 2018, 1:35 PM
marmoute requested changes to this revision.Apr 22 2020, 11:57 AM
marmoute added a subscriber: marmoute.

Baymax does not catch stuff in Accepted state, but this diff is over 2 years old, so resubmit if still relevant.

This revision now requires changes to proceed.Apr 22 2020, 11:57 AM

Revision Contents
Changeset List

PathPackages
Mhgext/remotenames.py (9 lines)
Mtests/test-logexchange.t (157 lines)

Diff 7288

hgext/remotenames.py

remotenames.pushtobookmark remotenames.pushtobookmark
Boolean value to change the behavior of bookmark passed to push command using Boolean value to change the behavior of bookmark passed to push command using
`-B` flag. If set the true, the changesets will be pushed to that bookmark on `-B` flag. If set the true, the changesets will be pushed to that bookmark on
the server. Errors if bookmark does not exists on the server. If multiple the server. Errors if bookmark does not exists on the server. If multiple
bookmarks are specified using `-B` flag or multiple topological heads are bookmarks are specified using `-B` flag or multiple topological heads are
pushed, fallbacks to default behavior. pushed, fallbacks to default behavior.
(default: False) (default: False)
remotenames.createremotebookmark
Boolean value indicating whether a creating a new bookmark on the server using
remotenames.pushtobookmark config is allowed or not. (default: False)
""" """
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
bin, bin,
default=True, default=True,
) )
configitem('remotenames', 'hoistedpeer', configitem('remotenames', 'hoistedpeer',
default='default', default='default',
) )
configitem('remotenames', 'pushtobookmark', configitem('remotenames', 'pushtobookmark',
default=False, default=False,
) )
configitem('remotenames', 'createremotebookmark',
default=False,
)
def expushdiscoverybookmarks(pushop): def expushdiscoverybookmarks(pushop):
# config not set, fallback to normal push behavior # config not set, fallback to normal push behavior
if not pushop.repo.ui.configbool('remotenames', 'pushtobookmark'): if not pushop.repo.ui.configbool('remotenames', 'pushtobookmark'):
return exchange._pushdiscoverybookmarks(pushop) return exchange._pushdiscoverybookmarks(pushop)
# either zero or more than one bookmarks specified, fallback to normal # either zero or more than one bookmarks specified, fallback to normal
# push behavior, maybe we should error out in case of multiple bookmarks # push behavior, maybe we should error out in case of multiple bookmarks
pushop.repo.ui.debug("pushing multiple topological heads, falling back " pushop.repo.ui.debug("pushing multiple topological heads, falling back "
"to default push behavior\n") "to default push behavior\n")
return exchange._pushdiscoverybookmarks(pushop) return exchange._pushdiscoverybookmarks(pushop)
rev = pushop.repo[headrevs.first()] rev = pushop.repo[headrevs.first()]
old = '' old = ''
if bookmark in remotemarks: if bookmark in remotemarks:
old = remotemarks[bookmark] old = remotemarks[bookmark]
else: elif not pushop.repo.ui.configbool('remotenames', 'createremotebookmark'):
msg = _("bookmark '%s' does not exists on remote") msg = _("bookmark '%s' does not exists on remote")
raise error.Abort(msg % bookmark) raise error.Abort(msg % bookmark)
pushop.outbookmarks.append((bookmark, old, rev.hex())) pushop.outbookmarks.append((bookmark, old, rev.hex()))
class lazyremotenamedict(mutablemapping): class lazyremotenamedict(mutablemapping):
""" """
Read-only dict-like Class to lazily resolve remotename entries Read-only dict-like Class to lazily resolve remotename entries

tests/test-logexchange.t

| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: Added b | summary: Added b
| |
o changeset: 0:18d04c59bb5d o changeset: 0:18d04c59bb5d
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: Added a summary: Added a
Testing the remotenames.createbookmark config option
$ hg bookmarks -R ../server2/
$TESTTMP/server/bar 6:87d6d6676308
$TESTTMP/server/foo 3:62615734edd5
bar 6:87d6d6676308
foo 3:62615734edd5
$ hg push ../server2/ -B nonexistant
pushing to ../server2/
searching for changes
abort: bookmark 'nonexistant' does not exists on remote
[255]
$ hg push ../server2/ -r . -B nonexistant --config remotenames.createremotebookmark=True
pushing to ../server2/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
exporting bookmark nonexistant
$ hg bookmarks -R ../server2/
$TESTTMP/server/bar 6:87d6d6676308
$TESTTMP/server/foo 3:62615734edd5
bar 6:87d6d6676308
foo 3:62615734edd5
nonexistant 9:aa6a885086c0
$ hg log -R ../server2/ -r tip
changeset: 9:aa6a885086c0
branch: wat
bookmark: nonexistant
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: added foobar
Check synchornising of remotenames after push
$ hg log -G -r .
@ changeset: 9:aa6a885086c0
| branch: wat
~ tag: tip
remote bookmark: $TESTTMP/server2/nonexistant
remote bookmark: default/foo
hoisted name: foo
remote branch: $TESTTMP/server2/wat
remote branch: default/wat
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: added foobar
More testing of remotenames.pushtobookmark config option More testing of remotenames.pushtobookmark config option
--------------------------------------------------------- ---------------------------------------------------------
restarting with new server and client repo restarting with new server and client repo
$ cd .. $ cd ..
$ rm server/ -rf $ rm server/ -rf
$ rm server2/ -rf $ rm server2/ -rf
$ rm client/ -rf $ rm client/ -rf
| o 3:8be98ac1a569 added c | o 3:8be98ac1a569 added c
| | () | | ()
@ | 2:fa7447a9d391 added x @ | 2:fa7447a9d391 added x
| | () | | ()
| o 1:80e6d2c47cfe added b | o 1:80e6d2c47cfe added b
|/ () |/ ()
o 0:f7ad41964313 added a o 0:f7ad41964313 added a
() ()
Testing createbookmark when pushing multiple heads
$ echo zoo > zoo
$ hg ci -Aqm "added zoo"
$ hg up 4
2 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ echo d > d
$ hg ci -Aqm "added d"
$ hg glog
@ 7:42dc4f6117ef added d
| ()
| o 6:07ea181fe329 added zoo
| | ()
| o 5:e8d0567f11cf added z
| | ()
o | 4:8be98ac1a569 added c
| | ()
| o 3:dc7d5acf2389 added y
| | ()
| o 2:fa7447a9d391 added x
| | (bm1)
o | 1:80e6d2c47cfe added b
|/ ()
o 0:f7ad41964313 added a
()
$ echo '[remotenames]' >> .hg/hgrc
$ echo 'createremotebookmark = True' >> .hg/hgrc
pushing multiple heads leads to default behavior
$ hg push -B newbm -r 7 -r 6 ../server
pushing to ../server
searching for changes
bookmark newbm does not exist on the local or remote repository!
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
[2]
bookmark is not pushed to the server
$ hg glog -R ../server
o 7:42dc4f6117ef added d
| ()
| o 6:07ea181fe329 added zoo
| | ()
| o 5:e8d0567f11cf added z
| | (bm1)
| o 4:dc7d5acf2389 added y
| | ()
o | 3:8be98ac1a569 added c
| | ()
| @ 2:fa7447a9d391 added x
| | ()
o | 1:80e6d2c47cfe added b
|/ ()
o 0:f7ad41964313 added a
()
Pushing multiple revs by specifying multiple -r but only one head
$ for ch in e f; do echo foo > $ch; hg ci -Aqm "added "$ch; done;
$ hg glog -r 7::
@ 9:77bb50a270c5 added f
| ()
o 8:f48de4b3d95a added e
| ()
o 7:42dc4f6117ef added d
| ()
~
$ hg push -r 8 -r 9 -B newbm ../server
pushing to ../server
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
exporting bookmark newbm
bookmark is on the hedmost rev of revs which were pushed
$ hg glog -R ../server
o 9:77bb50a270c5 added f
| (newbm)
o 8:f48de4b3d95a added e
| ()
o 7:42dc4f6117ef added d
| ()
| o 6:07ea181fe329 added zoo
| | ()
| o 5:e8d0567f11cf added z
| | (bm1)
| o 4:dc7d5acf2389 added y
| | ()
o | 3:8be98ac1a569 added c
| | ()
| @ 2:fa7447a9d391 added x
| | ()
o | 1:80e6d2c47cfe added b
|/ ()
o 0:f7ad41964313 added a
()