Attachment #514406 for bug #644246

View | Details | Raw Unified | Return to bug 644246
Collapse All | Expand All

Lines 83-88 LIBC_PACKAGE_ATOM = "virtual/libc" Link Here

(-)a/pym/portage/const.py (+1 lines)
83	OS_HEADERS_PACKAGE_ATOM = "virtual/os-headers"	83	OS_HEADERS_PACKAGE_ATOM = "virtual/os-headers"
84	CVS_PACKAGE_ATOM = "dev-vcs/cvs"	84	CVS_PACKAGE_ATOM = "dev-vcs/cvs"
85	GIT_PACKAGE_ATOM = "dev-vcs/git"	85	GIT_PACKAGE_ATOM = "dev-vcs/git"
		86	HG_PACKAGE_ATOM = "dev-vcs/mercurial"
86	RSYNC_PACKAGE_ATOM = "net-misc/rsync"	87	RSYNC_PACKAGE_ATOM = "net-misc/rsync"
87		88
88	INCREMENTALS = (	89	INCREMENTALS = (




# Copyright 2014-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

doc = """Mercurial plug-in module for portage.
Performs a hg pull on repositories."""
__doc__ = doc[:]

from portage.localization import _
from portage.sync.config_checks import CheckSyncConfig
from portage.util import writemsg_level

module_spec = {
	'name': 'mercurial',
	'description': doc,
	'provides':{
		'mercurial-module': {
			'name': "mercurial",
			'sourcefile': "mercurial",
			'class': "MercurialSync",
			'description': doc,
			'functions': ['sync', 'new', 'exists', 'retrieve_head'],
			'func_desc': {
				'sync': 'Performs a hg pull on the repository',
				'new': 'Creates the new repository at the specified location',
				'exists': 'Returns a boolean of whether the specified dir ' +
					'exists and is a valid Mercurial repository',
				'retrieve_head': 'Returns the head commit hash',
			},
			'validate_config': CheckSyncConfig,
			'module_specific_options': (
				'sync-mercurial-clone-env',
				'sync-mercurial-clone-extra-opts',
				'sync-mercurial-env',
				'sync-mercurial-pull-env',
				'sync-mercurial-pull-extra-opts',
				),
		}
	}
}




# Copyright 2005-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

import logging
import subprocess

import portage
from portage import os
from portage.util import writemsg_level, shlex_split
from portage.output import create_color_func
good = create_color_func("GOOD")
bad = create_color_func("BAD")
warn = create_color_func("WARN")
from portage.sync.syncbase import NewBase


class MercurialSync(NewBase):
	'''Mercurial sync class'''

	short_desc = "Perform sync operations on mercurial based repositories"

	@staticmethod
	def name():
		return "MercurialSync"


	def __init__(self):
		NewBase.__init__(self, "hg", portage.const.HG_PACKAGE_ATOM)


	def exists(self, **kwargs):
		'''Tests whether the repo actually exists'''
		return os.path.exists(os.path.join(self.repo.location, '.hg'))


	def new(self, **kwargs):
		'''Do the initial clone of the repository'''
		if kwargs:
			self._kwargs(kwargs)
		try:
			if not os.path.exists(self.repo.location):
				os.makedirs(self.repo.location)
				self.logger(self.xterm_titles,
					'Created new directory %s' % self.repo.location)
		except IOError:
			return (1, False)

		sync_uri = self.repo.sync_uri
		if sync_uri.startswith("file://"):
			sync_uri = sync_uri[7:]

		hg_cmd_opts = ""
		if self.repo.module_specific_options.get('sync-mercurial-env'):
			shlexed_env = shlex_split(self.repo.module_specific_options['sync-mercurial-env'])
			env = dict((k, v) for k, _, v in (assignment.partition('=') for assignment in shlexed_env) if k)
			self.spawn_kwargs['env'].update(env)

		if self.repo.module_specific_options.get('sync-mercurial-clone-env'):
			shlexed_env = shlex_split(self.repo.module_specific_options['sync-mercurial-clone-env'])
			clone_env = dict((k, v) for k, _, v in (assignment.partition('=') for assignment in shlexed_env) if k)
			self.spawn_kwargs['env'].update(clone_env)

		if self.settings.get("PORTAGE_QUIET") == "1":
			hg_cmd_opts += " --quiet"
		if self.repo.module_specific_options.get('sync-mercurial-clone-extra-opts'):
			hg_cmd_opts += " %s" % self.repo.module_specific_options['sync-mercurial-clone-extra-opts']
		hg_cmd = "%s clone%s %s ." % (self.bin_command, hg_cmd_opts,
			portage._shell_quote(sync_uri))
		writemsg_level(hg_cmd + "\n")

		exitcode = portage.process.spawn_bash("cd %s ; exec %s" % (
				portage._shell_quote(self.repo.location), hg_cmd),
			**self.spawn_kwargs)
		if exitcode != os.EX_OK:
			msg = "!!! hg clone error in %s" % self.repo.location
			self.logger(self.xterm_titles, msg)
			writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1)
			return (exitcode, False)
		return (os.EX_OK, True)


	def update(self):
		''' Update existing mercurial repository, and ignore the syncuri. We are
		going to trust the user and assume that the user is in the branch
		that he/she wants updated. We'll let the user manage branches with
		hg directly.
		'''

		hg_cmd_opts = ""
		if self.repo.module_specific_options.get('sync-mercurial-env'):
			shlexed_env = shlex_split(self.repo.module_specific_options['sync-mercurial-env'])
			env = dict((k, v) for k, _, v in (assignment.partition('=') for assignment in shlexed_env) if k)
			self.spawn_kwargs['env'].update(env)

		if self.repo.module_specific_options.get('sync-mercurial-pull-env'):
			shlexed_env = shlex_split(self.repo.module_specific_options['sync-mercurial-pull-env'])
			pull_env = dict((k, v) for k, _, v in (assignment.partition('=') for assignment in shlexed_env) if k)
			self.spawn_kwargs['env'].update(pull_env)

		if self.settings.get("PORTAGE_QUIET") == "1":
			hg_cmd_opts += " --quiet"
		if self.repo.module_specific_options.get('sync-mercurial-pull-extra-opts'):
			hg_cmd_opts += " %s" % self.repo.module_specific_options['sync-mercurial-pull-extra-opts']
		hg_cmd = "%s pull -u%s" % (self.bin_command, hg_cmd_opts)
		writemsg_level(hg_cmd + "\n")

		rev_cmd = [self.bin_command, "id", "--id", "--rev", "tip"]
		previous_rev = subprocess.check_output(rev_cmd,
			cwd=portage._unicode_encode(self.repo.location))

		exitcode = portage.process.spawn_bash("cd %s ; exec %s" % (
				portage._shell_quote(self.repo.location), hg_cmd),
			**self.spawn_kwargs)
		if exitcode != os.EX_OK:
			msg = "!!! hg pull error in %s" % self.repo.location
			self.logger(self.xterm_titles, msg)
			writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1)
			return (exitcode, False)

		current_rev = subprocess.check_output(rev_cmd,
			cwd=portage._unicode_encode(self.repo.location))

		return (os.EX_OK, current_rev != previous_rev)

	def retrieve_head(self, **kwargs):
		'''Get information about the head commit'''
		if kwargs:
			self._kwargs(kwargs)
		rev_cmd = [self.bin_command, "id", "--id", "--rev", "tip"]
		try:
			ret = (os.EX_OK,
				portage._unicode_decode(subprocess.check_output(rev_cmd,
				cwd=portage._unicode_encode(self.repo.location))))
		except subprocess.CalledProcessError:
			ret = (1, False)
		return ret

