Archive:Xbmc-git-svn - Revision history

Karellen at 04:47, 4 August 2020

2020-08-04T04:47:22Z

← Older revision		Revision as of 04:47, 4 August 2020
Line 472:		Line 472:
	unknown VCS		unknown VCS

	[[Category:~~Miscellaneous notes~~]]		[[Category:Development-Archived]]

Ned Scott: moved Xbmc-git-svn to Archive:Xbmc-git-svn

2013-06-27T09:17:14Z

moved Xbmc-git-svn to Archive:Xbmc-git-svn

← Older revision	Revision as of 09:17, 27 June 2013
(No difference)

Ned Scott: Category:Miscellaneous notes

2011-10-01T00:28:30Z

Category:Miscellaneous notes

← Older revision		Revision as of 00:28, 1 October 2011
Line 471:		Line 471:

	unknown VCS		unknown VCS

			[[Category:Miscellaneous notes]]

>Gamester17 at 20:36, 20 January 2010

2010-01-20T20:36:12Z

← Older revision		Revision as of 20:36, 20 January 2010
Line 1:		Line 1:
			This page has notes on what is done for the migration from svn to git.

	__TOC__		__TOC__
	~~This page has notes on what is done for the migration from svn to git.~~

	= XBMC Main Repo =		= XBMC Main Repo =

>Ceros: alphabetize sections in Vendor Branches

2010-01-11T01:40:26Z

alphabetize sections in Vendor Branches

Show changes

>Ceros: /* XBMC Main Repo */ update script to what's currently used

2010-01-11T01:31:33Z

XBMC Main Repo: update script to what's currently used

← Older revision		Revision as of 01:31, 11 January 2010
Line 6:		Line 6:

	<source lang="bash">		<source lang="bash">
	#!/bin/sh		#!/bin/sh

	set -e		set -e
Line 14:		Line 14:

	# local git shared repo for xbmc we clone to.		# local git shared repo for xbmc we clone to.
	LOCAL_GIT_REPO="$HOME/git-repos/xbmc"		LOCAL_GIT_REPO="$HOME/git-repos/xbmc"

	# The xbmc sourceforge git repo to push to.		# The xbmc sourceforge git repo to push to.
