D48950.1786616817.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D48950.1786616817.diff
View Options

	diff --git a/tools/tools/git/mfc-candidates.lua b/tools/tools/git/mfc-candidates.lua
	--- a/tools/tools/git/mfc-candidates.lua
	+++ b/tools/tools/git/mfc-candidates.lua
	@@ -7,6 +7,9 @@
	-- "MFC from" branch and do not have a corresponding "cherry picked from"
	-- commit in the "MFC to" branch.

	+-- Global state
	+local verbose = 0
	+
	-- Execute a command and return its output. A final newline is stripped,
	-- similar to sh.
	local function exec_command(command)
	@@ -102,9 +105,6 @@
	return result
	end

	--- Global state
	-verbose = 0
	-
	local function params(from_branch, to_branch, author)
	print("from: " .. from_branch)
	print("to: " .. to_branch)
	@@ -125,9 +125,9 @@
	-- Main function
	local function main()
	local from_branch = "freebsd/main"
	- local to_branch = ""
	+ local to_branch
	local author = os.getenv("USER") or ""
	- local dirspec = nil
	+ local dirspec

	local url = exec_command("git remote get-url freebsd")
	local freebsd_repo = string.match(url, "[^/]+$")
	@@ -204,7 +204,7 @@
	local result_hashes = set_difference(from_hashes, to_hashes)

	if exclude_file then
	- exclude_hashes = read_exclude(exclude_file)
	+ local exclude_hashes = read_exclude(exclude_file)
	result_hashes = set_difference(result_hashes, exclude_hashes)
	end