This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2277

remotenames: don't use the default value of logfmt for namespaces
ClosedPublic

Authored by pulkit on Feb 15 2018, 7:02 AM.

Download Raw Diff

Details

Reviewers

yuja

Group Reviewers

hg-reviewers

Commits

rHG18e29c65bc5c: remotenames: don't use the default value of logfmt for namespaces

Summary

logfmt is the format which is used to format the log output for that namespace.
This patch passes "remote {bookmark|branch}: %s" as the logfmt. Space is not
added after bookmark and branch to make output consistent with other details.

Still this is not the best output. We may need to wrap getlogcolumns() to change
spacing in the in built columns to match the remotenames one.

lognames are also deleted as they are superseded by logfmt.

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 15 2018, 7:02 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 15 2018, 7:02 AM

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

Looks good, but perhaps we can delete logname superseded by logfmt.

This revision now requires changes to proceed.Feb 16 2018, 7:17 AM

pulkit edited the summary of this revision. (Show Details)Feb 16 2018, 7:33 AM

pulkit updated this revision to Diff 5777.

Closed by commit rHG18e29c65bc5c: remotenames: don't use the default value of logfmt for namespaces (authored by pulkit). · Explain WhyFeb 17 2018, 11:49 PM

This revision was automatically updated to reflect the committed changes.

pulkit (Pulkit Goyal) <phabricator@mercurial-scm.org> writes:

pulkit updated this revision to Diff 5777.
pulkit edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2277?vs=5756&id=5777
REVISION DETAIL
https://phab.mercurial-scm.org/D2277
AFFECTED FILES
hgext/remotenames.py
tests/test-logexchange.t
CHANGE DETAILS
diff --git a/tests/test-logexchange.t b/tests/test-logexchange.t

a/tests/test-logexchange.t

+++ b/tests/test-logexchange.t
@@ -127,24 +127,24 @@
@  changeset:   8:3e1487808078
|  branch:      wat
|  tag:         tip
| remote branch:$TESTTMP/server2/wat

| remote branch:default/wat

+ | remote branch: $TESTTMP/server2/wat
+ | remote branch: default/wat

For archaeological purposes:

This is precisely the reason why I didn't label this as 'remote foo'
because moving the ':' set off my ocd tendencies.

signature.asc832 BDownload

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	5756		Feb 15 2018, 7:02 AM	★	★
Diff 2	5777		Feb 16 2018, 7:33 AM	★	★
Diff 3	5817	rHG18e29c65bc5c1bf42529286c871b4a14c4fff0bf	Feb 15 2018, 6:44 AM	★	★

Diff 5817

hgext/remotenames.py


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

	if ui.configbool('remotenames', 'bookmarks'):			if ui.configbool('remotenames', 'bookmarks'):
	remotebookmarkns = ns(			remotebookmarkns = ns(
	'remotebookmarks',			'remotebookmarks',
	templatename='remotebookmarks',			templatename='remotebookmarks',
	logname='remote bookmark',
	colorname='remotebookmark',			colorname='remotebookmark',
				logfmt='remote bookmark: %s\n',
	listnames=lambda repo: repo._remotenames.bmarktonodes().keys(),			listnames=lambda repo: repo._remotenames.bmarktonodes().keys(),
	namemap=lambda repo, name:			namemap=lambda repo, name:
	repo._remotenames.bmarktonodes().get(name, []),			repo._remotenames.bmarktonodes().get(name, []),
	nodemap=lambda repo, node:			nodemap=lambda repo, node:
	repo._remotenames.nodetobmarks().get(node, []))			repo._remotenames.nodetobmarks().get(node, []))
	repo.names.addnamespace(remotebookmarkns)			repo.names.addnamespace(remotebookmarkns)

	if ui.configbool('remotenames', 'branches'):			if ui.configbool('remotenames', 'branches'):
	remotebranchns = ns(			remotebranchns = ns(
	'remotebranches',			'remotebranches',
	templatename='remotebranches',			templatename='remotebranches',
	logname='remote branch',
	colorname='remotebranch',			colorname='remotebranch',
				logfmt='remote branch: %s\n',
	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')			@templatekeyword('remotenames')

tests/test-logexchange.t

	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			$ hg log -G
	@ changeset: 8:3e1487808078			@ changeset: 8:3e1487808078
	\| branch: wat			\| branch: wat
	\| tag: tip			\| tag: tip
	\| remote branch:$TESTTMP/server2/wat			\| remote branch: $TESTTMP/server2/wat
	\| remote branch:default/wat			\| remote branch: default/wat
	\| parent: 4:aa98ab95a928			\| parent: 4:aa98ab95a928
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: added bar			\| summary: added bar
	\|			\|
	\| o changeset: 7:ec2426147f0e			\| o changeset: 7:ec2426147f0e
	\| \| remote branch:$TESTTMP/server2/default			\| \| remote branch: $TESTTMP/server2/default
	\| \| remote branch:default/default			\| \| remote branch: default/default
	\| \| user: test			\| \| user: test
	\| \| date: Thu Jan 01 00:00:00 1970 +0000			\| \| date: Thu Jan 01 00:00:00 1970 +0000
	\| \| summary: Added h			\| \| summary: Added h
	\| \|			\| \|
	\| o changeset: 6:87d6d6676308			\| o changeset: 6:87d6d6676308
	\| \| bookmark: bar			\| \| bookmark: bar
	\| \| remote bookmark:$TESTTMP/server2/bar			\| \| remote bookmark: $TESTTMP/server2/bar
	\| \| remote bookmark:default/bar			\| \| remote bookmark: default/bar
	\| \| user: test			\| \| user: test
	\| \| date: Thu Jan 01 00:00:00 1970 +0000			\| \| date: Thu Jan 01 00:00:00 1970 +0000
	\| \| summary: Added g			\| \| summary: Added g
	\| \|			\| \|
	\| o changeset: 5:825660c69f0c			\| o changeset: 5:825660c69f0c
	\|/ user: test			\|/ user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: Added f			\| summary: Added f
	\|			\|
	o changeset: 4:aa98ab95a928			o changeset: 4:aa98ab95a928
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: Added e			\| summary: Added e
	\|			\|
	o changeset: 3:62615734edd5			o changeset: 3:62615734edd5
	\| bookmark: foo			\| bookmark: foo
	\| remote bookmark:$TESTTMP/server2/foo			\| remote bookmark: $TESTTMP/server2/foo
	\| remote bookmark:default/foo			\| remote bookmark: default/foo
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: Added d			\| summary: Added d
	\|			\|
	o changeset: 2:28ad74487de9			o changeset: 2:28ad74487de9
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: Added c			\| summary: Added c