mirror of
https://review.coreboot.org/flashrom.git
synced 2025-07-02 14:33:18 +02:00
Convert flashrom to git
- Drop support for Subversion in the getrevision script and Makefile.
- Add .gitignore and .gitattributes file (the latter to limit exports).
- Restore modification dates of the exported files from the SCM.
- Stop exporting SCM log dumps to CHANGELOG. This makes no sense.
- Do not export the pre-"compiled" manpage. It can be generated like
anything else from the code dump when we export the respective
variable.
The latter is added with this change.
- Add some initial client-side git hooks
* When committing check for obvious stuff you never want anyway:
- white space errors
* When pushing to the upstream repository check mandatory rules:
- existing signoffs and acks in all new commits
- no deletions or creation of branches
- do not rewrite history of the precious branches, even if forced
NOTE: This patch is adapted from Stefan Tauner's original commit:
https://mail.coreboot.org/pipermail/flashrom/2016-November/014877.html
There are a few major differences:
- This uses coreboot's commit-msg hook which includes support for
generating and appending Change-Id.
- djgpp-dos target removal is moved to a follow-up patch.
- Version string changes are moved to a follow-up patch.
Change-Id: I64eef21982cac0a0a7419bcd2c8a936672ae9cb2
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Signed-off-by: David Hendricks <dhendricks@fb.com>
Reviewed-on: https://review.coreboot.org/19206
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Stefan Tauner
committed by
David Hendricks
David Hendricks
parent
8624e8cfa8
commit
7634708c98
@ -5,7 +5,7 @@
|
||||
# Copyright (C) 2005 coresystems GmbH <stepan@coresystems.de>
|
||||
# Copyright (C) 2009,2010 Carl-Daniel Hailfinger
|
||||
# Copyright (C) 2010 Chromium OS Authors
|
||||
# Copyright (C) 2013 Stefan Tauner
|
||||
# Copyright (C) 2013-2016 Stefan Tauner
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@ -31,30 +31,24 @@ export LC_ALL=C
|
||||
export TZ=UTC0
|
||||
|
||||
# Helper functions
|
||||
# First argument is the path to inspect (usually optional; w/o it the whole repository will be considered)
|
||||
svn_has_local_changes() {
|
||||
svn status "$1" | egrep '^ *[ADMR] *' >/dev/null
|
||||
}
|
||||
|
||||
# First argument is the path to inspect (usually optional; without
|
||||
# it the whole repository will be considered)
|
||||
git_has_local_changes() {
|
||||
git update-index -q --refresh >/dev/null
|
||||
! git diff-index --quiet HEAD -- "$1"
|
||||
}
|
||||
|
||||
git_last_commit() {
|
||||
# git rev-parse --short HEAD would suffice if repository as a whole is of interest (no $1)
|
||||
git log --pretty=format:"%h" -1 -- "$1"
|
||||
}
|
||||
|
||||
svn_is_file_tracked() {
|
||||
svn info "$1" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
git_is_file_tracked() {
|
||||
git ls-files --error-unmatch -- "$1" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
is_file_tracked() {
|
||||
svn_is_file_tracked "$1" || git_is_file_tracked "$1"
|
||||
git_is_file_tracked "$1"
|
||||
}
|
||||
|
||||
# Tries to find a remote source for the changes committed locally.
|
||||
@ -62,7 +56,7 @@ is_file_tracked() {
|
||||
# Takes one optional argument: the path to inspect
|
||||
git_url() {
|
||||
last_commit=$(git_last_commit "$1")
|
||||
# get all remote branches containing the last commit (excluding origin/HEAD and git-svn branches/tags)
|
||||
# get all remote branches containing the last commit (excluding origin/HEAD)
|
||||
branches=$(git branch -r --contains $last_commit | sed '/\//!d;/.*->.*/d;s/[\t ]*//')
|
||||
if [ -z "$branches" ] ; then
|
||||
echo "No remote branch contains a suitable commit">&2
|
||||
@ -89,13 +83,7 @@ git_url() {
|
||||
scm_url() {
|
||||
local url=
|
||||
|
||||
# for a primitive VCS like subversion finding the URL is easy: there is only one upstream host
|
||||
if svn_is_file_tracked "$1" ; then
|
||||
url="$(svn info "$1" 2>/dev/null |
|
||||
grep URL: |
|
||||
sed 's/.*URL:[[:blank:]]*//;s/:\/\/.*@/:\/\//' |
|
||||
grep ^.)"
|
||||
elif git_is_file_tracked "$1" ; then
|
||||
if git_is_file_tracked "$1" ; then
|
||||
url="$(git_url "$1")"
|
||||
else
|
||||
return ${EXIT_FAILURE}
|
||||
@ -116,29 +104,7 @@ timestamp() {
|
||||
# freebsd date [-jnu] [-d dst] [-r seconds] [-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format] [...]
|
||||
# dragonflybsd date [-jnu] [-d dst] [-r seconds] [-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format] [...]
|
||||
# openbsd date [-aju] [-d dst] [-r seconds] [+format] [[[[[[cc]yy]mm]dd]HH]MM[.SS]] [...]
|
||||
if svn_is_file_tracked "$2" ; then
|
||||
if svn_has_local_changes "$2"; then
|
||||
t=$(date -u "$1")
|
||||
else
|
||||
# No local changes, get date of the last log record. Subversion provides that in
|
||||
# ISO 8601 format when using the --xml switch. The sed call extracts that ignoring any
|
||||
# fractional parts started by a comma or a dot.
|
||||
local last_commit_date="$(svn info --xml "$2"| \
|
||||
sed -n -e 's/<date>\([^,\.]*\)\([\.,].*\)*Z<\/date>/\1Z/p')"
|
||||
|
||||
case $(uname) in
|
||||
# Most BSD dates do not support parsing date values from user input with -d but all of
|
||||
# them support parsing the syntax with [[[[[[cc]yy]mm]dd]HH]MM[.ss]]. We have to
|
||||
# transform the ISO8601 date first though.
|
||||
NetBSD|OpenBSD|DragonFly|FreeBSD)
|
||||
last_commit_date="$(echo ${last_commit_date} | \
|
||||
sed -n -e 's/\(....\)-\(..\)-\(..\)T\(..\):\(..\):\(..\)Z/\1\2\3\4\5\.\6/p')"
|
||||
t=$(date -u -j "${last_commit_date}" "$1" 2>/dev/null);;
|
||||
*)
|
||||
t=$(date -u -d "${last_commit_date}" "$1" 2>/dev/null);;
|
||||
esac
|
||||
fi
|
||||
elif git_is_file_tracked "$2" ; then
|
||||
if git_is_file_tracked "$2" ; then
|
||||
# are there local changes?
|
||||
if git_has_local_changes "$2" ; then
|
||||
t=$(date -u "${1}")
|
||||
@ -163,24 +129,10 @@ timestamp() {
|
||||
echo "${t}"
|
||||
}
|
||||
|
||||
# Retrieve local SCM revision info. This is useful if we're working in a different SCM than upstream and/or
|
||||
# have local changes.
|
||||
# Retrieve local revision info.
|
||||
local_revision() {
|
||||
local r=
|
||||
|
||||
if svn_is_file_tracked "$1" ; then
|
||||
r=$(svn_has_local_changes "$1" && echo "dirty")
|
||||
elif git_is_file_tracked "$1" ; then
|
||||
r=$(git_last_commit "$1")
|
||||
|
||||
local svn_base=$(git log --grep=git-svn-id -1 --format='%h')
|
||||
if [ "$svn_base" != "" ] ; then
|
||||
local diff_to_svn=$(git rev-list --count ${svn_base}..${r})
|
||||
if [ "$diff_to_svn" -gt 0 ] ; then
|
||||
r="$r-$diff_to_svn"
|
||||
fi
|
||||
fi
|
||||
|
||||
if git_is_file_tracked "$1" ; then
|
||||
local r=$(git describe $(git_last_commit "$1"))
|
||||
if git_has_local_changes "$1" ; then
|
||||
r="$r-dirty"
|
||||
fi
|
||||
@ -191,30 +143,6 @@ local_revision() {
|
||||
echo "${r}"
|
||||
}
|
||||
|
||||
# Get the upstream flashrom revision stored in SVN metadata.
|
||||
upstream_revision() {
|
||||
local r=
|
||||
|
||||
if svn_is_file_tracked "$1" ; then
|
||||
r=$(svn info "$1" 2>/dev/null | \
|
||||
grep "Last Changed Rev:" | \
|
||||
sed -e "s/^Last Changed Rev: *//" -e "s/\([0-9]*\).*/r\1/" | \
|
||||
grep "r[0-9]")
|
||||
elif git_is_file_tracked "$1" ; then
|
||||
# If this is a "native" git-svn clone we could use git svn log:
|
||||
# git svn log --oneline -1 | sed 's/^r//;s/[[:blank:]].*//' or even git svn find-rev
|
||||
# but it is easier to just grep for the git-svn-id unconditionally
|
||||
r=$(git log --grep=git-svn-id -1 -- "$1" | \
|
||||
grep git-svn-id | \
|
||||
sed 's/.*@/r/;s/[[:blank:]].*//')
|
||||
fi
|
||||
|
||||
if [ -z "$r" ]; then
|
||||
r="unknown" # default to unknown
|
||||
fi
|
||||
echo "${r}"
|
||||
}
|
||||
|
||||
is_tracked() {
|
||||
is_file_tracked "$1"
|
||||
}
|
||||
@ -230,8 +158,6 @@ Commands
|
||||
test if path is under version control at all
|
||||
-l or --local
|
||||
local revision information including an indicator for uncommitted changes
|
||||
-u or --upstream
|
||||
upstream revision
|
||||
-U or --url
|
||||
URL associated with the latest commit
|
||||
-d or --date
|
||||
@ -264,10 +190,6 @@ main() {
|
||||
check_action $1
|
||||
action=local_revision
|
||||
shift;;
|
||||
-u|--upstream)
|
||||
check_action $1
|
||||
action=upstream_revision
|
||||
shift;;
|
||||
-U|--url)
|
||||
check_action $1
|
||||
action=scm_url
|
||||
@ -281,8 +203,8 @@ main() {
|
||||
action="timestamp +%Y-%m-%dT%H:%M:%SZ" # There is only one valid time format! ISO 8601
|
||||
shift;;
|
||||
-c|--check)
|
||||
check_action=$1
|
||||
action="is_tracked"
|
||||
check_action $1
|
||||
action=is_tracked
|
||||
shift;;
|
||||
-*)
|
||||
show_help;
|
||||
@ -306,9 +228,6 @@ main() {
|
||||
if [ -z "$query_path" ] ; then
|
||||
query_path=.
|
||||
fi
|
||||
if ! is_file_tracked "$query_path" ; then
|
||||
echo "Warning: Path \"${query_path}\" is not under version control.">&2
|
||||
fi
|
||||
if [ -z "$action" ] ; then
|
||||
show_help
|
||||
echo "Error: No actions specified"
|
||||
|
||||
Reference in New Issue
Block a user