|
@@ -246,13 +246,15 @@ cd "$DEST"
|
|
|
init_git_repo
|
|
init_git_repo
|
|
|
build_commit_msg() {
|
|
build_commit_msg() {
|
|
|
local rev="$1"
|
|
local rev="$1"
|
|
|
- local svn_log author msg_body
|
|
|
|
|
|
|
+ local svn_log author msg_body commit_date
|
|
|
svn_log="$(svn log -r "$rev" -l 1 "$SRC_URL")"
|
|
svn_log="$(svn log -r "$rev" -l 1 "$SRC_URL")"
|
|
|
author="$(printf "%s\n" "$svn_log" | awk 'NR==2{split($0,a,"|"); gsub(/^ +| +$/,"",a[2]); print a[2]}')"
|
|
author="$(printf "%s\n" "$svn_log" | awk 'NR==2{split($0,a,"|"); gsub(/^ +| +$/,"",a[2]); print a[2]}')"
|
|
|
|
|
+ commit_date="$(printf "%s\n" "$svn_log" | awk 'NR==2{split($0,a,"|"); gsub(/^ +| +$/,"",a[3]); split(a[3],b," "); print b[1] " " b[2]}')"
|
|
|
msg_body="$(printf "%s\n" "$svn_log" | sed '1,2d;/^---/,$d')"
|
|
msg_body="$(printf "%s\n" "$svn_log" | sed '1,2d;/^---/,$d')"
|
|
|
if { [[ -z "$author" ]] || [[ -z "$msg_body" ]]; } && [[ -n "$REPO_ROOT" ]]; then
|
|
if { [[ -z "$author" ]] || [[ -z "$msg_body" ]]; } && [[ -n "$REPO_ROOT" ]]; then
|
|
|
svn_log="$(svn log -r "$rev" -l 1 "$REPO_ROOT" 2>/dev/null || true)"
|
|
svn_log="$(svn log -r "$rev" -l 1 "$REPO_ROOT" 2>/dev/null || true)"
|
|
|
author="$(printf "%s\n" "$svn_log" | awk 'NR==2{split($0,a,"|"); gsub(/^ +| +$/,"",a[2]); print a[2]}')"
|
|
author="$(printf "%s\n" "$svn_log" | awk 'NR==2{split($0,a,"|"); gsub(/^ +| +$/,"",a[2]); print a[2]}')"
|
|
|
|
|
+ commit_date="$(printf "%s\n" "$svn_log" | awk 'NR==2{split($0,a,"|"); gsub(/^ +| +$/,"",a[3]); split(a[3],b," "); print b[1] " " b[2]}')"
|
|
|
msg_body="$(printf "%s\n" "$svn_log" | sed '1,2d;/^---/,$d')"
|
|
msg_body="$(printf "%s\n" "$svn_log" | sed '1,2d;/^---/,$d')"
|
|
|
fi
|
|
fi
|
|
|
msg_body="$(printf "%s" "$msg_body" | perl -0777 -pe 's/\A\s+//; s/\s+\z//; s/\n{2,}/\n\n/g')"
|
|
msg_body="$(printf "%s" "$msg_body" | perl -0777 -pe 's/\A\s+//; s/\s+\z//; s/\n{2,}/\n\n/g')"
|
|
@@ -260,7 +262,9 @@ build_commit_msg() {
|
|
|
COMMIT_BODY_FIRST="$(printf "%s" "$msg_body" | sed -n '1p')"
|
|
COMMIT_BODY_FIRST="$(printf "%s" "$msg_body" | sed -n '1p')"
|
|
|
COMMIT_SUBJECT="SVN r${rev}"
|
|
COMMIT_SUBJECT="SVN r${rev}"
|
|
|
[[ -n "$author" ]] && COMMIT_SUBJECT+=" by $author"
|
|
[[ -n "$author" ]] && COMMIT_SUBJECT+=" by $author"
|
|
|
|
|
+ COMMIT_DATE="$commit_date"
|
|
|
COMMIT_PROGRESS="$COMMIT_SUBJECT"
|
|
COMMIT_PROGRESS="$COMMIT_SUBJECT"
|
|
|
|
|
+ [[ -n "$COMMIT_DATE" ]] && COMMIT_PROGRESS="[$COMMIT_DATE] $COMMIT_PROGRESS"
|
|
|
[[ -n "$COMMIT_BODY_FIRST" ]] && COMMIT_PROGRESS+=" — $COMMIT_BODY_FIRST"
|
|
[[ -n "$COMMIT_BODY_FIRST" ]] && COMMIT_PROGRESS+=" — $COMMIT_BODY_FIRST"
|
|
|
}
|
|
}
|
|
|
|
|
|