xen trees: moving to git

diff --git a/ap-common b/ap-common
index b15f6fa77bc700d52ddae7c96500c39a7594d6eb..b117ebafd863c54ecbb2f2dcbfe9aa3a68fc7ccb 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -19,9 +19,9 @@
 
 # $xenbranch must already be set
 
-: ${XENBITS:=xen@xenbits.xensource.com}
+: ${XENBITS:=osstest@xenbits.xensource.com}
 
-: ${TREE_XEN:=http://xenbits.xen.org/hg/staging/$xenbranch.hg}
+: ${TREE_XEN:=git://xenbits.xen.org/xen.git}
 
 #: ${TREE_QEMU:=git://mariner.uk.xensource.com/qemu-$xenbranch.git}
 : ${TREE_QEMU:=git://xenbits.xen.org/staging/qemu-$xenbranch.git}
@@ -43,6 +43,7 @@
 : ${TREE_LINUX2639:=${KERNEL_SCM}/konrad/xen.git}
 : ${TAG_LINUX2639:=stable/2.6.39.x}
 
+: ${LOCALREV_XEN:=daily-cron.$branch}
 : ${LOCALREV_LINUX:=daily-cron.$branch}
 
 : ${TREEBASE_LINUX_XCP:=http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27}

diff --git a/ap-fetch-version b/ap-fetch-version
index b18e97b746f931bc758d2e76bf82e19fa902c584..a8b2e8546a718747f2edb218e0ce0cba7006c933 100755 (executable)
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -32,13 +32,23 @@ if info_linux_tree "$branch"; then
 fi
 
 case "$branch" in
-xen*)
+xen-3.*)
        ./sg-hg-heads sh -ec '
                cd "'"$repos/$branch.hg"'"
                hg pull -u >&2
                eval "$1"
        ' x
        ;;
+xen-unstable)
+       repo_tree_rev_fetch_git xen \
+               $TREE_XEN staging $LOCALREV_XEN
+       ;;
+xen-4.*-testing)
+       branchcore=${branch#xen-}
+       branchcore=${branchcore%-testing}
+       repo_tree_rev_fetch_git xen \
+               $TREE_XEN staging-$branchcore $LOCALREV_XEN
+       ;;
 qemu-upstream-*)
         repo_tree_rev_fetch_git $branch \
                $TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM

diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index b3873675796d51fcea9a0425aba4ead31d310c2b..7e3c0d737f6dcd2a95eb83d3f260f31cbf4a8d73 100755 (executable)
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -37,12 +37,22 @@ if info_linux_tree "$branch"; then
 fi
 
 case "$branch" in
-xen*)
+xen-3.*)
        ./sg-hg-heads ssh $XENBITS '
                set -e
                cd HG/"'"$branch.hg"'"
        '
        ;;
+xen-unstable)
+       repo_tree_rev_fetch_git xen \
+               $TREE_XEN master $LOCALREV_XEN
+       ;;
+xen-4.*-testing)
+       branchcore=${branch#xen-}
+       branchcore=${branchcore%-testing}
+       repo_tree_rev_fetch_git xen \
+               $TREE_XEN stable-$branchcore $LOCALREV_XEN
+       ;;
 qemu-upstream-*)
         repo_tree_rev_fetch_git $branch \
                $BASE_TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM