diff .shell.d/50.vcs_functions.sh @ 210:0590f34b92a0

shell.d: split hg and git functions out of vcs functions
author Augie Fackler <durin42@gmail.com>
date Sun, 16 May 2010 20:43:00 -0500
parents 9e45ac5350fd
children da06f9fd5016
line wrap: on
line diff
--- a/.shell.d/50.vcs_functions.sh
+++ b/.shell.d/50.vcs_functions.sh
@@ -2,16 +2,6 @@
 # This file contains a handful of functions that relate to using some version
 # control tool or other.
 
-function mq () {
-    ( wcroot ;
-       hg -R .hg/patches $@
-     )
-}
-
-function mq-snapshot () {
-    mq ci -m "Applied on $(hg log -r qparent --template '{node|short}\n')"
-}
-
 function ezsvnsync() {
     if [ x"$1" = "x" ] ; then
         echo 'usage: ez-svn-sync repo url'
@@ -51,78 +41,6 @@ function svnurlof() {
     echo $url
 }
 
-function hgsvnmergebranch() {
-    local targetrev
-    local striprev
-    targetrev=$(hg id | cut -d ' ' -f 1)
-    hg merge $1
-    hg ci -m "Merging $1"
-    striprev=$(hg id | cut -d ' ' -f 1)
-    hg co $targetrev
-    hg diff -r$targetrev:$striprev | hg import - -m "Merged branch $1."
-    hg strip $striprev
-}
-alias hg-svn-merge-branch=hgsvnmergebranch
-
-function hgsvnrebaseall() {
-    for b in `hg log -u 'Augie Fackler <durin42@gmail.com>' --template '{branches}\n' | sort | uniq`
-    do
-        echo "rebase $b"
-        hg co $b
-        if [[ "$?" != "0" ]] ; then
-            echo "abort: could not checkout $b"
-            return
-        fi
-        hg parent --svn > /dev/null
-        if [[ "$?" == "0" ]] ; then
-            hg rebase --svn || return
-        else
-            echo "Skip $b since it has a merge."
-        fi
-    done
-}
-alias hg-svn-rebase-all=hgsvnrebaseall
-
-function hgamend() {
-    hg qimport -r . && hg qref && hg qfin qtip
-}
-alias hg-amend=hgamend
-
-function hg_verify_all() {
-  for x in $(find . -name '.hg') ; do
-    y=$(dirname $x)
-    echo $y
-    hg verify -R $y
-  done
-}
-
-function hgsvnmkbranch() {
-    local upstream
-    upstream=$(hg paths default | sed 's%/*$%%')
-    local branchname
-    if [ "x$1" = "x" ] ; then
-        echo 'Must provide new branch name.'
-        return 1
-    fi
-    local d=`hg svn info | grep URL | sed 's/.*://'`
-    local br=`echo $d | awk '{
-            if ( index($1, "trunk") ) {
-                    print  "trunk"
-                } else {
-                    x = index($1, "branches") ;
-                    if ( x != 0 ) {
-                            sub(".*/branches/", "");
-                            sub("/.*", "");
-                            print $0
-                        }
-                }
-                }'`
-
-    branchname=$br
-    echo svn cp $upstream/$branchname $upstream/branches/$1
-}
-alias hg-svn-mkbranch=hgsvnmkbranch
-
 # Function to clean locks out of svn wcs
 function clean_svn_source_trees() {
     for aa in */ ; do
@@ -215,34 +133,6 @@ function vcs_current_branch() {
     return 1
 }
 
-function git_next_unmerged_file() {
-  git status | egrep '(unmerged|both modified)' | head -n 1 | sed 's/.*:   //'
-}
-alias git-next-unmerged-file=git_next_unmerged_file
-
-function git_repack_all() {
-  for repo in $(find . | \
-      grep '/objects/pack/' | \
-      sed -e 's%\.git/objects/pack/.*%%' | \
-      sed -e 's%git/objects/pack/.*%git%' | sort | uniq) ; do
-    pushd $repo
-    git repack -ad --window 100
-    git gc --prune="`date`"
-    popd
-  done
-}
-
-function git_fsck_all() {
-  for repo in $(find . | \
-      grep '/objects/pack/' | \
-      sed -e 's%\.git/objects/pack/.*%%' | \
-      sed -e 's%git/objects/pack/.*%git%' | sort | uniq) ; do
-    pushd $repo
-    git fsck
-    popd
-  done
-}
-
 # change to the root dir of the current wc
 function wcroot() {
     local root=`hg root 2> /dev/null`