This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1607

remotenames: rename related file and storage dir to logexchange
ClosedPublic

Authored by pulkit on Dec 6 2017, 1:57 PM.

Download Raw Diff

Details

Reviewers

krbullock

Group Reviewers

hg-reviewers

Commits

rHGa29fe459fc49: remotenames: rename related file and storage dir to logexchange

Summary

This patch renames remotenames.py to logexchange.py, test-remotenames.t to
test-logexchange.t. Also this patch renames the directory in which the data is
stored from remotenames to logexchange. After this patch, data about bookmarks
and branches from a server we pull is stored in
.hg/logexchange/(bookmarks|branches) files.

Thanks to smf for the suggestion.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.Dec 6 2017, 1:57 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 6 2017, 1:57 PM

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

pulkit added a subscriber: smf.Dec 6 2017, 2:11 PM

pulkit added a subscriber: durin42.Dec 6 2017, 2:22 PM

Can you also rename the file stored by logexchange so it doesn't conflict with the out-of-tree extension?

Thanks!

pulkit edited the summary of this revision. (Show Details)Dec 6 2017, 5:50 PM

pulkit retitled this revision from remotenames: rename the file to logexchange to remotenames: rename related file and storage dir to logexchange.

pulkit updated this revision to Diff 4162.

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

pulkit updated this revision to Diff 4162.
pulkit edited the summary of this revision.
pulkit retitled this revision from "remotenames: rename the file to logexchange" to "remotenames: rename related file and storage dir to logexchange".

This is better than before. Though, I'm still opposed to skipping hgext/.

signature.asc832 BDownload

This doesn't apply cleanly. Can you rebase?

This revision now requires changes to proceed.Dec 8 2017, 11:33 PM

pulkit updated this revision to Diff 4289.Dec 9 2017, 2:32 PM

Closed by commit rHGa29fe459fc49: remotenames: rename related file and storage dir to logexchange (authored by pulkit). · Explain WhyDec 9 2017, 3:59 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/exchange.py (4 lines)
M			mercurial/hg.py (4 lines)
V			mercurial/{logexchange.py ← remotenames.py} (10 lines)
V			mercurial/{remotenames.py → logexchange.py}
V			tests/{test-logexchange.t ← test-remotenames.t} (8 lines)
V			tests/{test-remotenames.t → test-logexchange.t}

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4157		Dec 6 2017, 1:57 PM	★	★
Diff 2	4162		Dec 6 2017, 5:50 PM	★	★
Diff 3	4289		Dec 9 2017, 2:32 PM	★	★
Diff 4	4290	rHGa29fe459fc495801d644348591c8c40bdc65ae71	Dec 6 2017, 1:56 PM	★	★

Diff 4289

mercurial/exchange.py

	)			)
	from . import (			from . import (
	bookmarks as bookmod,			bookmarks as bookmod,
	bundle2,			bundle2,
	changegroup,			changegroup,
	discovery,			discovery,
	error,			error,
	lock as lockmod,			lock as lockmod,
				logexchange,
	obsolete,			obsolete,
	phases,			phases,
	pushkey,			pushkey,
	pycompat,			pycompat,
	remotenames,
	scmutil,			scmutil,
	sslutil,			sslutil,
	streamclone,			streamclone,
	url as urlmod,			url as urlmod,
	util,			util,
	)			)

	urlerr = util.urlerr			urlerr = util.urlerr
	_pullbookmarks(pullop)			_pullbookmarks(pullop)
	_pullobsolete(pullop)			_pullobsolete(pullop)
	pullop.trmanager.close()			pullop.trmanager.close()
	finally:			finally:
	lockmod.release(pullop.trmanager, lock, wlock)			lockmod.release(pullop.trmanager, lock, wlock)

	# storing remotenames			# storing remotenames
	if repo.ui.configbool('experimental', 'remotenames'):			if repo.ui.configbool('experimental', 'remotenames'):
	remotenames.pullremotenames(repo, remote)			logexchange.pullremotenames(repo, remote)

	return pullop			return pullop

	# list of steps to perform discovery before pull			# list of steps to perform discovery before pull
	pulldiscoveryorder = []			pulldiscoveryorder = []

	# Mapping between step name and function			# Mapping between step name and function
	#			#

mercurial/hg.py

	destutil,			destutil,
	discovery,			discovery,
	error,			error,
	exchange,			exchange,
	extensions,			extensions,
	httppeer,			httppeer,
	localrepo,			localrepo,
	lock,			lock,
				logexchange,
	merge as mergemod,			merge as mergemod,
	node,			node,
	phases,			phases,
	remotenames,
	repoview,			repoview,
	scmutil,			scmutil,
	sshpeer,			sshpeer,
	statichttprepo,			statichttprepo,
	ui as uimod,			ui as uimod,
	unionrepo,			unionrepo,
	url,			url,
	util,			util,
	u.passwd = None			u.passwd = None
	defaulturl = bytes(u)			defaulturl = bytes(u)
	fp.write(util.tonativeeol(template % defaulturl))			fp.write(util.tonativeeol(template % defaulturl))
	fp.close()			fp.close()

	destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone')			destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone')

	if ui.configbool('experimental', 'remotenames'):			if ui.configbool('experimental', 'remotenames'):
	remotenames.pullremotenames(destrepo, srcpeer)			logexchange.pullremotenames(destrepo, srcpeer)

	if update:			if update:
	if update is not True:			if update is not True:
	checkout = srcpeer.lookup(update)			checkout = srcpeer.lookup(update)
	uprev = None			uprev = None
	status = None			status = None
	if checkout is not None:			if checkout is not None:
	try:			try:

