[gentoo-portage-dev] [PATCH 0/2] emerge: Add short -l option for --load-average (bug 699256)

[gentoo-portage-dev] [PATCH 0/2] emerge: Add short -l option for --load-average (bug 699256)

[Zac Medico]

Add a short -l option for --load-average just like make(1) has.

Bug: https://bugs.gentoo.org/699256
Signed-off-by: Zac Medico <zmedico@gentoo.org>

Zac Medico (2):
  emerge: Remove deprecated --changelog option (bug 699256)
  emerge: Add short -l option for --load-average (bug 699256)

 lib/_emerge/actions.py                 |   5 --
 lib/_emerge/main.py                    |   5 +-
 lib/_emerge/resolver/output.py         |  32 +-------
 lib/_emerge/resolver/output_helpers.py | 106 -------------------------
 man/emerge.1                           |   8 +-
 5 files changed, 5 insertions(+), 151 deletions(-)

-- 
2.25.3

[gentoo-portage-dev] [PATCH 1/2] emerge: Remove deprecated --changelog option (bug 699256)

[Zac Medico]

Bug: https://bugs.gentoo.org/699256
Signed-off-by: Zac Medico <zmedico@gentoo.org>
---
 lib/_emerge/actions.py                 |   5 --
 lib/_emerge/main.py                    |   3 +-
 lib/_emerge/resolver/output.py         |  32 +-------
 lib/_emerge/resolver/output_helpers.py | 106 -------------------------
 man/emerge.1                           |   6 --
 5 files changed, 2 insertions(+), 150 deletions(-)

diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index d259206ad..063f5d4a0 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -2936,11 +2936,6 @@ def run_action(emerge_config):
 
 	adjust_configs(emerge_config.opts, emerge_config.trees)
 
-	if "--changelog" in emerge_config.opts:
-		writemsg_level(
-			" %s The emerge --changelog (or -l) option is deprecated\n" %
-			warn("*"), level=logging.WARNING, noiselevel=-1)
-
 	if profile_check(emerge_config.trees, emerge_config.action) != os.EX_OK:
 		return 1
 
