Paths

Table of Contentst

-
stand/
-
common/
-
bootstrap.h
9/14
nvstore.c
-
libsa/
9/14
Makefile
9/14
nvstore.h
-
nvstore.c
-
stand.h

stand: Separate base and cli parts of nvstore
ClosedPublic
Actions

Authored by imp on Jan 13 2023, 5:38 PM.

Details

Reviewers

tsoome
kevans
manu

Commits

rG10b9e348e467: stand: Separate base and cli parts of nvstore
rGd1ea5017141f: stand: Separate base and cli parts of nvstore

Summary

zfs lives in libsa. However, it depends on nvstore (and other things)
that are in common. Fix part of this layering violation by splitting
nvstore into a libsa piece (which is the base implementation) and
keeping a much smaller common piece (to implement the nvstore
command). This just leaves zfs' knowledge of device names that's
specific to common and its calling platform specific init code to
resolve. Add a nvstore.h file for these two parts to communicate private
things and move the public nvstore api from bootstrap.h to stand.h.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 49095
Build 45984: arc lint + arc unit

Event Timeline

imp created this revision.Jan 13 2023, 5:38 PM

Herald added a reviewer: manu. · View Herald TranscriptJan 13 2023, 5:38 PM

Herald added a subscriber: dab. · View Herald Transcript

imp requested review of this revision.Jan 13 2023, 5:38 PM

Harbormaster completed remote builds in B49095: Diff 115051.Jan 13 2023, 5:38 PM

Nice, thanks!:)

This revision is now accepted and ready to land.Jan 13 2023, 5:51 PM

I like it!

Closed by commit rGd1ea5017141f: stand: Separate base and cli parts of nvstore (authored by imp). · Explain WhyJan 13 2023, 9:27 PM

This revision was automatically updated to reflect the committed changes.

imp added a commit: rGd1ea5017141f: stand: Separate base and cli parts of nvstore.

imp added a commit: rG10b9e348e467: stand: Separate base and cli parts of nvstore.Jan 24 2023, 10:21 PM

Revision Contents
Changeset List

Path

Size

stand/

common/

bootstrap.h

31 lines

nvstore.c

132 lines

libsa/

Makefile

2 lines

nvstore.h

39 lines

stand.h

29 lines

	libsa/
	common/

nvstore.c

161 lines

Diff 115051

View Options

stand/common/bootstrap.h

This file was added.

Property	Old Value	New Value
File Mode	null	100755

#!/usr/libexec/flua

-- SPDX-License-Identifier: BSD-2-Clause

-- MFC candidate search utility. Identify hashes that exist only in the

-- "MFC from" branch and do not have a corresponding "cherry picked from"

-- commit in the "MFC to" branch.

jhbUnsubmitted

Done

Should the license comment be the first comment?

jhb: Should the license comment be the first comment?

impUnsubmitted

Not Done

The current style that we've been promoting is to have the license stuff first and to have it in the order copyright, SPDX identifier, though I've not published that policy. that order is the most standard order in the rest of open source, though I know when we have big boiler plate files we list SPDX above the copyright.

imp: The current style that we've been promoting is to have the license stuff first and to have it…

-- Execute a command and return its output. A final newline is stripped,

-- similar to sh.

emasteAuthorUnsubmitted

Done

- -- Execute a command and return its output. A final newlineis stripped,

+ -- Execute a command and return its output. A final newline is stripped,

-- similar to sh.

emaste:

local function exec_command(command)

local handle = assert(io.popen(command))

local output = handle:read("a")

kevansUnsubmitted

Not Done

I'd probably wrap all of these io ops in assert()

kevans: I'd probably wrap all of these io ops in assert()

handle:close()

if output:sub(-1) == "\n" then

return output:sub(1, -2)

end

return output

end

kevansUnsubmitted

Done

Inconsistent style

kevans: Inconsistent style

-- Return a table of cherry-pick (MFC) candidates.

local function read_from(from_branch, to_branch, author, dirspec)

local command = "git rev-list --first-parent --reverse "

command = command .. to_branch .. ".." .. from_branch

if #author > 0 then

command = command .. " --committer \\<" .. author .. "@"

end

if dirspec then

command = command .. " " .. dirspec

end

if verbose > 1 then

print("Obtaining MFC-from commits using command:")

