This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1759

remotenames: introduce new template keywords for remotenames
ClosedPublic

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

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG5a53af7d09aa: remotenames: introduce new template keywords for remotenames

Summary

This patch introduces three new template keywords 'remotenames',
'remotebookmarks', 'remotebranches' to show remotenames, remotebookmarks and
remotebranches associated to a changeset.

This is a part of moving hgremotenames extension to core. The remotenames
template keyword was present in the extension and the rest of the two are not
present in the hgremotenames extension and are introduced in this patch.

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

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.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

durin42 accepted this revision.Jan 18 2018, 3:07 PM

This revision is now accepted and ready to land.Jan 18 2018, 3:07 PM

pulkit edited the summary of this revision. (Show Details)Feb 2 2018, 2:48 AM

pulkit retitled this revision from remotenames: introduce a template keyword for remotenames to remotenames: introduce new template keywords for remotenames.

pulkit added a child revision: D2002: remotenames: add three new revsets related to remotenames.

pulkit updated this revision to Diff 5148.

Closed by commit rHG5a53af7d09aa: remotenames: introduce new template keywords for remotenames (authored by pulkit). · Explain WhyFeb 12 2018, 4:33 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4613		Dec 25 2017, 3:51 PM	★	★
Diff 2	5148		Feb 2 2018, 2:47 AM	★	★
Diff 3	5524	rHG5a53af7d09aa7c45b8767d418d4aa925a0f2dee1	Dec 23 2017, 4:43 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 5524

hgext/remotenames.py

	import UserDict			import UserDict

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

	# 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 = {}			configtable = {}
	configitem = registrar.configitem(configtable)			configitem = registrar.configitem(configtable)
				templatekeyword = registrar.templatekeyword()

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

	logname='remote branch',			logname='remote branch',
	colorname='remotebranch',			colorname='remotebranch',
	listnames = lambda repo: repo._remotenames.branchtonodes().keys(),			listnames = lambda repo: repo._remotenames.branchtonodes().keys(),
	namemap = lambda repo, name:			namemap = lambda repo, name:
	repo._remotenames.branchtonodes().get(name, []),			repo._remotenames.branchtonodes().get(name, []),
	nodemap = lambda repo, node:			nodemap = lambda repo, node:
	repo._remotenames.nodetobranch().get(node, []))			repo._remotenames.nodetobranch().get(node, []))
	repo.names.addnamespace(remotebranchns)			repo.names.addnamespace(remotebranchns)

				@templatekeyword('remotenames')
				def remotenameskw(**args):
				""":remotenames: List of strings. List of remote names associated with the
				changeset.
				"""
				args = pycompat.byteskwargs(args)
				repo, ctx = args['repo'], args['ctx']

				remotenames = []
				if 'remotebookmarks' in repo.names:
				remotenames = repo.names['remotebookmarks'].names(repo, ctx.node())

				if 'remotebranches' in repo.names:
				remotenames += repo.names['remotebranches'].names(repo, ctx.node())

				return templatekw.showlist('remotename', remotenames, args,
				plural='remotenames')

				@templatekeyword('remotebookmarks')
				def remotebookmarkskw(**args):
				""":remotebookmarks: List of strings. List of remote bookmarks associated
				with the changeset.
				"""
				args = pycompat.byteskwargs(args)
				repo, ctx = args['repo'], args['ctx']

				remotebmarks = []
				if 'remotebookmarks' in repo.names:
				remotebmarks = repo.names['remotebookmarks'].names(repo, ctx.node())

				return templatekw.showlist('remotebookmark', remotebmarks, args,
				plural='remotebookmarks')

				@templatekeyword('remotebranches')
				def remotebrancheskw(**args):
				""":remotebranches: List of strings. List of remote branches associated
				with the changeset.
				"""
				args = pycompat.byteskwargs(args)
				repo, ctx = args['repo'], args['ctx']

				remotebranches = []
				if 'remotebranches' in repo.names:
				remotebranches = repo.names['remotebranches'].names(repo, ctx.node())

				return templatekw.showlist('remotebranch', remotebranches, args,
				plural='remotebranches')

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 templates provided by remotenames extension

				`remotenames` keyword

				$ hg log -G -T "{rev}:{node\|short} {remotenames}\n"
				@ 8:3e1487808078 $TESTTMP/server2/wat default/wat
				\|
				\| o 7:ec2426147f0e $TESTTMP/server2/default default/default
				\| \|
				\| o 6:87d6d6676308 $TESTTMP/server2/bar default/bar
				\| \|
				\| o 5:825660c69f0c
				\|/
				o 4:aa98ab95a928
				\|
				o 3:62615734edd5 $TESTTMP/server2/foo default/foo
				\|
				o 2:28ad74487de9
				\|
				o 1:29becc82797a
				\|
				o 0:18d04c59bb5d

				`remotebookmarks` and `remotebranches` keywords

				$ hg log -G -T "{rev}:{node\|short} [{remotebookmarks}] ({remotebranches})"
				@ 8:3e1487808078 [] ($TESTTMP/server2/wat default/wat)
				\|
				\| o 7:ec2426147f0e [] ($TESTTMP/server2/default default/default)
				\| \|
				\| o 6:87d6d6676308 [$TESTTMP/server2/bar default/bar] ()
				\| \|
				\| o 5:825660c69f0c [] ()
				\|/
				o 4:aa98ab95a928 [] ()
				\|
				o 3:62615734edd5 [$TESTTMP/server2/foo default/foo] ()
				\|
				o 2:28ad74487de9 [] ()
				\|
				o 1:29becc82797a [] ()
				\|
				o 0:18d04c59bb5d [] ()