mercurial/logexchange.py

This file was moved from mercurial/remotenames.py.

	# remotenames.py			# logexchange.py
	#			#
	# 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.

	from __future__ import absolute_import			from __future__ import absolute_import

	from .node import hex			from .node import hex

	from . import (			from . import (
	vfs as vfsmod,			vfs as vfsmod,
	)			)

	# directory name in .hg/ in which remotenames files will be present			# directory name in .hg/ in which remotenames files will be present
	remotenamedir = 'remotenames'			remotenamedir = 'logexchange'

	def readremotenamefile(repo, filename):			def readremotenamefile(repo, filename):
	"""			"""
	reads a file from .hg/remotenames/ directory and yields it's content			reads a file from .hg/logexchange/ directory and yields it's content
	filename: the file to be read			filename: the file to be read
	yield a tuple (node, remotepath, name)			yield a tuple (node, remotepath, name)
	"""			"""

	vfs = vfsmod.vfs(repo.vfs.join(remotenamedir))			vfs = vfsmod.vfs(repo.vfs.join(remotenamedir))
	if not vfs.exists(filename):			if not vfs.exists(filename):
	return			return
	f = vfs(filename)			f = vfs(filename)
	yield node, remote, rname			yield node, remote, rname
	except ValueError:			except ValueError:
	pass			pass

	f.close()			f.close()

	def readremotenames(repo):			def readremotenames(repo):
	"""			"""
	read the details about the remotenames stored in .hg/remotenames/ and			read the details about the remotenames stored in .hg/logexchange/ and
	yields a tuple (node, remotepath, name). It does not yields information			yields a tuple (node, remotepath, name). It does not yields information
	about whether an entry yielded is branch or bookmark. To get that			about whether an entry yielded is branch or bookmark. To get that
	information, call the respective functions.			information, call the respective functions.
	"""			"""

	for bmentry in readremotenamefile(repo, 'bookmarks'):			for bmentry in readremotenamefile(repo, 'bookmarks'):
	yield bmentry			yield bmentry
	for branchentry in readremotenamefile(repo, 'branches'):			for branchentry in readremotenamefile(repo, 'branches'):
	if node:			if node:
	f.write('%s\0%s\0%s\n' % (node, remotepath, name))			f.write('%s\0%s\0%s\n' % (node, remotepath, name))

	f.close()			f.close()

	def saveremotenames(repo, remotepath, branches=None, bookmarks=None):			def saveremotenames(repo, remotepath, branches=None, bookmarks=None):
	"""			"""
	save remotenames i.e. remotebookmarks and remotebranches in their			save remotenames i.e. remotebookmarks and remotebranches in their
	respective files under ".hg/remotenames/" directory.			respective files under ".hg/logexchange/" directory.
	"""			"""
	wlock = repo.wlock()			wlock = repo.wlock()
	try:			try:
	if bookmarks:			if bookmarks:
	writeremotenamefile(repo, remotepath, bookmarks, 'bookmarks')			writeremotenamefile(repo, remotepath, bookmarks, 'bookmarks')
	if branches:			if branches:
	writeremotenamefile(repo, remotepath, branches, 'branches')			writeremotenamefile(repo, remotepath, branches, 'branches')
	finally:			finally:

mercurial/remotenames.py

This file was moved to mercurial/logexchange.py.

tests/test-logexchange.t

This file was moved from tests/test-remotenames.t.


	$ cd ..			$ cd ..

	$ hg clone server client			$ hg clone server client
	updating to branch default			updating to branch default
	8 files updated, 0 files merged, 0 files removed, 0 files unresolved			8 files updated, 0 files merged, 0 files removed, 0 files unresolved

	$ cd client			$ cd client
	$ cat .hg/remotenames/bookmarks			$ cat .hg/logexchange/bookmarks
	0			0

	87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc)			87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc)
	62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc)			62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc)

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

	ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server\x00default (esc)			ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server\x00default (esc)
	3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server\x00wat (esc)			3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server\x00wat (esc)

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


	Pulling form the new server			Pulling form the new server
	---------------------------			---------------------------
	$ cd ../client/			$ cd ../client/
	$ hg pull ../server2/			$ hg pull ../server2/
	pulling from ../server2/			pulling from ../server2/
	searching for changes			searching for changes
	no changes found			no changes found
	$ cat .hg/remotenames/bookmarks			$ cat .hg/logexchange/bookmarks
	0			0

	62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc)			62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc)
	87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc)			87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc)
	87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server2\x00bar (esc)			87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server2\x00bar (esc)
	62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server2\x00foo (esc)			62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server2\x00foo (esc)

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

	3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server\x00wat (esc)			3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server\x00wat (esc)
	ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server\x00default (esc)			ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server\x00default (esc)
	ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server2\x00default (esc)			ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server2\x00default (esc)
	3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server2\x00wat (esc)			3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server2\x00wat (esc)

tests/test-remotenames.t

This file was moved to tests/test-logexchange.t.