Return to bug 644246

Line 0 Link Here

(-)a/pym/portage/sync/modules/mercurial/__init__.py (+39 lines)
	1	# Copyright 2014-2018 Gentoo Foundation
	2	# Distributed under the terms of the GNU General Public License v2
	3
	4	doc = """Mercurial plug-in module for portage.
	5	Performs a hg pull on repositories."""
	6	__doc__ = doc[:]
	7
	8	from portage.localization import _
	9	from portage.sync.config_checks import CheckSyncConfig
	10	from portage.util import writemsg_level
	11
	12	module_spec = {
	13	'name': 'mercurial',
	14	'description': doc,
	15	'provides':{
	16	'mercurial-module': {
	17	'name': "mercurial",
	18	'sourcefile': "mercurial",
	19	'class': "MercurialSync",
	20	'description': doc,
	21	'functions': ['sync', 'new', 'exists', 'retrieve_head'],
	22	'func_desc': {
	23	'sync': 'Performs a hg pull on the repository',
	24	'new': 'Creates the new repository at the specified location',
	25	'exists': 'Returns a boolean of whether the specified dir ' +
	26	'exists and is a valid Mercurial repository',
	27	'retrieve_head': 'Returns the head commit hash',
	28	},
	29	'validate_config': CheckSyncConfig,
	30	'module_specific_options': (
	31	'sync-mercurial-clone-env',
	32	'sync-mercurial-clone-extra-opts',
	33	'sync-mercurial-env',
	34	'sync-mercurial-pull-env',
	35	'sync-mercurial-pull-extra-opts',
	36	),
	37	}
	38	}
	39	}

