From 9d3336234516b81d498f847df9e84fd831294293 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Thu, 3 Jul 2014 16:15:50 +0200
Subject: [PATCH] update repo command after repo optims

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 .../buildbot_dev/buildbot_dev.plugin.zsh      |  3 ++-
 custom/plugins/intel-repo/repo.plugin.zsh     | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 custom/plugins/intel-repo/repo.plugin.zsh

diff --git a/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh b/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
index f062bbdd9..cc3629f27 100644
--- a/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
+++ b/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
@@ -104,7 +104,8 @@ function bb_merge_bottom_branch_to_here()
             return 1
     esac
     echo "Merging branch $bottom_branch to $branch..."
-    git merge umg/platform/buildbot/$bottom_branch --m "Manual merge of branch 'platform/buildbot/$bottom_branch' into 'platform/buildbot/$branch'"
+    cmd="git merge umg/platform/buildbot/$bottom_branch --m \"Manual merge of branch 'platform/buildbot/$bottom_branch' into 'platform/buildbot/$branch'\""
+    eval $cmd
     git mergetool --no-prompt
 }
 
diff --git a/custom/plugins/intel-repo/repo.plugin.zsh b/custom/plugins/intel-repo/repo.plugin.zsh
new file mode 100644
index 000000000..c35a789c5
--- /dev/null
+++ b/custom/plugins/intel-repo/repo.plugin.zsh
@@ -0,0 +1,26 @@
+alias rs='repo sync -a'
+compdef _repo rs='repo sync'
+
+alias rs.='repo sync -a .'
+compdef _repo rs.='repo sync'
+
+alias rsrra='repo sync -a ; repo rebase --auto-stash'
+compdef _repo rsrra='repo rebase'
+
+alias rsrra.='repo sync -a .; repo rebase --auto-stash .'
+compdef _repo rsrra.='repo rebase'
+
+function rsbrsrra()
+{
+    if [[ -z $1 ]]; then
+        echo "usage: rsbrsrra <branch name>"
+        exit 1
+    fi
+    echo "Starting branch $1 and syncing up all project (repo rebase)"
+    repo start $1 --all || return 1
+    repo sync -a || return 1
+    repo rebase --auto-stash || return 1
+}
+
+alias rclean="repo forall -c 'git remote prune umg'"
+compdef _repo rclean='repo forall'