Changes between Version 4 and Version 5 of CommittersTipsAndTricks

Timestamp:

Jun 2, 2008, 1:18:27 PM (16 years ago)

Author:

raimue (Rainer Müller)

Comment:

New version of the trac-patch script

CommittersTipsAndTricks

@@ -22 +22 @@
 == Apply patches directly from Trac URL ==
 
+=== Installation ===
 Add the following functions to your `.bashrc` in order to apply patches directly from Trac.
  
@@ -30 +31 @@
 
 function trac-patch {
-    trac-get $1 || return
-    patch -p0 < $(basename $1)
+    local cmd=""
+    while [[ $1 == -* ]]; do
+        if [[ "$1" == "--" ]]; then
+            break
+        fi
+
+        cmd="$cmd $1"
+        shift
+    done
+
+    if [[ -z $cmd ]]; then
+        cmd="-p0"
+    fi  
+
+    trac-get $1
+    patch $cmd < $(basename $1)
 }
 }}}
+
+=== Usage ===
 
 Use like this:
@@ -45 +62 @@
 $ trac-patch http://trac.macports.org/attachment/ticket/.../Portfile.diff
 }}}
+
+You can also add options which will get passed through to the patch tool. This is especially useful when the patch needs another prefix level.
+{{{
+$ trac-patch -p1 http://trac.macports.org/attachment/ticket/.../Portfile.diff
+}}}
+If you don't add any option, `-p0` is used as a default. This should be the most common case.