Line 0 Link Here

(-)a/pym/portage/sync/modules/mercurial/mercurial.py (-1 / +136 lines)
0	-	1	# Copyright 2005-2018 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	import logging
		5	import subprocess
		6
		7	import portage
		8	from portage import os
		9	from portage.util import writemsg_level, shlex_split
		10	from portage.output import create_color_func
		11	good = create_color_func("GOOD")
		12	bad = create_color_func("BAD")
		13	warn = create_color_func("WARN")
		14	from portage.sync.syncbase import NewBase
		15
		16
		17	class MercurialSync(NewBase):
		18	'''Mercurial sync class'''
		19
		20	short_desc = "Perform sync operations on mercurial based repositories"
		21
		22	@staticmethod
		23	def name():
		24	return "MercurialSync"
		25
		26
		27	def __init__(self):
		28	NewBase.__init__(self, "hg", portage.const.HG_PACKAGE_ATOM)
		29
		30
		31	def exists(self, **kwargs):
		32	'''Tests whether the repo actually exists'''
		33	return os.path.exists(os.path.join(self.repo.location, '.hg'))
		34
		35
		36	def new(self, **kwargs):
		37	'''Do the initial clone of the repository'''
		38	if kwargs:
		39	self._kwargs(kwargs)
		40	try:
		41	if not os.path.exists(self.repo.location):
		42	os.makedirs(self.repo.location)
		43	self.logger(self.xterm_titles,
		44	'Created new directory %s' % self.repo.location)
		45	except IOError:
		46	return (1, False)
		47
		48	sync_uri = self.repo.sync_uri
		49	if sync_uri.startswith("file://"):
		50	sync_uri = sync_uri[7:]
		51
		52	hg_cmd_opts = ""
		53	if self.repo.module_specific_options.get('sync-mercurial-env'):
		54	shlexed_env = shlex_split(self.repo.module_specific_options['sync-mercurial-env'])
		55	env = dict((k, v) for k, _, v in (assignment.partition('=') for assignment in shlexed_env) if k)
		56	self.spawn_kwargs['env'].update(env)
		57
		58	if self.repo.module_specific_options.get('sync-mercurial-clone-env'):
		59	shlexed_env = shlex_split(self.repo.module_specific_options['sync-mercurial-clone-env'])
		60	clone_env = dict((k, v) for k, _, v in (assignment.partition('=') for assignment in shlexed_env) if k)
		61	self.spawn_kwargs['env'].update(clone_env)
		62
		63	if self.settings.get("PORTAGE_QUIET") == "1":
		64	hg_cmd_opts += " --quiet"
		65	if self.repo.module_specific_options.get('sync-mercurial-clone-extra-opts'):
