This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1758

remotenames: add new namespaces for remotebookmarks and remotebranches
ClosedPublic

Authored by pulkit on Dec 25 2017, 3:51 PM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG382aefea8faf: remotenames: add new namespaces for remotebookmarks and remotebranches

Summary

This patch adds two new namespaces which will be enabled by remotenames
extension. The namespaces are remotebookmarks and remotebranches. Adding them
as namespaces will show them in various commands' output such as log, show work.
This will also unable to access changesets using that name.

Tests are also added for the same.

This is a part of moving hgremotenames extension to core.

hgremotenames: https://bitbucket.org/seanfarley/hgremotenames

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.Dec 25 2017, 3:51 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 25 2017, 3:51 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

pulkit added a child revision: D1759: remotenames: introduce new template keywords for remotenames.Dec 25 2017, 3:51 PM

Easiest path is to mark this as experimental, and then we can do an iteration in the next cycle and remove the warning label.

hgext/remotenames.py
187	Hm, I'm not sure if we want to name remote{bookmarks,branches} the same as local ones in log output. It may make sense to defer this until after the freeze, or else mark the remotenames extension as experimental for a cycle.

This revision now requires changes to proceed.Jan 18 2018, 3:06 PM

pulkit added inline comments.Jan 19 2018, 2:39 AM

hgext/remotenames.py
187	I am fine either way.

pulkit added inline comments.Jan 22 2018, 12:53 PM

hgext/remotenames.py
187	Hm, I'm not sure if we want to name remote{bookmarks,branches} the same as local ones in log > output. Does remotebookmark, and remotebranch sounds good?

durin42 added inline comments.Jan 22 2018, 1:10 PM

hgext/remotenames.py
187	Works for me.

martinvonz added a subscriber: martinvonz.Jan 22 2018, 1:14 PM

martinvonz added inline comments.

hgext/remotenames.py
187	Does remotebookmark, and remotebranch sounds good? Will the log output get aligned for these longer names? Should we include a space? "remote bookmark:" looks more user-friendly

pulkit updated this revision to Diff 5147.Feb 2 2018, 2:47 AM

pulkit added inline comments.Feb 2 2018, 2:50 AM

