From 45e283a1bb96100240ad16559fa39ac469a41cf7 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 22 Apr 2013 15:44:00 +0200 Subject: [PATCH] migrate to using vcsh --- .config/mr/available.d/mr.vcsh | 2 ++ .mr/LIB | 23 ----------------------- .mr/templ/.mrconfig | 3 ++- 3 files changed, 4 insertions(+), 24 deletions(-) create mode 100644 .config/mr/available.d/mr.vcsh diff --git a/.config/mr/available.d/mr.vcsh b/.config/mr/available.d/mr.vcsh new file mode 100644 index 0000000..9fd8184 --- /dev/null +++ b/.config/mr/available.d/mr.vcsh @@ -0,0 +1,2 @@ +[$HOME/.config/vcsh/repo.d/mr.git] +checkout = vcsh clone ssh://git.madduck.net/madduck/pub/etc/mr.git diff --git a/.mr/LIB b/.mr/LIB index 6c20d29..e69de29 100644 --- a/.mr/LIB +++ b/.mr/LIB @@ -1,23 +0,0 @@ -bzr_update = bzr pull "$@" - -lib = checkout_hack_branch() { - git clone --no-checkout --origin $2 $3 $1 - cd $1 - git checkout -b $2 $2/${5:-master} - git branch -D master >/dev/null - git remote add origin $4 - if git fetch origin 2>/dev/null; then - git checkout -b master origin/master - else - git checkout -b master $2/${5:-master} - case "$4" in - ssh://*) - host=${4#*//} - path=${host#*/} - host=${host%%/*} - ssh $host "[ -d $path ] || GIT_DIR=$path git --bare init --shared=world" - ;; - esac - git push origin --all - fi - } diff --git a/.mr/templ/.mrconfig b/.mr/templ/.mrconfig index 04d5b4c..48fc7ee 100644 --- a/.mr/templ/.mrconfig +++ b/.mr/templ/.mrconfig @@ -1,2 +1,3 @@ [DEFAULT] -include = find ~/code/mr/lib ~/.mr -path '*/.mr/templ/.mrconfig' -o -path '*/.mr/roles/*' -o -type f -print0 | xargs -0 cat +include = cat /usr/share/mr/vcsh +include = cat $HOME/.config/mr/config.d/* -- 2.39.2