Bläddra i källkod

Shorten SVN date in history progress output

cere 1 månad sedan
förälder
incheckning
c01e77b969
1 ändrade filer med 5 tillägg och 1 borttagningar
  1. 5 1
      svn_interact/svn_git_sync

+ 5 - 1
svn_interact/svn_git_sync

@@ -246,13 +246,15 @@ cd "$DEST"
 init_git_repo
 build_commit_msg() {
   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")"
   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')"
   if { [[ -z "$author" ]] || [[ -z "$msg_body" ]]; } && [[ -n "$REPO_ROOT" ]]; then
     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]}')"
+    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')"
   fi
   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_SUBJECT="SVN r${rev}"
   [[ -n "$author" ]] && COMMIT_SUBJECT+=" by $author"
+  COMMIT_DATE="$commit_date"
   COMMIT_PROGRESS="$COMMIT_SUBJECT"
+  [[ -n "$COMMIT_DATE" ]] && COMMIT_PROGRESS="[$COMMIT_DATE] $COMMIT_PROGRESS"
   [[ -n "$COMMIT_BODY_FIRST" ]] && COMMIT_PROGRESS+=" — $COMMIT_BODY_FIRST"
 }