瀏覽代碼

🔨 Improved mfprep script

Scott Lahteine 3 年之前
父節點
當前提交
9e43ec9dcd
共有 1 個檔案被更改,包括 19 行新增5 行删除
  1. 19
    5
      buildroot/share/git/mfprep

+ 19
- 5
buildroot/share/git/mfprep 查看文件

2
 #
2
 #
3
 # mfprep tag1 [tag2]
3
 # mfprep tag1 [tag2]
4
 #
4
 #
5
-# Find commits in bugfix-2.0.x not yet in 2.0.x
5
+# Find commits in bugfix-2.0.x that are not yet in 2.0.x.
6
+#
7
+# Specify a version tag to start from, and optional version tag to end at.
8
+# For bugfix-2.0.x the tag will be prefixed by bf- to distinguish it from the version tag,
9
+# so at every release be sure to create a bf- tag and publish it to origin.
6
 #
10
 #
7
 
11
 
8
 SED=$(which gsed sed | head -n1)
12
 SED=$(which gsed sed | head -n1)
9
 SELF=`basename "$0"`
13
 SELF=`basename "$0"`
14
+DRYRUN=0
10
 
15
 
11
 [[ $# < 1 || $# > 2 ]] && { echo "Usage $SELF tag1 [tag2]" ; exit 1 ; }
16
 [[ $# < 1 || $# > 2 ]] && { echo "Usage $SELF tag1 [tag2]" ; exit 1 ; }
12
 
17
 
38
 
43
 
39
 cat "$LOG2" | while read line; do
44
 cat "$LOG2" | while read line; do
40
   #echo "... $line"
45
   #echo "... $line"
41
-  if [[ $line =~ (\(#[0-9]{5}\))$ ]]; then
42
-    PATT=${BASH_REMATCH[1]}
46
+  if [[ $line =~ \(((#[0-9]{5}),* *)((#[0-9]{5}),* *)?((#[0-9]{5}),* *)?\)$ ]]; then
47
+    PATT=""
48
+    for i in ${!BASH_REMATCH[@]}; do
49
+      if ((i > 0 && (i % 2 == 0))); then
50
+        if [[ -n "${BASH_REMATCH[i]}" ]]; then
51
+          [[ -n "$PATT" ]] && PATT="$PATT|"
52
+          PATT="$PATT${BASH_REMATCH[i]}"
53
+        fi
54
+      fi
55
+    done
43
     #echo "... $PATT"
56
     #echo "... $PATT"
57
+    [[ -n $PATT ]] && { grep -vE "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
44
   else
58
   else
45
     PATT=$( $SED -E 's/^\[[0-9a-f]{10}\]( . )?(.+)$/\2/' <<<"$line" )
59
     PATT=$( $SED -E 's/^\[[0-9a-f]{10}\]( . )?(.+)$/\2/' <<<"$line" )
60
+    [[ -n $PATT ]] && { grep -v "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
46
   fi
61
   fi
47
-  [[ -n $PATT ]] && { grep -v "$PATT" "$LOGB" >"$TMPF" ; cp "$TMPF" "$LOGB" ; }
48
 done
62
 done
49
 
63
 
50
 # Convert remaining commits into git commands
64
 # Convert remaining commits into git commands
62
 mv "$TMPF" "$SCRF"
76
 mv "$TMPF" "$SCRF"
63
 chmod ug+x "$SCRF"
77
 chmod ug+x "$SCRF"
64
 
78
 
65
-open "$TMPDIR"
79
+((DRYRUN)) && rm -r "$TMPDIR" || open "$TMPDIR"

Loading…
取消
儲存