hgext/remotenames.py
187	I made it `remote bookmark` and `remote branch` and the log output does not get aligned. :(

durin42 accepted this revision.Feb 12 2018, 3:26 PM

This revision is now accepted and ready to land.Feb 12 2018, 3:26 PM

Closed by commit rHG382aefea8faf: remotenames: add new namespaces for remotebookmarks and remotebranches (authored by pulkit). · Explain WhyFeb 12 2018, 4:33 PM

This revision was automatically updated to reflect the committed changes.

martinvonz added inline comments.Feb 14 2018, 2:11 AM

tests/test-logexchange.t
130–131	This is pretty hard to read. Should we at least add a space between the label-and-colon and the value?

pulkit added inline comments.Feb 14 2018, 5:04 AM

tests/test-logexchange.t
130–131	I agree with you. I will send a followup for this.

Revision Contents
Changeset List

			Path	Packages
M			hgext/remotenames.py (59 lines)
M			tests/test-logexchange.t (76 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4612		Dec 25 2017, 3:50 PM	★	★
Diff 2	5147		Feb 2 2018, 2:47 AM	★	★
Diff 3	5523	rHG382aefea8fafdd1e31606f26d1c03dd827558854	Dec 23 2017, 3:54 AM	★	★

Status	Author	Revision
Closed	pulkit	D2002 remotenames: add three new revsets related to remotenames
Closed	pulkit	D1759 remotenames: introduce new template keywords for remotenames
Closed	pulkit	D1758 remotenames: add new namespaces for remotebookmarks and remotebranches
Closed	pulkit	D1757 remotenames: introduce a class to lazily resolve remotnames
Closed	pulkit	D1756 remotenames: introduce class to encapsulate remotenames info in an extension
Closed	pulkit	D1755 logexchange: introduce helper function to get remote path name

Diff 5147

hgext/remotenames.py

	# remotenames.py - extension to display remotenames			# remotenames.py - extension to display remotenames
	#			#
	# Copyright 2017 Augie Fackler <raf@durin42.com>			# Copyright 2017 Augie Fackler <raf@durin42.com>
	# Copyright 2017 Sean Farley <sean@farley.io>			# Copyright 2017 Sean Farley <sean@farley.io>
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	""" showing remotebookmarks and remotebranches in UI """			""" showing remotebookmarks and remotebranches in UI

				By default both remotebookmarks and remotebranches are turned on. Config knob to
				control the individually are as follows.

				Config options to tweak the default behaviour:

				remotenames.bookmarks
				Boolean value to enable or disable showing of remotebookmarks

				remotenames.branches
				Boolean value to enable or disable showing of remotebranches
				"""

	from __future__ import absolute_import			from __future__ import absolute_import

	import UserDict			import UserDict

	from mercurial.node import (			from mercurial.node import (
	bin,			bin,
	)			)
	from mercurial import (			from mercurial import (
	logexchange,			logexchange,
				namespaces,
				registrar,
	)			)

	# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for			# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
	# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should			# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
	# be specifying the version(s) of Mercurial they are tested with, or			# be specifying the version(s) of Mercurial they are tested with, or
	# leave the attribute unspecified.			# leave the attribute unspecified.
	testedwith = 'ships-with-hg-core'			testedwith = 'ships-with-hg-core'

				configtable = {}
				configitem = registrar.configitem(configtable)

				configitem('remotenames', 'bookmarks',
				default=True,
				)
				configitem('remotenames', 'branches',
				default=True,
				)

	class lazyremotenamedict(UserDict.DictMixin):			class lazyremotenamedict(UserDict.DictMixin):
	"""			"""
	Read-only dict-like Class to lazily resolve remotename entries			Read-only dict-like Class to lazily resolve remotename entries

	We are doing that because remotenames startup was slow.			We are doing that because remotenames startup was slow.
	We lazily read the remotenames file once to figure out the potential entries			We lazily read the remotenames file once to figure out the potential entries
	and store them in self.potentialentries. Then when asked to resolve an			and store them in self.potentialentries. Then when asked to resolve an
	entry, if it is not in self.potentialentries, then it isn't there, if it			entry, if it is not in self.potentialentries, then it isn't there, if it
	def nodetobranch(self):			def nodetobranch(self):
	if not self._nodetobranch:			if not self._nodetobranch:
	branchtonodes = self.branchtonodes()			branchtonodes = self.branchtonodes()
	self._nodetobranch = {}			self._nodetobranch = {}
	for name, nodes in branchtonodes.iteritems():			for name, nodes in branchtonodes.iteritems():
	for node in nodes:			for node in nodes:
	self._nodetobranch.setdefault(node, []).append(name)			self._nodetobranch.setdefault(node, []).append(name)
	return self._nodetobranch			return self._nodetobranch

				def reposetup(ui, repo):
				if not repo.local():
				return

				repo._remotenames = remotenames(repo)
				ns = namespaces.namespace

				if ui.configbool('remotenames', 'bookmarks'):
				remotebookmarkns = ns(
				'remotebookmarks',
				templatename='remotebookmarks',
				logname='remote bookmark',
				durin42Unsubmitted Not Done Hm, I'm not sure if we want to name remote{bookmarks,branches} the same as local ones in log output. It may make sense to defer this until after the freeze, or else mark the remotenames extension as experimental for a cycle. durin42: Hm, I'm not sure if we want to name remote{bookmarks,branches} the same as local ones in log…
				pulkitAuthorUnsubmitted Not Done I am fine either way. pulkit: I am fine either way.
				pulkitAuthorUnsubmitted Not Done Hm, I'm not sure if we want to name remote{bookmarks,branches} the same as local ones in log > output. Does remotebookmark, and remotebranch sounds good? pulkit: > Hm, I'm not sure if we want to name remote{bookmarks,branches} the same as local ones in log…
				durin42Unsubmitted Not Done Works for me. durin42: Works for me.
				martinvonzUnsubmitted Not Done Does remotebookmark, and remotebranch sounds good? Will the log output get aligned for these longer names? Should we include a space? "remote bookmark:" looks more user-friendly martinvonz: > Does remotebookmark, and remotebranch sounds good? Will the log output get aligned for these…
				pulkitAuthorUnsubmitted Not Done I made it `remote bookmark` and `remote branch` and the log output does not get aligned. :( pulkit: I made it `remote bookmark` and `remote branch` and the log output does not get aligned. :(
				colorname='remotebookmark',
				listnames=lambda repo: repo._remotenames.bmarktonodes().keys(),
				namemap=lambda repo, name:
				repo._remotenames.bmarktonodes().get(name, []),
				nodemap=lambda repo, node:
				repo._remotenames.nodetobmarks().get(node, []))
				repo.names.addnamespace(remotebookmarkns)

				if ui.configbool('remotenames', 'branches'):
				remotebranchns = ns(
				'remotebranches',
				templatename='remotebranches',
				logname='remote branch',
				colorname='remotebranch',
				listnames = lambda repo: repo._remotenames.branchtonodes().keys(),
				namemap = lambda repo, name:
				repo._remotenames.branchtonodes().get(name, []),
				nodemap = lambda repo, node:
				repo._remotenames.nodetobranch().get(node, []))
				repo.names.addnamespace(remotebranchns)

tests/test-logexchange.t

	Testing the functionality to pull remotenames			Testing the functionality to pull remotenames
	=============================================			=============================================

	$ cat >> $HGRCPATH << EOF			$ cat >> $HGRCPATH << EOF
	> [alias]			> [alias]
	> glog = log -G -T '{rev}:{node\|short} {desc}'			> glog = log -G -T '{rev}:{node\|short} {desc}'
	> [experimental]			> [experimental]
	> remotenames = True			> remotenames = True
				> [extensions]
				> remotenames =
				> show =
	> EOF			> EOF

	Making a server repo			Making a server repo
	--------------------			--------------------

	$ hg init server			$ hg init server
	$ cd server			$ cd server
	$ for ch in a b c d e f g h; do			$ for ch in a b c d e f g h; do
	62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc)			62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc)

	$ cat .hg/logexchange/branches			$ cat .hg/logexchange/branches
	0			0

	ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc)			ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc)
	3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc)			3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc)

				$ hg show work
				o 3e14 (wat) (default/wat) added bar
				\|
				~
				@ ec24 (default/default) Added h
				\|
				~

				$ hg update "default/wat"
				1 files updated, 0 files merged, 3 files removed, 0 files unresolved
				$ hg identify
				3e1487808078 (wat) tip

	Making a new server			Making a new server
	-------------------			-------------------

	$ cd ..			$ cd ..
	$ hg init server2			$ hg init server2
	$ cd server2			$ cd server2
	$ hg pull ../server/			$ hg pull ../server/
	pulling from ../server/			pulling from ../server/

	$ cat .hg/logexchange/branches			$ cat .hg/logexchange/branches
	0			0

	3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc)			3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc)
	ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc)			ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc)
	ec2426147f0e39dbc9cef599b066be6035ce691d\x00$TESTTMP/server2\x00default (esc)			ec2426147f0e39dbc9cef599b066be6035ce691d\x00$TESTTMP/server2\x00default (esc)
	3e1487808078543b0af6d10dadf5d46943578db0\x00$TESTTMP/server2\x00wat (esc)			3e1487808078543b0af6d10dadf5d46943578db0\x00$TESTTMP/server2\x00wat (esc)

				$ hg log -G
				@ changeset: 8:3e1487808078
				\| branch: wat
				\| tag: tip
				\| remote branch:$TESTTMP/server2/wat
				\| remote branch:default/wat
				martinvonzUnsubmitted Not Done This is pretty hard to read. Should we at least add a space between the label-and-colon and the value? martinvonz: This is pretty hard to read. Should we at least add a space between the label-and-colon and the…
				pulkitAuthorUnsubmitted Not Done I agree with you. I will send a followup for this. pulkit: I agree with you. I will send a followup for this.
				\| parent: 4:aa98ab95a928
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: added bar
				\|
				\| o changeset: 7:ec2426147f0e
				\| \| remote branch:$TESTTMP/server2/default
				\| \| remote branch:default/default
				\| \| user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| summary: Added h
				\| \|
				\| o changeset: 6:87d6d6676308
				\| \| bookmark: bar
				\| \| remote bookmark:$TESTTMP/server2/bar
				\| \| remote bookmark:default/bar
				\| \| user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| summary: Added g
				\| \|
				\| o changeset: 5:825660c69f0c
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: Added f
				\|
				o changeset: 4:aa98ab95a928
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: Added e
				\|
				o changeset: 3:62615734edd5
				\| bookmark: foo
				\| remote bookmark:$TESTTMP/server2/foo
				\| remote bookmark:default/foo
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: Added d
				\|
				o changeset: 2:28ad74487de9
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: Added c
				\|
				o changeset: 1:29becc82797a
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: Added b
				\|
				o changeset: 0:18d04c59bb5d
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added a