Changeset 2021428 in mainline

Timestamp:

2018-05-12T16:40:25Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

df96271

Parents:

8a1be76

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-12 15:56:07)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-12 16:40:25)

Message:

Improve tools/srepl.

• option -d for removing the line entirely.
• automatically deal with slashes in the pattern.

File:

• tools/srepl (modified) (2 diffs)

tools/srepl

@@ -14 +14 @@
 }
 
-
-if [ "$1" = "--" ]; then
-        usage
-elif [ "$#" -eq 1 ]  || [ "$2" = "--" ]; then
-        pattern="$1"
-        shift
-        git grep -I -n "$pattern" "$@"
-elif [ "$#" -eq 2 ] || [ "$3" = "--" ]; then
-
+check_unstaged()
+{
         if ( git status --porcelain | grep '^.[^ ]' ); then
                 echo "You have unstaged changes in your tree."
@@ -29 +22 @@
                 exit 1
         fi
+}
 
-        pattern="$1"
-        replacement="$2"
+_slashify()
+{
+        # Some shells have shoddy handling of backslashes in echo.
+        printf '%s\n' "$1" | sed 's/\([^\\]\)\//\1\\\//g'
+}
+
+if [ "$1" = "--" ]; then
+        usage
+elif [ "$1" = "-d" ]; then
+        check_unstaged
+
+        pattern=`_slashify "$2"`
+        shift
+        shift
+        git grep -I -l "$pattern" "$@" | xargs sed -i "/$pattern/d"
+
+elif [ "$#" -eq 1 ]  || [ "$2" = "--" ]; then
+        pattern=`_slashify "$1"`
+        shift
+        git grep -I -n "$pattern" "$@"
+elif [ "$#" -eq 2 ] || [ "$3" = "--" ]; then
+        check_unstaged
+
+        pattern=`_slashify "$1"`
+        replacement=`_slashify "$2"`
         shift
         shift