Line 23:		Line 23:

	# The xbmc gitorious repo to push to.		# The xbmc gitorious repo to push to.
	XBMC_GITORIOUS_REPO="git@gitorious.org:xbmc/~~mainline~~.git"		XBMC_GITORIOUS_REPO="git@gitorious.org:xbmc/xbmc.git"

	USAGE="\n\		USAGE="\n\
	This script is used to setup a git shared repo to clone an XBMC svn repo.\n\		This script is used to setup a git shared repo to clone an XBMC svn repo.\n\
	Once setup, this script can also be used to continually fetch new revisions\n\		Once setup, this script can also be used to continually fetch new revisions\n\
	and can be used to push to another shared git repo.		and can be used to push to another shared git repo.
	Usage: xbmc-git-svn [OPTION]\n\		Usage: xbmc-git-svn [OPTION]\n\
	\n\		\n\
	-h, --help Display this help message.\n\		-h, --help Display this help message.\n\
	--initial-setup Only setup the git repo and exit.\n\		--initial-setup Only setup the git repo and exit.\n\
	--initial-checkout Perform the initial checkout.\n\		--initial-checkout Perform the initial checkout.\n\
	--perform-push Performs a git push after fetching new svn revs.\n\		--perform-push Performs a git push after fetching new svn revs.\n\
	--local-git-repo GIT_REPO Override the default local git repo used, which\n\		--local-git-repo GIT_REPO Override the default local git repo used, which\n\
	is $LOCAL_GIT_REPO\n"		is $LOCAL_GIT_REPO\n"

	while [ "$#" -gt "0" ]		while [ "$#" -gt "0" ]
	do		do
	case "$1" in		case "$1" in
	--initial-setup)		--initial-setup)
	INITIAL_SETUP=1		INITIAL_SETUP=1
	shift		shift
	;;		;;
	--initial-checkout)		--initial-checkout)
	INITIAL_CHECKOUT=1		INITIAL_CHECKOUT=1
	shift		shift
	;;		;;
	--perform-push)		--perform-push)
	PERFORM_PUSH=1		PERFORM_PUSH=1
	shift		shift
	;;		;;
	--local-git-repo)		--local-git-repo)
	LOCAL_GIT_REPO="$2"		LOCAL_GIT_REPO="$2"
	shift; shift		shift; shift
	;;		;;
	-h\|--help\|*)		-h\|--help\|*)
	printf "${USAGE}"		printf "${USAGE}"
	exit 1		exit 1
	;;		;;
	esac		esac
	done		done

	# This sets up the local git repo to pull from svn and push into the git repo.		# This sets up the local git repo to pull from svn and push into the git repo.
	initialize_repo () {		initialize_repo () {
	# Setup the repo with standard layout and prefix of svn/		# Setup the repo with standard layout and prefix of svn/
	git svn init --stdlayout --prefix=origin/ "$XBMC_SVN_REPO"		git svn init --stdlayout --prefix=origin/ "$XBMC_SVN_REPO"

	# Make tags go into refs/remotes/svn-tags instead of refs/remotes/svn		# Make tags go into refs/remotes/svn-tags instead of refs/remotes/svn
	git config svn-remote.svn.tags tags/:refs/tags/		git config svn-remote.svn.tags tags/:refs/tags/

	# Settings we apply to keep memory usage sane only on the xbmc.org		# Settings we apply to keep memory usage sane only on the xbmc.org
	# servers		# servers
	git config core.packedGitWindowSize 32m		git config core.packedGitWindowSize 32m
	git config core.packedGitLimit 64m		git config core.packedGitLimit 64m
	git config pack.threads 2		git config pack.threads 2
	git config pack.windowMemory 64m		git config pack.windowMemory 64m

Line 115:		Line 115:

	# This fetches new changes from svn		# This fetches new changes from svn
	git svn fetch && git svn rebase		git svn fetch
			git svn rebase

	# This pushes to the remote git repos. master and all svn branches end up in		# This pushes to the remote git repos. master and all svn branches end up in
Line 123:		Line 124:
	git push origin master refs/remotes/origin/:refs/heads/ refs/tags/:refs/tags/		git push origin master refs/remotes/origin/:refs/heads/ refs/tags/:refs/tags/
	git push xbmc-github master refs/remotes/origin/:refs/heads/ refs/tags/:refs/tags/		git push xbmc-github master refs/remotes/origin/:refs/heads/ refs/tags/:refs/tags/
	# git push xbmc-gitorious master refs/remotes/origin/:refs/heads/ refs/tags/:refs/tags/		git push xbmc-gitorious master refs/remotes/origin/:refs/heads/ refs/tags/:refs/tags/
	fi		fi
	</source>		</source>

>Ceros: /* XBMC Main Repo */ fixup script

2009-10-03T04:30:21Z

XBMC Main Repo: fixup script

Show changes

>Ceros: /* XBMC Main Repo */ add section to fix initial checkout

2009-10-02T23:01:23Z

XBMC Main Repo: add section to fix initial checkout

← Older revision		Revision as of 23:01, 2 October 2009
Line 32:		Line 32:
	\n\		\n\
	-h, --help Display this help message.\n\		-h, --help Display this help message.\n\
	--initial-setup Only setup the git repo and exit.\n\		--initial-setup Only setup the git repo and exit.\n\
			--initial-checkout Perform the initial checkout.\n\
	--perform-push Performs a git push after fetching new svn revs.\n\		--perform-push Performs a git push after fetching new svn revs.\n\
	--local-git-repo GIT_REPO Override the default local git repo used, which\n\		--local-git-repo GIT_REPO Override the default local git repo used, which\n\
Line 42:		Line 43:
	--initial-setup)		--initial-setup)
	INITIAL_SETUP=1		INITIAL_SETUP=1
			shift
			;;
			--initial-checkout)
			INITIAL_CHECKOUT=1
	shift		shift
	;;		;;