diff --git a/lib/_emerge/main.py b/lib/_emerge/main.py
index f4c7e2715..5aac451fe 100644
--- a/lib/_emerge/main.py
+++ b/lib/_emerge/main.py
@@ -26,7 +26,7 @@ options=[
 "--ask-enter-invalid",
 "--buildpkgonly",
 "--changed-use",
-"--changelog",    "--columns",
+"--columns",
 "--debug",
 "--digest",
 "--emptytree",
@@ -58,7 +58,6 @@ shortmapping={
 "e":"--emptytree",
 "f":"--fetchonly", "F":"--fetch-all-uri",
 "h":"--help",
-"l":"--changelog",
 "n":"--noreplace", "N":"--newuse",
 "o":"--onlydeps",  "O":"--nodeps",
 "p":"--pretend",   "P":"--prune",
diff --git a/lib/_emerge/resolver/output.py b/lib/_emerge/resolver/output.py
index b6c77ecad..0c90abefb 100644
--- a/lib/_emerge/resolver/output.py
+++ b/lib/_emerge/resolver/output.py
@@ -26,7 +26,7 @@ from portage.versions import best, cpv_getversion
 from _emerge.Blocker import Blocker
 from _emerge.create_world_atom import create_world_atom
 from _emerge.resolver.output_helpers import ( _DisplayConfig, _tree_display,
-	_PackageCounters, _create_use_string, _calc_changelog, PkgInfo)
+	_PackageCounters, _create_use_string, PkgInfo)
 from _emerge.show_invalid_depstring_notice import show_invalid_depstring_notice
 
 class Display:
@@ -39,7 +39,6 @@ class Display:
 	"""
 
 	def __init__(self):
-		self.changelogs = []
 		self.print_msg = []
 		self.blockers = []
 		self.counters = _PackageCounters()
@@ -561,14 +560,6 @@ class Display:
 				noiselevel=-1)
 
 
-	def print_changelog(self):
-		"""Prints the changelog text to std_out
-		"""
-		for chunk in self.changelogs:
-			writemsg_stdout(chunk,
-				noiselevel=-1)
-
-
 	def get_display_list(self, mylist):
 		"""Determines the display list to process
 
@@ -668,23 +659,6 @@ class Display:
 		return pkg_info
 
 
-	def do_changelog(self, pkg, pkg_info):
-		"""Processes and adds the changelog text to the master text for output
-
-		@param pkg: _emerge.Package.Package instance
-		@param pkg_info: dictionay
-		Modifies self.changelogs
-		"""
-		if pkg_info.previous_pkg is not None:
-			ebuild_path_cl = pkg_info.ebuild_path
-			if ebuild_path_cl is None:
-				# binary package
-				ebuild_path_cl = self.portdb.findname(pkg.cpv, myrepo=pkg.repo)
-			if ebuild_path_cl is not None:
-				self.changelogs.extend(_calc_changelog(
-					ebuild_path_cl, pkg_info.previous_pkg, pkg.cpv))
-
-
 	def check_system_world(self, pkg):
 		"""Checks for any occurances of the package in the system or world sets
 
@@ -780,8 +754,6 @@ class Display:
 				pkg_info.attr_display.new_slot = True
 				if pkg_info.ordered:
 					self.counters.newslot += 1
-			if self.conf.changelog:
-				self.do_changelog(pkg, pkg_info)
 		else:
 			pkg_info.attr_display.new = True
 			if pkg_info.ordered:
@@ -909,8 +881,6 @@ class Display:
 							noiselevel=-1)
 			spawn_nofetch(self.conf.trees[pkg.root]["porttree"].dbapi,
 				pkg_info.ebuild_path)
-		if self.conf.changelog:
-			self.print_changelog()
 
 		return os.EX_OK
 
diff --git a/lib/_emerge/resolver/output_helpers.py b/lib/_emerge/resolver/output_helpers.py
index 932e66e1b..c9faac688 100644
--- a/lib/_emerge/resolver/output_helpers.py
+++ b/lib/_emerge/resolver/output_helpers.py
@@ -176,7 +176,6 @@ class _DisplayConfig:
 		self.quiet = "--quiet" in frozen_config.myopts
 		self.all_flags = self.verbosity == 3 or self.quiet
 		self.print_use_string = self.verbosity != 1 or "--verbose" in frozen_config.myopts
-		self.changelog = "--changelog" in frozen_config.myopts
 		self.edebug = frozen_config.edebug
 		self.unordered_display = "--unordered-display" in frozen_config.myopts
 
@@ -468,90 +467,6 @@ def _prune_tree_display(display_list):
 			depth >= display_list[i+1][1]:
 				del display_list[i]
 
-
-def _calc_changelog(ebuildpath,current,next): # pylint: disable=redefined-builtin
-	if ebuildpath == None or not os.path.exists(ebuildpath):
-		return []
-	current = '-'.join(catpkgsplit(current)[1:])
-	if current.endswith('-r0'):
-		current = current[:-3]
-	next = '-'.join(catpkgsplit(next)[1:])
-	if next.endswith('-r0'):
-		next = next[:-3]
-
-	changelogdir = os.path.dirname(ebuildpath)
-	changelogs = ['ChangeLog']
-	# ChangeLog-YYYY (see bug #389611)
-	changelogs.extend(sorted((fn for fn in os.listdir(changelogdir)
-		if fn.startswith('ChangeLog-')), reverse=True))
-
-	divisions = []
-	found_current = False
-	for fn in changelogs:
-		changelogpath = os.path.join(changelogdir, fn)
-		try:
-			with io.open(_unicode_encode(changelogpath,
-				encoding=_encodings['fs'], errors='strict'),
-				mode='r', encoding=_encodings['repo.content'],
-				errors='replace') as f:
-				changelog = f.read()
-		except EnvironmentError:
-			return []
-		for node in _find_changelog_tags(changelog):
-			if node[0] == current:
-				found_current = True
-				break
-			else:
-				divisions.append(node)
-		if found_current:
-			break
-
-	if not found_current:
-		return []
-
-	#print 'XX from',current,'to',next
-	#for div,text in divisions: print 'XX',div
-	# skip entries for all revisions above the one we are about to emerge
-	later_rev_index = None
-	for i, node in enumerate(divisions):
-		if node[0] == next:
-			if later_rev_index is not None:
-				first_node = divisions[later_rev_index]
-				# Discard the later revision and the first ChangeLog entry
-				# that follows it. We want to display all the entries after
-				# that first entry, as discussed in bug #373009.
-				trimmed_lines = []
-				iterator = iter(first_node[1])
-				for l in iterator:
-					if not l:
-						# end of the first entry that's discarded
-						break
-				first_node = (None, list(iterator))
-				divisions = [first_node] + divisions[later_rev_index+1:]
-			break
-		if node[0] is not None:
-			later_rev_index = i
-
-	output = []
-	prev_blank = False
-	prev_rev = False
-	for rev, lines in divisions:
-		if rev is not None:
-			if not (prev_blank or prev_rev):
-				output.append("\n")
-			output.append(bold('*' + rev) + '\n')
-			prev_rev = True
-			prev_blank = False
-		if lines:
-			prev_rev = False
-			if not prev_blank:
-				output.append("\n")
-			for l in lines:
-				output.append(l + "\n")
-			output.append("\n")
-			prev_blank = True
-	return output
-
 def _strip_header_comments(lines):
 	# strip leading and trailing blank or header/comment lines
 	i = 0
@@ -563,27 +478,6 @@ def _strip_header_comments(lines):
 		lines.pop()
 	return lines
 
-def _find_changelog_tags(changelog):
-	divs = []
-	if not changelog:
-		return divs
-	release = None
-	release_end = 0
-	for match in re.finditer(r'^\*\ ?([-a-zA-Z0-9_.+]*)(?:\ .*)?$',
-		changelog, re.M):
-		divs.append((release, _strip_header_comments(
-			changelog[release_end:match.start()].splitlines())))
-		release_end = match.end()
-		release = match.group(1)
-		if release.endswith('.ebuild'):
-			release = release[:-7]
-		if release.endswith('-r0'):
-			release = release[:-3]
-
-	divs.append((release,
-		_strip_header_comments(changelog[release_end:].splitlines())))
-	return divs
-
 class PkgInfo:
 	"""Simple class to hold instance attributes for current
 	information about the pkg being printed.
diff --git a/man/emerge.1 b/man/emerge.1
index a8be677d6..9f77d1fa2 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -504,12 +504,6 @@ NOTE: This option ignores the state of the "test" USE flag, since that flag
 has a special binding to FEATURES="test" (see \fBmake.conf\fR(5) for more
 information about \fBFEATURES\fR settings).
 .TP
-.BR \-\-changelog ", " \-l
-Use this in conjunction with the \fB\-\-pretend\fR option.  This will
-show the ChangeLog entries for all the packages that will be upgraded.
-This option is deprecated because ChangeLog files are no longer
-distributed with Gentoo's ebuild repository.
-.TP
 .BR "\-\-color < y | n >"
 Enable or disable color output.  This option will override \fINOCOLOR\fR
 (see \fBmake.conf\fR(5)) and may also be used to force color output when stdout
-- 
2.25.3

[gentoo-portage-dev] [PATCH 2/2] emerge: Add short -l option for --load-average (bug 699256)

[Zac Medico]

Add a short -l option for --load-average just like make(1) has.

Bug: https://bugs.gentoo.org/699256
Signed-off-by: Zac Medico <zmedico@gentoo.org>
---
 lib/_emerge/main.py | 2 ++
 man/emerge.1        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/_emerge/main.py b/lib/_emerge/main.py
index 5aac451fe..975738762 100644
--- a/lib/_emerge/main.py
+++ b/lib/_emerge/main.py
@@ -171,6 +171,7 @@ def insert_optional_args(args):
 	short_arg_opts = {
 		'D' : valid_integers,
 		'j' : valid_integers,
+		'l' : valid_floats,
 	}
 
 	# Don't make things like "-kn" expand to "-k n"
@@ -542,6 +543,7 @@ def parse_opts(tmpcmdline, silent=False):
 		},
 
 		"--load-average": {
+			"shortopt" : "-l",
 
 			"help"   :"Specifies that no new builds should be started " + \
 				"if there are other builds running and the load average " + \
diff --git a/man/emerge.1 b/man/emerge.1
index 9f77d1fa2..fe7d05a21 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -688,7 +688,7 @@ dependencies are recalculated for remaining packages and any with
 unsatisfied dependencies are automatically dropped. Also see
 the related \fB\-\-skipfirst\fR option.
 .TP
-.BR "\-\-load\-average [LOAD]"
+.BR \-l\ [LOAD] ", "  \-\-load\-average[=LOAD]
 Specifies that no new builds should be started if there are other builds
 running and the load average is at least LOAD (a floating-point number).
 With no argument, removes a previous load limit.
-- 
2.25.3

Re: [gentoo-portage-dev] [PATCH 0/2] emerge: Add short -l option for --load-average (bug 699256)

[Brian Dolbec]

On Sat, 15 Aug 2020 12:26:42 -0700
Zac Medico <zmedico@gentoo.org> wrote:

> Add a short -l option for --load-average just like make(1) has.
> 
> Bug: https://bugs.gentoo.org/699256
> Signed-off-by: Zac Medico <zmedico@gentoo.org>
> 
> Zac Medico (2):
>   emerge: Remove deprecated --changelog option (bug 699256)
>   emerge: Add short -l option for --load-average (bug 699256)
> 
>  lib/_emerge/actions.py                 |   5 --
>  lib/_emerge/main.py                    |   5 +-
>  lib/_emerge/resolver/output.py         |  32 +-------
>  lib/_emerge/resolver/output_helpers.py | 106
> ------------------------- man/emerge.1                           |
> 8 +- 5 files changed, 5 insertions(+), 151 deletions(-)
> 

looks good :)

