Re: [PATCH/RFC 4/7] contrib/subtree: Code cleaning and refactoring

[Techlive Zheng]

2013/1/13 Techlive Zheng techlivezh...@gmail.com:
 Mostly prepare for the later tests refactoring.

 Signed-off-by: Techlive Zheng techlivezh...@gmail.com

I am personally a SP-indenting guy, I did not aware of Git's indenting
policy until now, so it is bad that I replaced all the lines initially
indent using HT with SP in the test file of this commit. I will submit
another set of patches with the right indenting.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH/RFC 4/7] contrib/subtree: Code cleaning and refactoring

[Techlive Zheng]

Mostly prepare for the later tests refactoring.

Signed-off-by: Techlive Zheng techlivezh...@gmail.com
---
 contrib/subtree/git-subtree.sh |  66 -
 contrib/subtree/t/t7900-subtree.sh | 283 +++--
 2 files changed, 179 insertions(+), 170 deletions(-)

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 138e1e0..91e6e87 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -5,7 +5,7 @@
 # Copyright (C) 2009 Avery Pennarun apenw...@gmail.com
 #
 if [ $# -eq 0 ]; then
-set -- -h
+   set -- -h
 fi
 OPTS_SPEC=\
 git subtree add   --prefix=prefix commit
@@ -110,9 +110,9 @@ if [ -z $prefix ]; then
 fi
 
 case $command in
-   add) [ -e $prefix ]  
+   add) [ -e $prefix ] 
die prefix '$prefix' already exists. ;;
-   *)   [ -e $prefix ] || 
+   *)   [ -e $prefix ] ||
die '$prefix' does not exist; use 'git subtree add' ;;
 esac
 
@@ -181,8 +181,8 @@ cache_set()
oldrev=$1
newrev=$2
if [ $oldrev != latest_old \
--a $oldrev != latest_new \
--a -e $cachedir/$oldrev ]; then
+   -a $oldrev != latest_new \
+   -a -e $cachedir/$oldrev ]; then
die cache for $oldrev already exists!
fi
echo $newrev $cachedir/$oldrev
@@ -327,7 +327,7 @@ add_msg()
fi
cat -EOF
$commit_message
-   
+
git-subtree-dir: $dir
git-subtree-mainline: $latest_old
git-subtree-split: $latest_new
@@ -355,7 +355,7 @@ rejoin_msg()
fi
cat -EOF
$commit_message
-   
+
git-subtree-dir: $dir
git-subtree-mainline: $latest_old
git-subtree-split: $latest_new
@@ -368,7 +368,7 @@ squash_msg()
oldsub=$2
newsub=$3
newsub_short=$(git rev-parse --short $newsub)
-   
+
if [ -n $oldsub ]; then
oldsub_short=$(git rev-parse --short $oldsub)
echo Squashed '$dir/' changes from 
$oldsub_short..$newsub_short
@@ -378,7 +378,7 @@ squash_msg()
else
echo Squashed '$dir/' content from commit $newsub_short
fi
-   
+
echo
echo git-subtree-dir: $dir
echo git-subtree-split: $newsub
@@ -427,7 +427,7 @@ new_squash_commit()
newsub=$3
tree=$(toptree_for_commit $newsub) || exit $?
if [ -n $old ]; then
-   squash_msg $dir $oldsub $newsub | 
+   squash_msg $dir $oldsub $newsub |
git commit-tree $tree -p $old || exit $?
else
squash_msg $dir  $newsub |
@@ -455,7 +455,7 @@ copy_or_skip()
else
nonidentical=$parent
fi
-   
+
# sometimes both old parents map to the same newparent;
# eliminate duplicates
is_new=1
@@ -470,7 +470,7 @@ copy_or_skip()
p=$p -p $parent
fi
done
-   
+
if [ -n $identical ]; then
echo $identical
else
@@ -495,14 +495,14 @@ cmd_add()
fi
 
ensure_clean
-   
+
if [ $# -eq 1 ]; then
cmd_add_commit $@
elif [ $# -eq 2 ]; then
cmd_add_repository $@
else
-   say error: parameters were '$@'
-   die Provide either a refspec or a repository and refspec.
+   say error: parameters were '$@'
+   die Provide either a refspec or a repository and refspec.
fi
 }
 
@@ -522,19 +522,19 @@ cmd_add_commit()
revs=$(git rev-parse $default --revs-only $@) || exit $?
set -- $revs
rev=$1
-   
+
debug Adding $dir as '$rev'...
git read-tree --prefix=$dir $rev || exit $?
git checkout -- $dir || exit $?
tree=$(git write-tree) || exit $?
-   
+
headrev=$(git rev-parse HEAD) || exit $?
if [ -n $headrev -a $headrev != $rev ]; then
headp=-p $headrev
else
headp=
fi
-   
+
if [ -n $squash ]; then
rev=$(new_squash_commit   $rev) || exit $?
commit=$(add_squashed_msg $rev $dir |
@@ -544,7 +544,7 @@ cmd_add_commit()
 git commit-tree $tree $headp -p $rev) || exit $?
fi
git reset $commit || exit $?
-   
+
say Added dir '$dir'
 }
 
@@ -552,7 +552,7 @@ cmd_split()
 {
debug Splitting $dir...
cache_setup || exit $?
-   
+
if [ -n $onto ]; then
debug Reading history for --onto=$onto...
git rev-list $onto |
@@ -563,13 +563,13 @@ cmd_split()
cache_set $rev $rev
done
fi
-   
+
if [ -n $ignore_joins ]; then