Line 79:		Line 84:

	# Immediately exit after initialization		# Immediately exit after initialization
			exit 0
			}

			do_initial_checkout () {
			git svn fetch
			echo "928c8da7f7cd9dc734e7fd7c4b0f6842c0e3fa81 a2c7102f3b29b8a36c2aaf1e2362a94632443707" > .git/info/grafts
			git filter-branch -- --all

	exit 0		exit 0
	}		}
Line 87:		Line 100:
	if [ "$INITIAL_SETUP" ]; then		if [ "$INITIAL_SETUP" ]; then
	initialize_repo		initialize_repo
			elif [ "$INITIAL_CHECKOUT" ]; then
			do_initial_checkout
	fi		fi

>Ceros: /* XBMC Main Repo */ fix script

2009-09-30T02:15:34Z

XBMC Main Repo: fix script

← Older revision		Revision as of 02:15, 30 September 2009
Line 62:		Line 62:
	initialize_repo () {		initialize_repo () {
	# Setup the repo with standard layout and prefix of svn/		# Setup the repo with standard layout and prefix of svn/
	git svn init ~~"$XBMC_SVN_REPO"~~ --stdlayout --prefix=~~svn~~/		git svn init --stdlayout --prefix=xbmc-git-sf/ "$XBMC_SVN_REPO"

	# Make tags go into refs/remotes/svn-tags instead of refs/remotes/svn		# Make tags go into refs/remotes/svn-tags instead of refs/remotes/svn
	git config svn-remote.svn.tags tags/:refs/~~remotes/svn-~~tags/		git config svn-remote.svn.tags tags/:refs/tags/

	# Settings we apply to keep memory usage sane on the xbmc.org servers		# Settings we apply to keep memory usage sane on the xbmc.org servers
Line 83:		Line 83:

	# Do all git commands in git repo		# Do all git commands in git repo
	~~test -d "$LOCAL_GIT_REPO" \|\| mkdir -p "$LOCAL_GIT_REPO"~~
	cd "$LOCAL_GIT_REPO"		cd "$LOCAL_GIT_REPO"

>Ceros: /* XBMC Main Repo */ push all refspecs at once

2009-09-30T01:02:39Z

XBMC Main Repo: push all refspecs at once

← Older revision		Revision as of 01:02, 30 September 2009
Line 98:		Line 98:
	# simply do 'git clone $URL xbmc' to grab all branches and tags		# simply do 'git clone $URL xbmc' to grab all branches and tags
	if [ "$PERFORM_PUSH" ]; then		if [ "$PERFORM_PUSH" ]; then
	git push xbmc-git-sf master		git push xbmc-git-sf master refs/remotes/svn/:refs/heads/ refs/remotes/svn-tags/:refs/tags/
	~~git push xbmc-git-sf~~ refs/remotes/svn/:refs/heads/		# git push xbmc-github master refs/remotes/svn/:refs/heads/ refs/remotes/svn-tags/:refs/tags/
	~~git push xbmc-git-sf~~ refs/remotes/svn-tags/:refs/tags/		# git push xbmc-gitorious master refs/remotes/svn/:refs/heads/ refs/remotes/svn-tags/:refs/tags/
	# git push xbmc-github master
	~~# git push xbmc-github~~ refs/remotes/svn/:refs/heads/
	~~# git push xbmc-github~~ refs/remotes/svn-tags/:refs/tags/
	# git push xbmc-gitorious master
	~~# git push xbmc-gitorious~~ refs/remotes/svn/:refs/heads/
	~~# git push xbmc-gitorious~~ refs/remotes/svn-tags/:refs/tags/
	fi		fi
	</source>		</source>