Re: [PATCH] gnu: Add perl-socket6.

[Danny Milosavljevic <dannym@scratchpost.org>]

[-- Attachment #1: Type: text/plain, Size: 798 bytes --]

> could you fix the commit message the same way pointed out in the
> previous (perl-net-dns) package and 

>rebase it on master?

Sorry, I cannot do that manually for like 20 packages. 

This is Scheme we are talking about - one of the most regular languages there is. There should be a patching and diffing program which works on the tree level and we should be using that.

*shakes head* This is not C or anything where we would have to live with that.

Anyway, for the time being I wrote a small script to automate the process of reapplying these from the mailing list and then resubmit. It's running right now.

Even after I resubmitted all the patches, they will still only apply when applied in chronological order. Therefore, I will submit a patch series.

Script is attached for reference.

[-- Attachment #2: reapply-guix-patch-to-master --]
[-- Type: application/octet-stream, Size: 4521 bytes --]

#!/usr/bin/env python3

import sys
import os
"""
- find +++ filename, make sure there is only one such line
- skip all the context lines
- then check the first (which has to be +) line if it contains "define-public"
- then take all those following + lines, making sure there's no other define-public in it.
- make sure there's no - line
- append block to destination file
"""

class LL1(object):
	def __init__(self, inputfile):
		self.inputfile = inputfile
		self.inputline = None
	def consume(self):
		result = self.inputline
		self.inputline = self.inputfile.readline()
		return result
	def consume_ensure_match(scanner, predicate):
		assert predicate(scanner.inputline)
		return scanner.consume()
	def consume_if_match(scanner, predicate):
		if predicate(scanner.inputline):
			return scanner.consume()
	def consume_until(scanner, predicate):
		while not predicate(scanner.inputline):
			yield scanner.consume()
	def skip_until(scanner, predicate):
		for x in scanner.consume_until(predicate):
			pass
	def skip_while(scanner, predicate):
		for x in scanner.consume_until(lambda *args, **kwargs: not predicate(*args, **kwargs)):
			pass
	def skip_if_match(scanner, predicate):
		self.consume_if_match(scanner, predicate)

def append_block_to_file(block, filename):
	assert(block.endswith("\n"))
	with open(filename, "a") as f:
		f.write("\n")
		f.write(block)

def fix_module_definition_in_file(block, filename):
	assert block.endswith("\n")
	with open(filename) as f:
		#body = f.readlines()
		scanner = LL1(f)
		scanner.consume()
		tmpfilename = "{}.tmp".format(filename)
		with open(tmpfilename, "w") as g:
			for line in scanner.consume_until(lambda line: line.startswith("(define-module ")):
				g.write(line)
			g.write(scanner.consume_ensure_match(lambda line: line.startswith("(define-module ")))
			g.write(block)
			for line in scanner.consume_until(lambda line: line == ""): # until EOF
				g.write(line)
		os.rename(tmpfilename, filename)

def increase_subjectprefix_version(subjectprefix):
	version = subjectprefix.strip()
	if version.startswith("v"):
		version = version.lstrip("v")
	if version.strip() == "":
		version = "1"
	version = int(version) + 1
	subjectprefix = "PATCH v{}".format(version)
	return subjectprefix

def invoke(*args):
	if os.spawnvp(os.P_WAIT, args[0], args) != 0:
		sys.stderr.write("Invocation failed: {!r}\n".format(args))
		sys.exit(1)

with open(sys.argv[1]) as f:
	os.chdir(os.path.join(os.environ["HOME"], "src", "guix-master", "guix"))
	scanner = LL1(f)
	scanner.consume()
	header = [x for x in scanner.consume_until(lambda line: line.startswith("diff "))]
	subject = [line for line in header if line.startswith("Subject:")][0].lstrip("Subject: ")
	assert subject.startswith("[PATCH")
	subjectprefix, subjectsuffix = subject.lstrip("[PATCH").split("]", 1)
	subjectprefix = increase_subjectprefix_version(subjectprefix)
	subjectsuffix = subjectsuffix.lstrip()
	use = False
	commitmsg = []
	for line in header:
		# TODO also recover the message right in front of it
		if line.lstrip().startswith("*"):
			commitmsg.append(line)
	scanner.consume_ensure_match(lambda line: line.startswith("diff "))
	scanner.consume_ensure_match(lambda line: line.startswith("index "))
	scanner.consume_ensure_match(lambda line: line.startswith("--- "))
	filename = scanner.consume_ensure_match(lambda line: line.startswith("+++ ")).rstrip("\n").lstrip("+++ b/")
	invoke("git", "checkout", "--", filename)
	while scanner.inputline.startswith("@@"):
		scanner.consume_ensure_match(lambda line: line.startswith("@@"))
		scanner.skip_until(lambda line: not line.startswith(" "))
		block = [scanner.consume_ensure_match(lambda line: line.startswith("+"))]
		block += scanner.consume_until(lambda line: not line.startswith("+"))
		block = [line[len("+"): ] for line in block]
		block = "".join(block).lstrip("\n")
		if block.startswith("(define-public") or block.startswith("(define"):
			append_block_to_file(block, filename)
		else: # assume it's the module definition that should be changed.
			fix_module_definition_in_file(block, filename)
		scanner.skip_until(lambda line: not line.startswith(" "))
	scanner.skip_while(lambda line: line == "\n")
	assert scanner.inputline == "" # EOF
	invoke("git", "diff", "--", filename)
	commitmsg = "".join(commitmsg)
	commitmsg = "{}\n{}\n\n{}".format(subjectsuffix, subjectsuffix, commitmsg)
	invoke("git", "commit", "-m", commitmsg, "--", filename)
	#invoke("git", "format-patch", "-1", "-o", "../outgoing", "--subject-prefix={}".format(subjectprefix))

[-- Attachment #3: reapply-guix-patches-to-master --]
[-- Type: application/octet-stream, Size: 150 bytes --]

#!/bin/sh

set -e -o pipefail
reset-guix-master
while [ ! -z "$1" ]
do
	echo "Applying \"$1\"..." >&2
	reapply-guix-patch-to-master "$1"
	shift
done