Re: [gentoo-portage-dev] [PATCH 0/2] emerge: Add short -l option for --load-average (bug 699256)

[Matt Turner]

On Sat, Aug 15, 2020 at 12:27 PM Zac Medico <zmedico@gentoo.org> wrote:
>
> Add a short -l option for --load-average just like make(1) has.

That's awesome, thank you. That'll make some catalyst work easier for me.

[gentoo-portage-dev] Re: [PATCH 0/2] emerge: Add short -l option for --load-average (bug 699256)

[Zac Medico]

[-- Attachment #1.1: Type: text/plain, Size: 833 bytes --]

On 8/15/20 12:26 PM, Zac Medico wrote:
> Add a short -l option for --load-average just like make(1) has.
> 
> Bug: https://bugs.gentoo.org/699256
> Signed-off-by: Zac Medico <zmedico@gentoo.org>
> 
> Zac Medico (2):
>   emerge: Remove deprecated --changelog option (bug 699256)
>   emerge: Add short -l option for --load-average (bug 699256)
> 
>  lib/_emerge/actions.py                 |   5 --
>  lib/_emerge/main.py                    |   5 +-
>  lib/_emerge/resolver/output.py         |  32 +-------
>  lib/_emerge/resolver/output_helpers.py | 106 -------------------------
>  man/emerge.1                           |   8 +-
>  5 files changed, 5 insertions(+), 151 deletions(-)
> 

Merged:

https://gitweb.gentoo.org/proj/portage.git/commit/?id=8ad29c19c1a3ac8529c5c78534769d2771964bcb
-- 
Thanks,
Zac


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]