66	hg_cmd_opts += " %s" % self.repo.module_specific_options['sync-mercurial-clone-extra-opts']
67	hg_cmd = "%s clone%s %s ." % (self.bin_command, hg_cmd_opts,
68	portage._shell_quote(sync_uri))
69	writemsg_level(hg_cmd + "\n")
70
71	exitcode = portage.process.spawn_bash("cd %s ; exec %s" % (
72	portage._shell_quote(self.repo.location), hg_cmd),
73	**self.spawn_kwargs)
74	if exitcode != os.EX_OK:
75	msg = "!!! hg clone error in %s" % self.repo.location
76	self.logger(self.xterm_titles, msg)
77	writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1)
78	return (exitcode, False)
79	return (os.EX_OK, True)
80
81
82	def update(self):
83	''' Update existing mercurial repository, and ignore the syncuri. We are
84	going to trust the user and assume that the user is in the branch
85	that he/she wants updated. We'll let the user manage branches with
86	hg directly.
87	'''
88
89	hg_cmd_opts = ""
90	if self.repo.module_specific_options.get('sync-mercurial-env'):
91	shlexed_env = shlex_split(self.repo.module_specific_options['sync-mercurial-env'])
92	env = dict((k, v) for k, _, v in (assignment.partition('=') for assignment in shlexed_env) if k)
93	self.spawn_kwargs['env'].update(env)
94
95	if self.repo.module_specific_options.get('sync-mercurial-pull-env'):
96	shlexed_env = shlex_split(self.repo.module_specific_options['sync-mercurial-pull-env'])
97	pull_env = dict((k, v) for k, _, v in (assignment.partition('=') for assignment in shlexed_env) if k)
98	self.spawn_kwargs['env'].update(pull_env)
99
100	if self.settings.get("PORTAGE_QUIET") == "1":
101	hg_cmd_opts += " --quiet"
102	if self.repo.module_specific_options.get('sync-mercurial-pull-extra-opts'):
103	hg_cmd_opts += " %s" % self.repo.module_specific_options['sync-mercurial-pull-extra-opts']
104	hg_cmd = "%s pull -u%s" % (self.bin_command, hg_cmd_opts)
105	writemsg_level(hg_cmd + "\n")
106
107	rev_cmd = [self.bin_command, "id", "--id", "--rev", "tip"]
108	previous_rev = subprocess.check_output(rev_cmd,
109	cwd=portage._unicode_encode(self.repo.location))
110
111	exitcode = portage.process.spawn_bash("cd %s ; exec %s" % (
112	portage._shell_quote(self.repo.location), hg_cmd),
113	**self.spawn_kwargs)
114	if exitcode != os.EX_OK:
115	msg = "!!! hg pull error in %s" % self.repo.location
116	self.logger(self.xterm_titles, msg)
117	writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1)
118	return (exitcode, False)
119
120	current_rev = subprocess.check_output(rev_cmd,
121	cwd=portage._unicode_encode(self.repo.location))
122
123	return (os.EX_OK, current_rev != previous_rev)
124
125	def retrieve_head(self, **kwargs):
126	'''Get information about the head commit'''
127	if kwargs:
128	self._kwargs(kwargs)
129	rev_cmd = [self.bin_command, "id", "--id", "--rev", "tip"]
130	try:
131	ret = (os.EX_OK,
132	portage._unicode_decode(subprocess.check_output(rev_cmd,
133	cwd=portage._unicode_encode(self.repo.location))))
134	except subprocess.CalledProcessError:
135	ret = (1, False)
136	return ret