print(command)

end

local handle = assert(io.popen(command))

local content = {}

kevansUnsubmitted

Done

assert

kevans: assert

for line in handle:lines() do

table.insert(content, line)

end

handle:close()

return content

end

-- Return a table of original hashes of changes that have already been

-- cherry-picked (MFC'd).

local function read_to(from_branch, to_branch, dirspec)

local command = "git log " .. from_branch .. ".." .. to_branch

command = command .. " --grep 'cherry picked from'"

if dirspec then

command = command .. " " .. dirspec

end

if verbose > 1 then

print("Obtaining MFC-to commits using command:")

emasteAuthorUnsubmitted

Done

I semi-mechanically converted this from shell. Should switch this to be done in Lua instead of invoking sed.

emaste: I semi-mechanically converted this from shell. Should switch this to be done in Lua instead of…

print(command)

end

local handle = assert(io.popen(command))

local content = {}

for line in handle:lines() do

local hash = line:match("%(cherry picked from commit ([0-9a-f]+)%)")

if hash then

table.insert(content, hash)

end

handle:close()

return content

end

-- Read a commit exclude file and return its content as a table. Comments

-- starting with # and text after a hash is ignored.

local function read_exclude(filename)

local file = assert(io.open(filename, "r"))

local content = {}

for line in file:lines() do

local hash = line:match("^%x+")

if hash then

-- Hashes are 40 chars; if less, expand short hash.

if #hash < 40 then

impUnsubmitted

Not Done

why 40?

imp: why 40?

emasteAuthorUnsubmitted

Done

a git sha-1 hash is 40 characters

emaste: a git sha-1 hash is 40 characters

hash = exec_command(

"git show --pretty=%H --no-patch " .. hash)

end

table.insert(content, hash)

end

file:close()

return content

end

--- Remove hashes from 'set1' list that are present in 'set2' list

local function set_difference(set1, set2)

local set2_values = {}

for _, value in ipairs(set2) do

set2_values[value] = true

end

local result = {}

for _, value in ipairs(set1) do

if not set2_values[value] then

table.insert(result, value)

end

return result

end

-- Global state

verbose = 0

local function params(from_branch, to_branch, author)

print("from: " .. from_branch)

print("to: " .. to_branch)

if #author > 0 then

print("author/committer: " .. author)

else

print("author/committer: <all>")

end

local function usage(from_branch, to_branch, author)

local script_name = arg[0]:match("([^/]+)$")

emasteAuthorUnsubmitted

Done

$(basename $0) needs updating

emaste: `$(basename $0)` needs updating

print(script_name .. " [-ah] [-f from_branch] [-t to_branch] [-u user] [-X exclude_file] [path ...]")

print()

params(from_branch, to_branch, author)

end

-- Main function

local function main()

local from_branch = "freebsd/main"

local to_branch = ""

local author = os.getenv("USER") or ""

local dirspec = nil

impUnsubmitted

Not Done

maybe this should be 'os.getenv("FREEBSD_USER") or os.getenv("USER") or ""'

imp: maybe this should be 'os.getenv("FREEBSD_USER") or os.getenv("USER") or ""'

emasteAuthorUnsubmitted

Done

We don't have any existing use of FREEBSD_USER, right? This is to accommodate the case where someone's @freebsd.org user id does not match their local user, I presume? Yeah, I agree we should do something like that, but I'm not sure exactly what so would like to revisit this in a subsequent look.

emaste: We don't have any existing use of `FREEBSD_USER`, right? This is to accommodate the case where…

local url = exec_command("git remote get-url freebsd")

local freebsd_repo = string.match(url, "[^/]+$")

freebsd_repo = string.gsub(freebsd_repo, ".git$", "")

if freebsd_repo == "ports" or freebsd_repo == "freebsd-ports" then

local year = os.date("%Y")

local month = os.date("%m")

local qtr = math.ceil(month / 3)

to_branch = "freebsd/" .. year .. "Q" .. qtr

elseif freebsd_repo == "src" or freebsd_repo == "freebsd-src" then

to_branch = "freebsd/stable/14"

-- If pwd is a stable or release branch tree, default to it.

local cur_branch = exec_command("git symbolic-ref --short HEAD")

if string.match(cur_branch, "^stable/") then

to_branch = cur_branch

elseif string.match(cur_branch, "^releng/") then

to_branch = cur_branch

local major = string.match(cur_branch, "%d+")

from_branch = "freebsd/stable/" .. major

end

else

print("pwd is not under a ports or src repository.")

return

end

local do_help = false

local exclude_file = nil

local i = 1

while i <= #arg and arg[i] do

local opt = arg[i]

impUnsubmitted

Not Done

Option parsing is a big reason I've done things in python :)
or rather :(.

imp: Option parsing is a big reason I've done things in python :) or rather :(.

emasteAuthorUnsubmitted

Done

yeah it's a bit janky

emaste: yeah it's a bit janky

if opt == "-a" then

author = ""

elseif opt == "-f" then

from_branch = arg[i + 1]

i = i + 1

elseif opt == "-h" then

do_help = true

i = i + 1

elseif opt == "-t" then

to_branch = arg[i + 1]

i = i + 1

elseif opt == "-u" then

author = arg[i + 1]

i = i + 1

elseif opt == "-v" then

verbose = verbose + 1

elseif opt == "-X" then

exclude_file = arg[i + 1]

print ("-X not working")

i = i + 1

else

break

end

i = i + 1

end

if do_help then

usage(from_branch, to_branch, author)

return

end

if arg[i] then

dirspec = arg[i]

--print("dirspec = " .. dirspec)

-- XXX handle multiple dirspecs?

end

if verbose > 0 then

params(from_branch, to_branch, author)

end

local from_hashes = read_from(from_branch, to_branch, author, dirspec)

local to_hashes = read_to(from_branch, to_branch, dirspec)

local result_hashes = set_difference(from_hashes, to_hashes)

if exclude_file then

exclude_hashes = read_exclude(exclude_file)

result_hashes = set_difference(result_hashes, exclude_hashes)

end

-- Print the result

for _, hash in ipairs(result_hashes) do

print(exec_command("git show --pretty='%h %s' --no-patch " .. hash))

end

main()

View Options

stand/common/nvstore.c

This file was added.

Property	Old Value	New Value
File Mode	null	100755

#!/usr/libexec/flua

-- SPDX-License-Identifier: BSD-2-Clause

-- MFC candidate search utility. Identify hashes that exist only in the

-- "MFC from" branch and do not have a corresponding "cherry picked from"

-- commit in the "MFC to" branch.

jhbUnsubmitted

Done

Should the license comment be the first comment?

jhb: Should the license comment be the first comment?

impUnsubmitted

Not Done

imp: The current style that we've been promoting is to have the license stuff first and to have it…

-- Execute a command and return its output. A final newline is stripped,

-- similar to sh.

emasteAuthorUnsubmitted

Done

- -- Execute a command and return its output. A final newlineis stripped,

+ -- Execute a command and return its output. A final newline is stripped,

-- similar to sh.

emaste:

local function exec_command(command)

local handle = assert(io.popen(command))

local output = handle:read("a")

kevansUnsubmitted

Not Done

I'd probably wrap all of these io ops in assert()

kevans: I'd probably wrap all of these io ops in assert()

handle:close()

if output:sub(-1) == "\n" then

return output:sub(1, -2)

end

return output

end

kevansUnsubmitted

Done

Inconsistent style

kevans: Inconsistent style

-- Return a table of cherry-pick (MFC) candidates.

local function read_from(from_branch, to_branch, author, dirspec)

local command = "git rev-list --first-parent --reverse "

command = command .. to_branch .. ".." .. from_branch

if #author > 0 then

command = command .. " --committer \\<" .. author .. "@"

end

if dirspec then

command = command .. " " .. dirspec

end

if verbose > 1 then

print("Obtaining MFC-from commits using command:")

print(command)

end

local handle = assert(io.popen(command))

local content = {}

kevansUnsubmitted

Done

assert

kevans: assert

for line in handle:lines() do

table.insert(content, line)

end

handle:close()

return content

end

-- Return a table of original hashes of changes that have already been

-- cherry-picked (MFC'd).

local function read_to(from_branch, to_branch, dirspec)

local command = "git log " .. from_branch .. ".." .. to_branch

command = command .. " --grep 'cherry picked from'"

if dirspec then

command = command .. " " .. dirspec

end

if verbose > 1 then

print("Obtaining MFC-to commits using command:")

emasteAuthorUnsubmitted

Done

I semi-mechanically converted this from shell. Should switch this to be done in Lua instead of invoking sed.

emaste: I semi-mechanically converted this from shell. Should switch this to be done in Lua instead of…

print(command)

end

local handle = assert(io.popen(command))

local content = {}

for line in handle:lines() do

local hash = line:match("%(cherry picked from commit ([0-9a-f]+)%)")

if hash then

table.insert(content, hash)

end

handle:close()

return content

end

-- Read a commit exclude file and return its content as a table. Comments

-- starting with # and text after a hash is ignored.

local function read_exclude(filename)

local file = assert(io.open(filename, "r"))

local content = {}

for line in file:lines() do

local hash = line:match("^%x+")

if hash then

-- Hashes are 40 chars; if less, expand short hash.

if #hash < 40 then

impUnsubmitted

Not Done

why 40?

imp: why 40?

emasteAuthorUnsubmitted

Done

a git sha-1 hash is 40 characters

emaste: a git sha-1 hash is 40 characters

hash = exec_command(

"git show --pretty=%H --no-patch " .. hash)

end

table.insert(content, hash)

end

file:close()

return content

end

--- Remove hashes from 'set1' list that are present in 'set2' list

local function set_difference(set1, set2)

local set2_values = {}

for _, value in ipairs(set2) do

set2_values[value] = true

end

local result = {}

for _, value in ipairs(set1) do

if not set2_values[value] then

table.insert(result, value)

end

return result

end

-- Global state

verbose = 0

local function params(from_branch, to_branch, author)

print("from: " .. from_branch)

print("to: " .. to_branch)

if #author > 0 then

print("author/committer: " .. author)

else

print("author/committer: <all>")

end

local function usage(from_branch, to_branch, author)

local script_name = arg[0]:match("([^/]+)$")

emasteAuthorUnsubmitted

Done

$(basename $0) needs updating

emaste: `$(basename $0)` needs updating

print(script_name .. " [-ah] [-f from_branch] [-t to_branch] [-u user] [-X exclude_file] [path ...]")

print()

params(from_branch, to_branch, author)

end

-- Main function

local function main()

local from_branch = "freebsd/main"

local to_branch = ""

local author = os.getenv("USER") or ""

local dirspec = nil

impUnsubmitted

Not Done

maybe this should be 'os.getenv("FREEBSD_USER") or os.getenv("USER") or ""'

imp: maybe this should be 'os.getenv("FREEBSD_USER") or os.getenv("USER") or ""'

emasteAuthorUnsubmitted

Done

emaste: We don't have any existing use of `FREEBSD_USER`, right? This is to accommodate the case where…

local url = exec_command("git remote get-url freebsd")

local freebsd_repo = string.match(url, "[^/]+$")

freebsd_repo = string.gsub(freebsd_repo, ".git$", "")

if freebsd_repo == "ports" or freebsd_repo == "freebsd-ports" then

local year = os.date("%Y")

local month = os.date("%m")

local qtr = math.ceil(month / 3)

to_branch = "freebsd/" .. year .. "Q" .. qtr

elseif freebsd_repo == "src" or freebsd_repo == "freebsd-src" then

to_branch = "freebsd/stable/14"

-- If pwd is a stable or release branch tree, default to it.

local cur_branch = exec_command("git symbolic-ref --short HEAD")

if string.match(cur_branch, "^stable/") then

to_branch = cur_branch

elseif string.match(cur_branch, "^releng/") then

to_branch = cur_branch

local major = string.match(cur_branch, "%d+")

from_branch = "freebsd/stable/" .. major

end

else

print("pwd is not under a ports or src repository.")

return

end

local do_help = false

local exclude_file = nil

local i = 1

while i <= #arg and arg[i] do

local opt = arg[i]

impUnsubmitted

Not Done

Option parsing is a big reason I've done things in python :)
or rather :(.

imp: Option parsing is a big reason I've done things in python :) or rather :(.

emasteAuthorUnsubmitted

Done

yeah it's a bit janky

emaste: yeah it's a bit janky

if opt == "-a" then

author = ""

elseif opt == "-f" then

from_branch = arg[i + 1]

i = i + 1

elseif opt == "-h" then

do_help = true

i = i + 1

elseif opt == "-t" then

to_branch = arg[i + 1]

i = i + 1

elseif opt == "-u" then

author = arg[i + 1]

i = i + 1

elseif opt == "-v" then

verbose = verbose + 1

elseif opt == "-X" then

exclude_file = arg[i + 1]

print ("-X not working")

i = i + 1

else

break

end

i = i + 1

end

if do_help then

usage(from_branch, to_branch, author)

return

end

if arg[i] then

dirspec = arg[i]

--print("dirspec = " .. dirspec)

-- XXX handle multiple dirspecs?

end

if verbose > 0 then

params(from_branch, to_branch, author)

end

local from_hashes = read_from(from_branch, to_branch, author, dirspec)

local to_hashes = read_to(from_branch, to_branch, dirspec)

local result_hashes = set_difference(from_hashes, to_hashes)

if exclude_file then

exclude_hashes = read_exclude(exclude_file)

result_hashes = set_difference(result_hashes, exclude_hashes)

end

-- Print the result

for _, hash in ipairs(result_hashes) do

print(exec_command("git show --pretty='%h %s' --no-patch " .. hash))

end

main()

View Options

stand/libsa/Makefile

This file was added.

Property	Old Value	New Value
File Mode	null	100755

#!/usr/libexec/flua

-- SPDX-License-Identifier: BSD-2-Clause

-- MFC candidate search utility. Identify hashes that exist only in the

-- "MFC from" branch and do not have a corresponding "cherry picked from"

-- commit in the "MFC to" branch.

jhbUnsubmitted

Done

Should the license comment be the first comment?

jhb: Should the license comment be the first comment?

impUnsubmitted

Not Done

imp: The current style that we've been promoting is to have the license stuff first and to have it…

-- Execute a command and return its output. A final newline is stripped,

-- similar to sh.

emasteAuthorUnsubmitted

Done

- -- Execute a command and return its output. A final newlineis stripped,

+ -- Execute a command and return its output. A final newline is stripped,

-- similar to sh.

emaste:

local function exec_command(command)

local handle = assert(io.popen(command))

local output = handle:read("a")

kevansUnsubmitted

Not Done

I'd probably wrap all of these io ops in assert()

kevans: I'd probably wrap all of these io ops in assert()

handle:close()

if output:sub(-1) == "\n" then

return output:sub(1, -2)

end

return output

end

kevansUnsubmitted

Done

Inconsistent style

kevans: Inconsistent style

-- Return a table of cherry-pick (MFC) candidates.

local function read_from(from_branch, to_branch, author, dirspec)

local command = "git rev-list --first-parent --reverse "

command = command .. to_branch .. ".." .. from_branch

if #author > 0 then

command = command .. " --committer \\<" .. author .. "@"

end

if dirspec then

command = command .. " " .. dirspec

end

if verbose > 1 then

print("Obtaining MFC-from commits using command:")

print(command)

end

local handle = assert(io.popen(command))

local content = {}

kevansUnsubmitted

Done

assert

kevans: assert

for line in handle:lines() do

table.insert(content, line)

end

handle:close()

return content

end

-- Return a table of original hashes of changes that have already been

-- cherry-picked (MFC'd).

local function read_to(from_branch, to_branch, dirspec)

local command = "git log " .. from_branch .. ".." .. to_branch

command = command .. " --grep 'cherry picked from'"

if dirspec then

command = command .. " " .. dirspec

end

if verbose > 1 then

print("Obtaining MFC-to commits using command:")

emasteAuthorUnsubmitted

Done

I semi-mechanically converted this from shell. Should switch this to be done in Lua instead of invoking sed.

emaste: I semi-mechanically converted this from shell. Should switch this to be done in Lua instead of…

print(command)

end

local handle = assert(io.popen(command))

local content = {}

for line in handle:lines() do

local hash = line:match("%(cherry picked from commit ([0-9a-f]+)%)")

if hash then

table.insert(content, hash)

end

handle:close()

return content

end

-- Read a commit exclude file and return its content as a table. Comments

-- starting with # and text after a hash is ignored.

local function read_exclude(filename)

local file = assert(io.open(filename, "r"))

local content = {}

for line in file:lines() do

local hash = line:match("^%x+")

if hash then

-- Hashes are 40 chars; if less, expand short hash.

if #hash < 40 then

impUnsubmitted

Not Done

why 40?

imp: why 40?

emasteAuthorUnsubmitted

Done

a git sha-1 hash is 40 characters

emaste: a git sha-1 hash is 40 characters

hash = exec_command(

"git show --pretty=%H --no-patch " .. hash)

end

table.insert(content, hash)

end

file:close()

return content

end

--- Remove hashes from 'set1' list that are present in 'set2' list

local function set_difference(set1, set2)

local set2_values = {}

for _, value in ipairs(set2) do

set2_values[value] = true

end

local result = {}

for _, value in ipairs(set1) do

if not set2_values[value] then

table.insert(result, value)

end

return result

end

-- Global state

verbose = 0

local function params(from_branch, to_branch, author)

print("from: " .. from_branch)

print("to: " .. to_branch)

if #author > 0 then

print("author/committer: " .. author)

else

print("author/committer: <all>")

end

local function usage(from_branch, to_branch, author)

local script_name = arg[0]:match("([^/]+)$")

emasteAuthorUnsubmitted

Done

$(basename $0) needs updating

emaste: `$(basename $0)` needs updating

print(script_name .. " [-ah] [-f from_branch] [-t to_branch] [-u user] [-X exclude_file] [path ...]")

print()

params(from_branch, to_branch, author)

end

-- Main function

local function main()

local from_branch = "freebsd/main"

local to_branch = ""

local author = os.getenv("USER") or ""

local dirspec = nil

impUnsubmitted

Not Done

maybe this should be 'os.getenv("FREEBSD_USER") or os.getenv("USER") or ""'

imp: maybe this should be 'os.getenv("FREEBSD_USER") or os.getenv("USER") or ""'

emasteAuthorUnsubmitted

Done

emaste: We don't have any existing use of `FREEBSD_USER`, right? This is to accommodate the case where…

local url = exec_command("git remote get-url freebsd")

local freebsd_repo = string.match(url, "[^/]+$")

freebsd_repo = string.gsub(freebsd_repo, ".git$", "")

if freebsd_repo == "ports" or freebsd_repo == "freebsd-ports" then

local year = os.date("%Y")

local month = os.date("%m")

local qtr = math.ceil(month / 3)

to_branch = "freebsd/" .. year .. "Q" .. qtr

elseif freebsd_repo == "src" or freebsd_repo == "freebsd-src" then

to_branch = "freebsd/stable/14"

-- If pwd is a stable or release branch tree, default to it.

local cur_branch = exec_command("git symbolic-ref --short HEAD")

if string.match(cur_branch, "^stable/") then

to_branch = cur_branch

elseif string.match(cur_branch, "^releng/") then

to_branch = cur_branch

local major = string.match(cur_branch, "%d+")

from_branch = "freebsd/stable/" .. major

end

else

print("pwd is not under a ports or src repository.")

return

end

local do_help = false

local exclude_file = nil

local i = 1

while i <= #arg and arg[i] do

local opt = arg[i]

impUnsubmitted

Not Done

Option parsing is a big reason I've done things in python :)
or rather :(.

imp: Option parsing is a big reason I've done things in python :) or rather :(.

emasteAuthorUnsubmitted

Done

yeah it's a bit janky

emaste: yeah it's a bit janky

if opt == "-a" then

author = ""

elseif opt == "-f" then

from_branch = arg[i + 1]

i = i + 1

elseif opt == "-h" then

do_help = true

i = i + 1

elseif opt == "-t" then

to_branch = arg[i + 1]

i = i + 1

elseif opt == "-u" then

author = arg[i + 1]

i = i + 1

elseif opt == "-v" then

verbose = verbose + 1

elseif opt == "-X" then

exclude_file = arg[i + 1]

print ("-X not working")

i = i + 1

else

break

end

i = i + 1

end

if do_help then

usage(from_branch, to_branch, author)

return

end

if arg[i] then

dirspec = arg[i]

--print("dirspec = " .. dirspec)

-- XXX handle multiple dirspecs?

end

if verbose > 0 then

params(from_branch, to_branch, author)

end

local from_hashes = read_from(from_branch, to_branch, author, dirspec)

local to_hashes = read_to(from_branch, to_branch, dirspec)

local result_hashes = set_difference(from_hashes, to_hashes)

if exclude_file then

exclude_hashes = read_exclude(exclude_file)

result_hashes = set_difference(result_hashes, exclude_hashes)

end

-- Print the result

for _, hash in ipairs(result_hashes) do

print(exec_command("git show --pretty='%h %s' --no-patch " .. hash))

end

main()

View Options

stand/libsa/nvstore.h

This file was added.

Property	Old Value	New Value
File Mode	null	100755

#!/usr/libexec/flua

-- SPDX-License-Identifier: BSD-2-Clause

-- MFC candidate search utility. Identify hashes that exist only in the

-- "MFC from" branch and do not have a corresponding "cherry picked from"

-- commit in the "MFC to" branch.

jhbUnsubmitted

Done

Should the license comment be the first comment?

jhb: Should the license comment be the first comment?

impUnsubmitted

Not Done

imp: The current style that we've been promoting is to have the license stuff first and to have it…

-- Execute a command and return its output. A final newline is stripped,

-- similar to sh.

emasteAuthorUnsubmitted

Done

- -- Execute a command and return its output. A final newlineis stripped,

+ -- Execute a command and return its output. A final newline is stripped,

-- similar to sh.

emaste:

local function exec_command(command)

local handle = assert(io.popen(command))

local output = handle:read("a")

kevansUnsubmitted

Not Done

I'd probably wrap all of these io ops in assert()

kevans: I'd probably wrap all of these io ops in assert()

handle:close()

if output:sub(-1) == "\n" then

return output:sub(1, -2)

end

return output

end

kevansUnsubmitted

Done

Inconsistent style

kevans: Inconsistent style

-- Return a table of cherry-pick (MFC) candidates.

local function read_from(from_branch, to_branch, author, dirspec)

local command = "git rev-list --first-parent --reverse "

command = command .. to_branch .. ".." .. from_branch

if #author > 0 then

command = command .. " --committer \\<" .. author .. "@"

end

if dirspec then

command = command .. " " .. dirspec

end

if verbose > 1 then

print("Obtaining MFC-from commits using command:")

print(command)

end

local handle = assert(io.popen(command))

local content = {}

kevansUnsubmitted

Done

assert

kevans: assert

for line in handle:lines() do

table.insert(content, line)

end

handle:close()

return content

end

-- Return a table of original hashes of changes that have already been

-- cherry-picked (MFC'd).

local function read_to(from_branch, to_branch, dirspec)

local command = "git log " .. from_branch .. ".." .. to_branch

command = command .. " --grep 'cherry picked from'"

if dirspec then

command = command .. " " .. dirspec

end

if verbose > 1 then

print("Obtaining MFC-to commits using command:")

emasteAuthorUnsubmitted

Done

I semi-mechanically converted this from shell. Should switch this to be done in Lua instead of invoking sed.

emaste: I semi-mechanically converted this from shell. Should switch this to be done in Lua instead of…

print(command)

end

local handle = assert(io.popen(command))

local content = {}

for line in handle:lines() do

local hash = line:match("%(cherry picked from commit ([0-9a-f]+)%)")

if hash then

table.insert(content, hash)

end

handle:close()

return content

end

-- Read a commit exclude file and return its content as a table. Comments

-- starting with # and text after a hash is ignored.

local function read_exclude(filename)

local file = assert(io.open(filename, "r"))

local content = {}

for line in file:lines() do

local hash = line:match("^%x+")

if hash then

-- Hashes are 40 chars; if less, expand short hash.

if #hash < 40 then

impUnsubmitted

Not Done

why 40?

imp: why 40?

emasteAuthorUnsubmitted

Done

a git sha-1 hash is 40 characters

emaste: a git sha-1 hash is 40 characters

hash = exec_command(

"git show --pretty=%H --no-patch " .. hash)

end

table.insert(content, hash)

end

file:close()

return content

end

--- Remove hashes from 'set1' list that are present in 'set2' list

local function set_difference(set1, set2)

local set2_values = {}

for _, value in ipairs(set2) do

set2_values[value] = true

end

local result = {}

for _, value in ipairs(set1) do

if not set2_values[value] then

table.insert(result, value)

end

return result

end

-- Global state

verbose = 0

local function params(from_branch, to_branch, author)

print("from: " .. from_branch)

print("to: " .. to_branch)

if #author > 0 then

print("author/committer: " .. author)

else

print("author/committer: <all>")

end

local function usage(from_branch, to_branch, author)

local script_name = arg[0]:match("([^/]+)$")

emasteAuthorUnsubmitted

Done

$(basename $0) needs updating

emaste: `$(basename $0)` needs updating

print(script_name .. " [-ah] [-f from_branch] [-t to_branch] [-u user] [-X exclude_file] [path ...]")

print()

params(from_branch, to_branch, author)

end

-- Main function

local function main()

local from_branch = "freebsd/main"

local to_branch = ""

local author = os.getenv("USER") or ""

local dirspec = nil

impUnsubmitted

Not Done

maybe this should be 'os.getenv("FREEBSD_USER") or os.getenv("USER") or ""'

imp: maybe this should be 'os.getenv("FREEBSD_USER") or os.getenv("USER") or ""'

emasteAuthorUnsubmitted

Done

emaste: We don't have any existing use of `FREEBSD_USER`, right? This is to accommodate the case where…

local url = exec_command("git remote get-url freebsd")

local freebsd_repo = string.match(url, "[^/]+$")

freebsd_repo = string.gsub(freebsd_repo, ".git$", "")

if freebsd_repo == "ports" or freebsd_repo == "freebsd-ports" then

local year = os.date("%Y")

local month = os.date("%m")

local qtr = math.ceil(month / 3)

to_branch = "freebsd/" .. year .. "Q" .. qtr

elseif freebsd_repo == "src" or freebsd_repo == "freebsd-src" then

to_branch = "freebsd/stable/14"

-- If pwd is a stable or release branch tree, default to it.

local cur_branch = exec_command("git symbolic-ref --short HEAD")

if string.match(cur_branch, "^stable/") then

to_branch = cur_branch

elseif string.match(cur_branch, "^releng/") then

to_branch = cur_branch

local major = string.match(cur_branch, "%d+")

from_branch = "freebsd/stable/" .. major

end

else

print("pwd is not under a ports or src repository.")

return

end

local do_help = false

local exclude_file = nil

local i = 1

while i <= #arg and arg[i] do

local opt = arg[i]

impUnsubmitted

Not Done

Option parsing is a big reason I've done things in python :)
or rather :(.

imp: Option parsing is a big reason I've done things in python :) or rather :(.

emasteAuthorUnsubmitted

Done

yeah it's a bit janky

emaste: yeah it's a bit janky

if opt == "-a" then

author = ""

elseif opt == "-f" then

from_branch = arg[i + 1]

i = i + 1

elseif opt == "-h" then

do_help = true

i = i + 1

elseif opt == "-t" then

to_branch = arg[i + 1]

i = i + 1

elseif opt == "-u" then

author = arg[i + 1]

i = i + 1

elseif opt == "-v" then

verbose = verbose + 1

elseif opt == "-X" then

exclude_file = arg[i + 1]

print ("-X not working")

i = i + 1

else

break

end

i = i + 1

end

if do_help then

usage(from_branch, to_branch, author)

return

end

if arg[i] then

dirspec = arg[i]

--print("dirspec = " .. dirspec)

-- XXX handle multiple dirspecs?

end

if verbose > 0 then

params(from_branch, to_branch, author)

end

local from_hashes = read_from(from_branch, to_branch, author, dirspec)

local to_hashes = read_to(from_branch, to_branch, dirspec)

local result_hashes = set_difference(from_hashes, to_hashes)

if exclude_file then

exclude_hashes = read_exclude(exclude_file)

result_hashes = set_difference(result_hashes, exclude_hashes)

end

-- Print the result

for _, hash in ipairs(result_hashes) do

print(exec_command("git show --pretty='%h %s' --no-patch " .. hash))

end

main()

View Options

stand/libsa/nvstore.c

View Options

stand: Separate base and cli parts of nvstoreClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 115051

stand/common/bootstrap.h

stand/common/nvstore.c

stand/libsa/Makefile

stand/libsa/nvstore.h

stand/libsa/nvstore.c

stand/libsa/stand.h

stand: Separate base and cli parts of nvstore
ClosedPublic
Actions

Revision Contents
Changeset List