# [PATCH 1/3] Accept root in 'git-svn commit-diff' 11 messages from 2007-06-18 to 2007-06-20. Participants: Sergey Yanovich, Charlie Shepherd, Johannes Sixt, Eric Wong. Thread: https://gitlist.dev/t/8636 ## Sergey Yanovich, 2007-06-18 12:14 Subject: git tool to keep a subversion mirror Message-ID: <11821688443683-git-send-email-ynvich@gmail.com> URL: https://gitlist.dev/e/11821688443683-git-send-email-ynvich%40gmail.com ``` On 6/18/07, Sergey Yanovich wrote: > However, '--chain-reply-to' seems to have failed. The patches (2 of > them) came as top-level posts. Or I may be doing something wrong. I should have used '--thread' and '--in-reply-to=' when I was formating the patches. It should be correctied this time. Sorry for being akward :) -- Sergey Yanovich ``` ## Sergey Yanovich, 2007-06-18 12:14 Subject: [PATCH 1/3] Accept root in 'git-svn commit-diff' Message-ID: <11821688461828-git-send-email-ynvich@gmail.com> URL: https://gitlist.dev/e/11821688461828-git-send-email-ynvich%40gmail.com In-Reply-To: <11821688443683-git-send-email-ynvich@gmail.com> ``` Signed-off-by: Sergey Yanovich --- git-svn.perl | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 50128d7..8ad291b 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -2572,7 +2572,12 @@ sub generate_diff { } push @diff_tree, '--find-copies-harder' if $_find_copies_harder; push @diff_tree, "-l$_rename_limit" if defined $_rename_limit; - push @diff_tree, $tree_a, $tree_b; + if ($tree_a eq '0000000000000000000000000000000000000000') { + push @diff_tree, '--root'; + } else { + push @diff_tree, $tree_a; + } + push @diff_tree, $tree_b; my ($diff_fh, $ctx) = command_output_pipe(@diff_tree); local $/ = "\0"; my $state = 'meta'; @@ -2606,6 +2611,8 @@ sub generate_diff { } $x->{file_b} = $_; $state = 'meta'; + } elsif ($state eq 'meta' && $_ eq $tree_b && + $tree_a eq '0000000000000000000000000000000000000000') { } else { croak "Error parsing $_\n"; } -- 1.5.2.1 ``` ## Sergey Yanovich, 2007-06-18 12:14 Subject: [PATCH 2/3] 'git-svndump' Message-ID: <11821688462290-git-send-email-ynvich@gmail.com> URL: https://gitlist.dev/e/11821688462290-git-send-email-ynvich%40gmail.com In-Reply-To: <11821688461828-git-send-email-ynvich@gmail.com> ``` Signed-off-by: Sergey Yanovich --- Documentation/git-svndump.txt | 106 +++++++++++++++++++++++++++++++++++++++++ git-svndump-init.sh | 85 +++++++++++++++++++++++++++++++++ git-svndump-sync.sh | 85 +++++++++++++++++++++++++++++++++ 3 files changed, 276 insertions(+), 0 deletions(-) create mode 100644 Documentation/git-svndump.txt create mode 100755 git-svndump-init.sh create mode 100755 git-svndump-sync.sh diff --git a/Documentation/git-svndump.txt b/Documentation/git-svndump.txt new file mode 100644 index 0000000..9caf02b --- /dev/null +++ b/Documentation/git-svndump.txt @@ -0,0 +1,106 @@ +git-svndump(1) +========== + +NAME +---- +git-svndump - Exporting from git to a single Subversion branch + +SYNOPSIS +-------- +'git-svndump' [options] [arguments] + +DESCRIPTION +----------- +git-svndump is essentially a wrapper around 'git-svn commit-diff'. It +will work only when it is the sole method of committing to the +Subversion repository. + +It is designed to export a linear git branch. However, thanks to the way +'git' handles source code, 'git-svndump' seems to work in other +conditions. For example, when branches are switched or merged. + +git-svndump provides a solution when you need to export you source code +in Subversion format (who would need this with git :), but do not want +to have all the shackles that 'git-svn init' puts on your repository. + +COMMANDS +-------- +-- + +'init':: + Initialize an existing git repository with additional + metadata directories for git-svndump. The Subversion URL + must be specified as the first non-optional command-line + argument. 'git' tree-ish that correspond to the HEAD of + that Subversion URL may be specified as the second optional + command-line argument. + +-f;; + git-svndump normally declines to reinitialize the same git + repository. With the '-f' option that behavior is overridden. + +-A;; +--authors-file=;; + The filename is stored, and provided as an argument to 'git-svn' + on calls of 'git-svndump sync'. + +'sync':: + Commit git revisions to the Subversion repository. If a git + is specified as an optional command-line argument, + than all commits between the last 'sync' and that are + send. If the argument is omitted, the HEAD of the active branch + is used. + +-A;; +--authors-file=;; + The filename is provided as an argument to 'git-svn'. + +-- + +BASIC EXAMPLE +-------------- + +Contributing to a Subversion repository: + +------------------------------------------------------------------------ +# Create your git repository, do some work and commit your changes +# You are working on a computer A (git.foo.org) +# Prepare your git repository for export (you are in the top dir) + git-svndump-init -A .auth http://svn.foo.org/project +# Commit the whole branch: + git-svndump-sync +# Now you go a different computer B +# Clone a git repo: + git clone git.foo.org:/path/to/project.git +# Enter the newly cloned directory: + cd project +# Immediately prepare the new repository for export + git-svndump-init -A .auth http://svn.foo.org/project HEAD +# Do some work and commit both locally and to A: + git commit ... + git push +# Commit the new work: + git-svndump-sync +# Now you return to the computer A +# Reinit your repository for export! + git-svndump-init -f -A .auth http://svn.foo.org/project HEAD +------------------------------------------------------------------------ + +BUGS +---- + +The HEAD of the Subversion repository is not tracked. If your +git-svndump repository goes out-of-sync with the Subversion mirror, +the latter will most probably be corrupted. + +SEE ALSO +-------- +gitlink:git-svn[1] + +Author +------ +Written by Sergey Yanovich . + +Documentation +------------- +Written by Sergey Yanovich . diff --git a/git-svndump-init.sh b/git-svndump-init.sh new file mode 100755 index 0000000..4cf61b8 --- /dev/null +++ b/git-svndump-init.sh @@ -0,0 +1,85 @@ +#!/bin/sh + +usage() +{ + cat << EOF +Usage: git-svndump-init [-f] subversion-url [] + subversion-url -- URL of the subversion repository to which you want + to dump the current git repository + -- git that correspond to the latest revision + in the subversion repository +OPTIONS + -f + do not stop, if the git repository is already initialized. +EOF + exit 1 +} + +if test x$GIT_DIR = x ; then + if test -d ./.git ; then + GIT_DIR=`pwd`/.git + fi +fi + +if test ! -d $GIT_DIR ; then + usage +fi + +if test x$1 = x ; then + usage +fi + +if test x$1 = x-f; then + shift + rm -rf $GIT_DIR/svndump +fi + +if test -d $GIT_DIR/svndump ; then + echo git-svndump-init: error: This git repository is already initialized + exit 1 +fi + +mkdir $GIT_DIR/svndump +if test ! -d $GIT_DIR/svndump ; then + echo git-svndump-init: error: Failed to create $GIT_DIR/svndump + exit 1 +fi + +rev=`svn info $1 >$GIT_DIR/svndump/error.log` +if test $? -ne 0 ; then + echo git-svndump-init: error: While quering $1 + rm -rf $GIT_DIR/svndump + exit 1 +fi + +rev=`cat $GIT_DIR/svndump/error.log | sed -ne "/Revision/s/.* //p"` +rm $GIT_DIR/svndump/error.log + +if test x$rev = x ; then + echo "git-svndump-init: error: Cannot determine the latest revision" + echo " at $1" + rm -rf $GIT_DIR/svndump + exit 1 +fi + +if test $rev -eq 0 ; then + mkdir -p $GIT_DIR/svndump/import && cd $GIT_DIR/svndump/import && + svn import . $1 -m "Initial import by git-svndump" + if test $? -ne 0 ; then + echo "git-svndump-init: error: Failed to init $1" + rm -rf $GIT_DIR/svndump + exit 1 + fi + rmdir $GIT_DIR/svndump/import +fi + +echo "$1" > $GIT_DIR/svndump/url + +if test x$2 != x ; then + commit=`GIT_DIR=$GIT_DIR git-rev-list --max-count=1 $2` + if test $? -ne 0 ; then + echo "git-svndump-init: warning: Bad commit $2 ignored" + else + echo $commit >> $GIT_DIR/svndump/last + fi +fi diff --git a/git-svndump-sync.sh b/git-svndump-sync.sh new file mode 100755 index 0000000..e1c04e1 --- /dev/null +++ b/git-svndump-sync.sh @@ -0,0 +1,85 @@ +#!/bin/sh + +usage() +{ + cat << EOF +Usage: git-svndump-sync [] + -- git that correspond to the latest revision + to be dumped to the subversion repository +EOF + exit 1 +} + +if test x$GIT_DIR = x ; then + if test -d ./.git ; then + GIT_DIR=`pwd`/.git + fi +fi + +if test ! -d $GIT_DIR ; then + usage +fi + +if test ! -d $GIT_DIR/svndump ; then + echo "git-svndump-sync: error: This git repository is not initialized" + echo " Run git-svndump-init first" + exit 1 +fi + +if test ! -f $GIT_DIR/svndump/url ; then + echo "git-svndump-sync: error: Cannot read url" + exit 1 +fi + +url=`cat $GIT_DIR/svndump/url` +rev=`svn info $url >$GIT_DIR/svndump/error.log` +if test $? -ne 0 ; then + echo git-svndump-sync: error: While quering $url + rm -rf $GIT_DIR/svndump/error.log + exit 1 +fi + +rev=`cat $GIT_DIR/svndump/error.log | sed -ne "/Revision/s/.* //p"` +rm $GIT_DIR/svndump/error.log + +if test x$rev = x ; then + echo "git-svndump-init: error: Cannot determine the latest revision" + echo " at $url" + exit 1 +fi + +if test x$1 = x ; then + commit=HEAD +else + commit=`GIT_DIR=$GIT_DIR git-rev-list --max-count=1 $1` + if test $? -ne 0 ; then + echo "git-svndump-sync: error: Bad commit '$1'" + exit 1 + fi +fi + +start="" +last=0000000000000000000000000000000000000000 +if test -f $GIT_DIR/svndump/last ; then + last=`cat $GIT_DIR/svndump/last` + start=^`GIT_DIR=$GIT_DIR git-rev-list --max-count=1 $last` + if test $? -ne 0 ; then + echo "git-svndump-sync: warning: Ignoring bad commit '$last'" + start="" + last=0000000000000000000000000000000000000000 + fi +fi + +list=`GIT_DIR=$GIT_DIR git-rev-list $commit $start` + +diffs="" +for c in $list ; do + diffs="$c $diffs" +done + +for c in $diffs ; do + GIT_DIR=$GIT_DIR git-svn commit-diff -r$rev $last $c $url + echo "$c" > $GIT_DIR/svndump/last + last=$c + let rev++ +done -- 1.5.2.1 ``` ## Sergey Yanovich, 2007-06-18 12:14 Subject: [PATCH 3/3] Fix large-scale exports by 'git-svndump' Message-ID: <11821688462083-git-send-email-ynvich@gmail.com> URL: https://gitlist.dev/e/11821688462083-git-send-email-ynvich%40gmail.com In-Reply-To: <11821688462290-git-send-email-ynvich@gmail.com> ``` * Split revision list using 'tail' shell command. * Wrap multiple list generation in an endless cycle with 'while true'. Exit from cycle when the current list is empty. * Improve handling of merges by adding '--no-merges --topo-order'i arguments to the list generating command. Signed-off-by: Sergey Yanovich --- git-svndump-sync.sh | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/git-svndump-sync.sh b/git-svndump-sync.sh index e1c04e1..516edaf 100755 --- a/git-svndump-sync.sh +++ b/git-svndump-sync.sh @@ -70,7 +70,14 @@ if test -f $GIT_DIR/svndump/last ; then fi fi -list=`GIT_DIR=$GIT_DIR git-rev-list $commit $start` +while true ; do + +list=`GIT_DIR=$GIT_DIR git-rev-list --no-merges --topo-order $commit $start | +tail -n 8` + +if test -z "$list" ; then + exit 0 +fi diffs="" for c in $list ; do @@ -79,7 +86,14 @@ done for c in $diffs ; do GIT_DIR=$GIT_DIR git-svn commit-diff -r$rev $last $c $url + if test $? -ne 0 ; then + exit $? + fi echo "$c" > $GIT_DIR/svndump/last last=$c let rev++ done + +start=^$last + +done -- 1.5.2.1 ``` ## Charlie Shepherd, 2007-06-18 12:26 Subject: Re: [PATCH 2/3] 'git-svndump' Message-ID: URL: https://gitlist.dev/e/fc8ec2a10706180526v3371258bjdde4ea1152e9a556%40mail.gmail.com In-Reply-To: <11821688462290-git-send-email-ynvich@gmail.com> ``` On 18/06/07, Sergey Yanovich wrote: > +git-svndump provides a solution when you need to export you source code your source code -- -Charlie ``` ## Johannes Sixt, 2007-06-18 13:20 Subject: Re: [PATCH 1/3] Accept root in 'git-svn commit-diff' Message-ID: <467686AB.504C619A@eudaptics.com> URL: https://gitlist.dev/e/467686AB.504C619A%40eudaptics.com In-Reply-To: <11821688461828-git-send-email-ynvich@gmail.com> ``` Sergey Yanovich wrote: > > Signed-off-by: Sergey Yanovich > --- It is extremely difficult to tell whether the patch makes sense or is correct, if there is _no_ explanation what it is good for. -- Hannes ``` ## Johannes Sixt, 2007-06-18 13:22 Subject: Re: [PATCH 3/3] Fix large-scale exports by 'git-svndump' Message-ID: <46768716.5A7AF6C7@eudaptics.com> URL: https://gitlist.dev/e/46768716.5A7AF6C7%40eudaptics.com In-Reply-To: <11821688462083-git-send-email-ynvich@gmail.com> ``` Sergey Yanovich wrote: > > * Split revision list using 'tail' shell command. > > * Wrap multiple list generation in an endless cycle with 'while true'. > Exit from cycle when the current list is empty. > > * Improve handling of merges by adding '--no-merges --topo-order'i > arguments to the list generating command. Please don't just repeat what can be seen in the patch anyway. Tell us what this is good for, and which problems it solves. -- Hannes ``` ## Eric Wong, 2007-06-20 06:25 Subject: Re: [PATCH 1/3] Accept root in 'git-svn commit-diff' Message-ID: <20070620062548.GA25840@muzzle> URL: https://gitlist.dev/e/20070620062548.GA25840%40muzzle In-Reply-To: ``` Sergey Yanovich wrote: > Experiments with Subversion (my version is 1.4.2) show that it is > not necessary to call 'svn import' before the first commit. Contrarily > to the Subversion documentation, first commit may be done even when > Subversion repository is at revision 0. > > This allow export the whole git branch to a Subversion repo using only > 'git-svn commit-diff'. Before this patch, however, 'git-svn' had > no means to operate on root commits. Cool. > Signed-off-by: Sergey Yanovich > --- > git-svn.perl | 9 ++++++++- > 1 files changed, 8 insertions(+), 1 deletions(-) > > diff --git a/git-svn.perl b/git-svn.perl > index 50128d7..8ad291b 100755 > --- a/git-svn.perl > +++ b/git-svn.perl > @@ -2572,7 +2572,12 @@ sub generate_diff { > } > push @diff_tree, '--find-copies-harder' if $_find_copies_harder; > push @diff_tree, "-l$_rename_limit" if defined $_rename_limit; > - push @diff_tree, $tree_a, $tree_b; > + if ($tree_a eq '0000000000000000000000000000000000000000') { You can make this more legible by using '0' x40 instead of repeating 40 '0' characters. Also, it might be a good idea to support --root directly for git-svn so the user won't have to type 40 zeroes in the command-line :) > + push @diff_tree, '--root'; > + } else { > + push @diff_tree, $tree_a; > + } > + push @diff_tree, $tree_b; > my ($diff_fh, $ctx) = command_output_pipe(@diff_tree); > local $/ = "\0"; > my $state = 'meta'; > @@ -2606,6 +2611,8 @@ sub generate_diff { > } > $x->{file_b} = $_; > $state = 'meta'; > + } elsif ($state eq 'meta' && $_ eq $tree_b && > + $tree_a eq '0000000000000000000000000000000000000000') { Same here with '0' x40 > } else { > croak "Error parsing $_\n"; > } > -- > 1.5.2.1 > -- Eric Wong ``` ## Eric Wong, 2007-06-20 06:40 Subject: Re: [PATCH 2/3] 'git-svndump' Message-ID: <20070620064015.GB25840@muzzle> URL: https://gitlist.dev/e/20070620064015.GB25840%40muzzle In-Reply-To: <7d5543ebd8ac45e49a6d3f300e988189561512f1.1182235492.git.ynvich@gmail.com> ``` Sergey Yanovich wrote: > A git tool to keep a subversion mirror > > git-svndump is essentially a wrapper around 'git-svn commit-diff'. It > will work only when it is the sole method of committing to the > Subversion repository. We could probably just implement this directly in git-svn. I'll try to find time to take a closer look at it this weekend or the next if I don't have time. If you or anybody else feel comfortable doing more work in Perl, feel free to go ahead with it. > It is designed to export a linear git branch. However, thanks to the way > 'git' handles source code, 'git-svndump' seems to work in other > conditions. For example, when branches are switched or merged. > > git-svndump provides a solution when you need to export your source code > in Subversion format (who would need this with git :), but do not want > to have all the shackles that 'git-svn init' puts on your repository. > Signed-off-by: Sergey Yanovich > --- > Documentation/git-svndump.txt | 97 ++++++++++++++++++++++++++++++++++++++++ > Makefile | 1 + > git-svndump-init.sh | 85 +++++++++++++++++++++++++++++++++++ > git-svndump-sync.sh | 98 +++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 281 insertions(+), 0 deletions(-) > create mode 100644 Documentation/git-svndump.txt > create mode 100755 git-svndump-init.sh > create mode 100755 git-svndump-sync.sh I'm really not excited about having even more shell scripts in git. -- Eric Wong ``` ## Sergey Yanovich, 2007-06-20 09:20 Subject: Re: [PATCH 1/3] Accept root in 'git-svn commit-diff' Message-ID: <4678F17B.8010902@gmail.com> URL: https://gitlist.dev/e/4678F17B.8010902%40gmail.com In-Reply-To: <20070620062548.GA25840@muzzle> ``` Eric Wong wrote: >> - push @diff_tree, $tree_a, $tree_b; >> + if ($tree_a eq '0000000000000000000000000000000000000000') { > > You can make this more legible by using '0' x40 instead of repeating > 40 '0' characters. Also, it might be a good idea to support --root > directly for git-svn so the user won't have to type 40 zeroes in the > command-line :) > Sorry, I am not a perl expert or even user. I did try to process '--root' in 'git-svn', but in vain. And I can explain, why 40 '0'. That is the only reference to root commit as an object that I managed to find in git - in the output of 'git-rev-list'. If 40 '0' is not good, then it may worth to introduce a shorthand for it, just as we have one for 'HEAD'. 'NULL' or 'ROOT' may be. If this is implemented in 'git-rev-list', there will be no need to change 'git-svn' at all. ``` ## Sergey Yanovich, 2007-06-20 09:47 Subject: Re: [PATCH 2/3] 'git-svndump' Message-ID: <4678F797.7000005@gmail.com> URL: https://gitlist.dev/e/4678F797.7000005%40gmail.com In-Reply-To: <20070620064015.GB25840@muzzle> ``` Eric Wong wrote: > We could probably just implement this directly in git-svn. I'll try to > find time to take a closer look at it this weekend or the next if I > don't have time. If you or anybody else feel comfortable doing more > work in Perl, feel free to go ahead with it. I would be happy to help, but I don't speak fluent perl. I had real trouble introducing a global variable, when patching 'git-svn' for root commit. >> Documentation/git-svndump.txt | 97 ++++++++++++++++++++++++++++++++++++++++ >> Makefile | 1 + >> git-svndump-init.sh | 85 +++++++++++++++++++++++++++++++++++ >> git-svndump-sync.sh | 98 +++++++++++++++++++++++++++++++++++++++++ >> 4 files changed, 281 insertions(+), 0 deletions(-) >> create mode 100644 Documentation/git-svndump.txt >> create mode 100755 git-svndump-init.sh >> create mode 100755 git-svndump-sync.sh > > I'm really not excited about having even more shell scripts in git. The first name for this scripts was 'git-svndumb'. They don't do anything themselves. They just call 'git-svn'. It works like decoupling in object-oriented design. Old UNIX philosophy of 'big number of small tools'. If you decide to incorporate then in 'git-svn', you'll need to contaminate it with knowledge of 'svndumb'. I am afraid, you'll need to peruse the whole file, putting 'if's here and there. But, it doesn't really matter, which you way you go. I would be happy just to see this functionality in some future release of git. ```