hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject git commit: HBASE-12249 Addendum - Convert tabs to spaces
Date Wed, 22 Oct 2014 05:20:57 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 a5bb441d4 -> 967f7e2b8


HBASE-12249 Addendum - Convert tabs to spaces


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/967f7e2b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/967f7e2b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/967f7e2b

Branch: refs/heads/branch-1
Commit: 967f7e2b8de522b730fc5ccb58e4375e3e5f8071
Parents: a5bb441
Author: Misty Stanley-Jones <mstanleyjones@cloudera.com>
Authored: Wed Oct 22 15:17:15 2014 +1000
Committer: Misty Stanley-Jones <mstanleyjones@cloudera.com>
Committed: Wed Oct 22 15:20:20 2014 +1000

----------------------------------------------------------------------
 dev-support/make_patch.sh | 82 +++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/967f7e2b/dev-support/make_patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/make_patch.sh b/dev-support/make_patch.sh
index b48cc3b..e8f44ec 100755
--- a/dev-support/make_patch.sh
+++ b/dev-support/make_patch.sh
@@ -8,14 +8,14 @@ while getopts "ahd:" opt; do
         a)  addendum='-addendum'
             ;;
         d)  
-    		patch_dir=$OPTARG
+            patch_dir=$OPTARG
             ;;
         *)
             echo -e "Usage: $0 [-h] [-a] [-d] <directory> \n\
         Must be run from within the git branch to make the patch against.\n\
         -h - display these instructions.\n\
-    	-a - Add an 'addendum' prefix to the patch name.\n\
-    	-d - specify a patch directory (defaults to ~/patches/)"
+        -a - Add an 'addendum' prefix to the patch name.\n\
+        -d - specify a patch directory (defaults to ~/patches/)"
             exit 0
             ;;
     esac
@@ -24,8 +24,8 @@ done
 # Find what branch we are on
 branch=$(git branch |grep '*' |awk '{print $2}')
 if [ ! "$branch" ]; then
-	echo "Can't determine the git branch. Exiting." >&2
-	exit 1
+    echo "Can't determine the git branch. Exiting." >&2
+    exit 1
 fi
 
 # Exit if git status is dirty
@@ -40,14 +40,14 @@ fi
 git log -n 1 origin/$branch > /dev/null 2>&1
 status=$?
 if [ "$status" -eq 128 ]; then
-	# Status 128 means there is no remote branch
-	tracking_branch='origin/master'
+    # Status 128 means there is no remote branch
+    tracking_branch='origin/master'
 elif [ "$status" -eq 0 ]; then
-	# Status 0 means there is a remote branch
-	tracking_branch="origin/$branch"
+    # Status 0 means there is a remote branch
+    tracking_branch="origin/$branch"
 else
-	echo "Unknown error: $?" >&2
-	exit 1
+    echo "Unknown error: $?" >&2
+    exit 1
 fi
 
 # Deal with invalid or missing $patch_dir
@@ -65,31 +65,31 @@ fi
 # Check to see if any patch exists that includes the branch name
 status=$(ls $patch_dir/*$branch* 2>/dev/null|grep -v addendum|wc -l|awk {'print $1'})
 if [ "$status" -eq 0 ]; then
-	# This is the first patch we are making for this release
-	prefix=''
+    # This is the first patch we are making for this release
+    prefix=''
 elif  [ "$status" -ge 1 ]; then
-	# At least one patch already exists -- add a version prefix
-	for i in {1..99}; do
-		# Check to see the maximum version of patch that exists
-	   	if [ ! -f "$patch_dir/$branch-v$i.patch" ]; then
-	   		version=$i
-	   		if [ -n "$addendum" ]; then
-				# Don't increment the patch # if it is an addendum
-				echo "Creating an addendum"
-				if [ "$version" -eq 1 ]; then
-					# We are creating an addendum to the first version of the patch
-					prefix=''
-				else
-					# We are making an addendum to a different version of the patch
-					let version=$version-1
-					prefix="-v$version"
-				fi
-			else
-				prefix="-v$version"
-			fi
-			break
-	   	fi
-	done
+    # At least one patch already exists -- add a version prefix
+    for i in {1..99}; do
+        # Check to see the maximum version of patch that exists
+        if [ ! -f "$patch_dir/$branch-v$i.patch" ]; then
+            version=$i
+            if [ -n "$addendum" ]; then
+                # Don't increment the patch # if it is an addendum
+                echo "Creating an addendum"
+                if [ "$version" -eq 1 ]; then
+                    # We are creating an addendum to the first version of the patch
+                    prefix=''
+                else
+                    # We are making an addendum to a different version of the patch
+                    let version=$version-1
+                    prefix="-v$version"
+                fi
+            else
+                prefix="-v$version"
+            fi
+            break
+        fi
+    done
 fi
 
 patch_name="$branch$prefix$addendum.patch"
@@ -98,19 +98,19 @@ patch_name="$branch$prefix$addendum.patch"
 git diff --quiet $tracking_branch
 status=$?
 if [ "$status" -eq 0 ]; then
-	echo "There is no difference between $branch and $tracking_branch."
-	echo "No patch created."
-	exit 0
+    echo "There is no difference between $branch and $tracking_branch."
+    echo "No patch created."
+    exit 0
 fi
 
 # Check whether we need to squash or not
 local_commits=$(git log $tracking_branch..$branch|grep 'Author:'|wc -l|awk {'print $1'})
 if [ "$local_commits" -gt 1 ]; then
-	read -p "$local_commits commits exist only in your local branch. Interactive rebase?" yn
+    read -p "$local_commits commits exist only in your local branch. Interactive rebase?"
yn
     case $yn in
         [Yy]* ) 
-    		git rebase -i $tracking_branch
-    			;;
+            git rebase -i $tracking_branch
+                ;;
         [Nn]* ) 
           echo "Creating $patch_dir/$patch_name using git diff."
           git diff $tracking_branch > $patch_dir/$patch_name


Mime
View raw message