* Re: Collecting cvsps patches
From: Yann Dirson @ 2006-06-16 21:23 UTC (permalink / raw)
To: Anand Kumria; +Cc: git
In-Reply-To: <e6jj39$6ua$1@sea.gmane.org>
On Mon, Jun 12, 2006 at 11:27:37AM +0000, Anand Kumria wrote:
> On Mon, 12 Jun 2006 00:42:05 +0200, Yann Dirson wrote:
>
> > http://ydirson.free.fr/soft/git/cvsps.git
>
> I think you need to chmod +x hooks/post-update
>
> and then run 'git-update-server-info'.
Unfortunately, I only have FTP access to push to this site, so I have
to run git-update-server-info myself, and occasionally forget. I'll
have to bring up-to-date my old cg-ftppush script some day :)
Best regards,
--
Yann Dirson <ydirson@altern.org> |
Debian-related: <dirson@debian.org> | Support Debian GNU/Linux:
| Freedom, Power, Stability, Gratis
http://ydirson.free.fr/ | Check <http://www.debian.org/>
^ permalink raw reply
* Re: 2.6.17-rc6-mm2
From: H. Peter Anvin @ 2006-06-16 20:56 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Goo GGooo, linux-kernel, git
In-Reply-To: <Pine.LNX.4.64.0606152335130.5498@g5.osdl.org>
Linus Torvalds wrote:
>
> Actually, the really irritating thing is that we actually generate all
> these nice status updates, which just makes pulling and cloning a lot more
> comfortable, because you actually see what is going on, and what to
> expect.
>
> Except they only work over ssh, where we have a separate channel (for
> stderr), and with the native git protocol all that nice status work just
> gets flushed to /dev/null :(
>
> Dang. It's literally the most irritating part of the thing: the protocol
> itself is exactly the same whether you go over ssh:// or over git://, but
> that visual information about what is going on is missing, and it's
> surprisingly important from a usability standpoint.
>
Perhaps we shouldn't rely on stderr, and instead have a backchannel as part of the
protocol itself. After all, the protocol already does packetization, so all it needs is a
reliable way to pick out the error/status packets; we could even combine that with a
machine-readable code (like SMTP et al) that could get interpreted by the other side as
needed.
-hpa
^ permalink raw reply
* Re: Autoconf/Automake
From: Petr Baudis @ 2006-06-16 20:42 UTC (permalink / raw)
To: Yann Dirson; +Cc: Johannes Schindelin, Phil Richards, git
In-Reply-To: <20060616201715.GM7766@nowhere.earth>
Dear diary, on Fri, Jun 16, 2006 at 10:17:15PM CEST, I got a letter
where Yann Dirson <ydirson@altern.org> said that...
> On Fri, Jun 16, 2006 at 12:58:30AM +0200, Johannes Schindelin wrote:
> > > On Thu, Jun 15, 2006 at 10:42:40PM +0200, Johannes Schindelin wrote:
> > > > As for now, I fail to see why the current system is not adequate for git!
> > >
> > > I can reassure you, gazillions of people still fail to see why cvs is
> > > not adequate for their project. And the ratio of devs in the
> > > corporate world not knowning git to those not knowning cvs is far
> > > superior to 2. And everyone here knows cvs is not more adequate than
> > > git for so many tasks :)
> >
> > You know as well as I that this comparison is unfair. I am _NOT_ a
> > corporate person. I hope that you do not judge me as a complete airhead.
>
> Well, I have to apologize - especially after looking closer at the
> current Makefile. I think I understand now why autoconf was suggested
> in the first place, but it what it would achieve would mostly moving
> the ifdef's to configure.ac, which would not be such a gain anyway.
Except that then I don't need to bother manually adding NO_EXPAT to the
makefile on all systems I compile git on.
Yes, it's not a huge bother per se, but since almost all other
non-obscure projects do figure these things out automagically, git kind
of stands out negatively here. "Wah, it needs me tweak the Makefile to
be able to compile it."
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
A person is just about as big as the things that make them angry.
^ permalink raw reply
* Re: Autoconf/Automake
From: Yann Dirson @ 2006-06-16 20:17 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Phil Richards, git
In-Reply-To: <Pine.LNX.4.63.0606160053560.7480@wbgn013.biozentrum.uni-wuerzburg.de>
On Fri, Jun 16, 2006 at 12:58:30AM +0200, Johannes Schindelin wrote:
> > On Thu, Jun 15, 2006 at 10:42:40PM +0200, Johannes Schindelin wrote:
> > > As for now, I fail to see why the current system is not adequate for git!
> >
> > I can reassure you, gazillions of people still fail to see why cvs is
> > not adequate for their project. And the ratio of devs in the
> > corporate world not knowning git to those not knowning cvs is far
> > superior to 2. And everyone here knows cvs is not more adequate than
> > git for so many tasks :)
>
> You know as well as I that this comparison is unfair. I am _NOT_ a
> corporate person. I hope that you do not judge me as a complete airhead.
Well, I have to apologize - especially after looking closer at the
current Makefile. I think I understand now why autoconf was suggested
in the first place, but it what it would achieve would mostly moving
the ifdef's to configure.ac, which would not be such a gain anyway.
Best regards,
--
Yann Dirson <ydirson@altern.org> |
Debian-related: <dirson@debian.org> | Support Debian GNU/Linux:
| Freedom, Power, Stability, Gratis
http://ydirson.free.fr/ | Check <http://www.debian.org/>
^ permalink raw reply
* Re: Running parse cvs
From: Johannes Schindelin @ 2006-06-16 19:56 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Jon Smirl, git, Keith Packard
In-Reply-To: <Pine.LNX.4.64.0606161220360.5498@g5.osdl.org>
Hi,
On Fri, 16 Jun 2006, Linus Torvalds wrote:
> Valgrind is da bomb.
Now you are officially on the NSA black list.
^ permalink raw reply
* Re: Running parse cvs
From: Linus Torvalds @ 2006-06-16 19:24 UTC (permalink / raw)
To: Jon Smirl; +Cc: git, Keith Packard
In-Reply-To: <9e4733910606161147m403a3f36r6657bd7b620958f3@mail.gmail.com>
On Fri, 16 Jun 2006, Jon Smirl wrote:
>
> I am running the latest parsecvs from your git tree. I am hitting a quick gpf.
If it's really quick, run it under valgrind. It will slow down things
enormously, but if it happens early on, you won't care, and it will
generally give a much better reason for why the problem happened than the
glibc malloc debugger will.
Ie just
valgrind --tool=memcheck parsecvs ..
should do it.
Valgrind is da bomb.
Linus
^ permalink raw reply
* Re: Running parse cvs
From: Jon Smirl @ 2006-06-16 19:10 UTC (permalink / raw)
To: git, Keith Packard
In-Reply-To: <9e4733910606161147m403a3f36r6657bd7b620958f3@mail.gmail.com>
On 6/16/06, Jon Smirl <jonsmirl@gmail.com> wrote:
> I am running the latest parsecvs from your git tree. I am hitting a quick gpf.
>
> oad: sible/src/html/nsHTMLLinkAccessible *.................... 253 of 100111
> Load: essible/src/html/nsHTMLLinkAccessib *.................... 254 of 100111
> Load: ble/src/html/nsHTMLSelectAccessible *.................... 255 of 100111
> *** glibc detected *** /home/jonsmirl/workspace/parsecvs/parsecvs:
> munmap_chunk(): invalid pointer: 0x08fd1db0 ***
>
> In the call stack I am in git_rev_list_pack line 619 doing a free.
> Called from parsecvs.c at 776
The GPF is because git-Pack_directory is calling free(git_dir) when
git_dir is an atom.
>
> --
> Jon Smirl
> jonsmirl@gmail.com
>
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
* Running parse cvs
From: Jon Smirl @ 2006-06-16 18:47 UTC (permalink / raw)
To: git, Keith Packard
I am running the latest parsecvs from your git tree. I am hitting a quick gpf.
oad: sible/src/html/nsHTMLLinkAccessible *.................... 253 of 100111
Load: essible/src/html/nsHTMLLinkAccessib *.................... 254 of 100111
Load: ble/src/html/nsHTMLSelectAccessible *.................... 255 of 100111
*** glibc detected *** /home/jonsmirl/workspace/parsecvs/parsecvs:
munmap_chunk(): invalid pointer: 0x08fd1db0 ***
In the call stack I am in git_rev_list_pack line 619 doing a free.
Called from parsecvs.c at 776
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
* Re: Why so much time in the kernel?
From: Linus Torvalds @ 2006-06-16 18:32 UTC (permalink / raw)
To: Jon Smirl; +Cc: git
In-Reply-To: <9e4733910606161000t53328571u10a350eca894ccdc@mail.gmail.com>
On Fri, 16 Jun 2006, Jon Smirl wrote:
>
> Is it a crazy idea to read the cvs files, compute an sha1 on each
> expanded delta and then write the delta straight into a pack file? Are
> the cvs and git delta formats the same? What about CVS's forward and
> reverse delta use? While this is going on, track the
> branches/changsets in memory and then finish up by writing these trees
> into the pack file too. This should take no more ram than cvsps needs
> currently.
What you want is parsecvs, which does it much more like that.
Linus
^ permalink raw reply
* Re: Autoconf/Automake
From: Petr Baudis @ 2006-06-16 18:31 UTC (permalink / raw)
To: Yann Dirson; +Cc: Johannes Schindelin, Phil Richards, git
In-Reply-To: <20060615220534.GL7766@nowhere.earth>
Dear diary, on Fri, Jun 16, 2006 at 12:05:34AM CEST, I got a letter
where Yann Dirson <ydirson@altern.org> said that...
> On Thu, Jun 15, 2006 at 10:42:40PM +0200, Johannes Schindelin wrote:
> > As for now, I fail to see why the current system is not adequate for git!
>
> I can reassure you, gazillions of people still fail to see why cvs is
> not adequate for their project. And the ratio of devs in the
> corporate world not knowning git to those not knowning cvs is far
> superior to 2. And everyone here knows cvs is not more adequate than
> git for so many tasks :)
Duh. That works the same way when I replace the original question with
"As for now, I fail to see to see why Linux is not adequate for my
desktop! (In contrast with AIX.)".
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
A person is just about as big as the things that make them angry.
^ permalink raw reply
* Re: Autoconf/Automake
From: Petr Baudis @ 2006-06-16 18:23 UTC (permalink / raw)
To: Jakub Narebski; +Cc: git
In-Reply-To: <e6s7eb$78h$1@sea.gmane.org>
Dear diary, on Thu, Jun 15, 2006 at 08:03:56PM CEST, I got a letter
where Jakub Narebski <jnareb@gmail.com> said that...
> Does autoconf generate configure script in POSIX shell, or in bash?
/bin/sh, but on such a degree that it avoids using even functions -
which makes the resulting ./configure script quite awful. autoconf is
*much* better than automake (libtool I shall refrain commenting on
entirely; eeeek) in that you have much more free hand in bending it
in case it does something stupid, but the resulting ./configure script
is still mammoth and barely readable.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
A person is just about as big as the things that make them angry.
^ permalink raw reply
* Re: Why so much time in the kernel?
From: Nicolas Pitre @ 2006-06-16 18:07 UTC (permalink / raw)
To: Jon Smirl; +Cc: Keith Packard, Linus Torvalds, git
In-Reply-To: <9e4733910606161044h736c9675kc91ff77904c5a1d0@mail.gmail.com>
On Fri, 16 Jun 2006, Jon Smirl wrote:
> On 6/16/06, Keith Packard <keithp@keithp.com> wrote:
> > On Fri, 2006-06-16 at 13:00 -0400, Jon Smirl wrote:
> > > Is it a crazy idea to read the cvs files, compute an sha1 on each
> > > expanded delta and then write the delta straight into a pack file? Are
> > > the cvs and git delta formats the same? What about CVS's forward and
> > > reverse delta use?
> >
> > At this point, merging blobs into packs isn't a significant part of the
> > computational cost. parsecvs is spending all of its time in the
> > quadratic traversal of the diff chains; fixing that to emit all of the
> > versions in a single pass should speed up that part of the conversion
> > process dramatically.
>
> That's not true for the state I am in. cvsps can compute the changeset
> tree in 15 minutes, cvs2svn can compute their version in a couple of
> hours. cvs2svn builds a much better tree.
Did you try parsecvs recently?
Nicolas
^ permalink raw reply
* Re: Why so much time in the kernel?
From: Keith Packard @ 2006-06-16 18:02 UTC (permalink / raw)
To: Jon Smirl; +Cc: keithp, Linus Torvalds, git
In-Reply-To: <9e4733910606161044h736c9675kc91ff77904c5a1d0@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1566 bytes --]
On Fri, 2006-06-16 at 13:44 -0400, Jon Smirl wrote:
> I've been extracting versions from cvs and adding them to git now for
> 2.5 days and the process still isn't finished. It is completely CPU
> bound. It's just a loop of cvs co, add it to git, make tree, commit,
> etc.
To do all of mozilla using parsecvs (even with the quadratic algorithm)
takes about three hours on annarchy.freedesktop.org (two dual-core
Opteron with 4GB memory), including all conversion to packs. The pack
time is a tiny fraction of that.
> What about the cvs2svn algorithm described in the attachment? A ram
> based version could be faster. Compression could be acheived by
> switching from using the full path to a version to the sha1 for it.
Yes, parsecvs currently keeps everything in memory when doing the tree
conversion, which means it grows to a huge size to compute the full tree
of revisions. Computing git tree objects from the top down, then
computing commit objects from the bottom up should allow us to free most
of that during the full branch history computation process. I'm starting
a rewrite of parsecvs to try this approach and see how well it works.
If you've looked at the parsecvs source code, you'll notice it's a mess
at present; I started by attempting to do pair-wise tree merges in a
mistaken attempt to convert a linear term to log. Hacking that code into
its present form should be viewed more as a demonstration of how the
overall process can work, not as an optimal expression of the algorithm.
--
keith.packard@intel.com
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* [PATCH 4/4] git-svn: rebuild convenience and bugfixes
From: Eric Wong @ 2006-06-16 17:57 UTC (permalink / raw)
To: Junio C Hamano, git; +Cc: Eric Wong
In-Reply-To: <11504806492195-git-send-email-normalperson@yhbt.net>
We will now automatically fetch the refs/remotes/git-svn ref
from origin and store a Pull: line for it.
--remote=<origin> may be passed if your remote is named something
other than 'origin'
Also, remember to make GIT_SVN_DIR whenever we need to create
.rev_db
Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
contrib/git-svn/git-svn.perl | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index ab1d065..da0ff9a 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -42,7 +42,7 @@ my $_optimize_commits = 1 unless $ENV{GI
my $sha1 = qr/[a-f\d]{40}/;
my $sha1_short = qr/[a-f\d]{4,40}/;
my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
- $_find_copies_harder, $_l, $_cp_similarity,
+ $_find_copies_harder, $_l, $_cp_similarity, $_cp_remote,
$_repack, $_repack_nr, $_repack_flags,
$_template, $_shared, $_no_default_regex, $_no_graft_copy,
$_limit, $_verbose, $_incremental, $_oneline, $_l_fmt, $_show_commit,
@@ -86,6 +86,7 @@ my %cmd = (
{ 'revision|r=i' => \$_revision } ],
rebuild => [ \&rebuild, "Rebuild git-svn metadata (after git clone)",
{ 'no-ignore-externals' => \$_no_ignore_ext,
+ 'copy-remote|remote=s' => \$_cp_remote,
'upgrade' => \$_upgrade } ],
'graft-branches' => [ \&graft_branches,
'Detect merges/branches from already imported history',
@@ -134,7 +135,7 @@ init_vars();
load_authors() if $_authors;
load_all_refs() if $_branch_all_refs;
svn_compat_check();
-migration_check() unless $cmd =~ /^(?:init|multi-init)$/;
+migration_check() unless $cmd =~ /^(?:init|rebuild|multi-init)$/;
$cmd{$cmd}->[0]->(@ARGV);
exit 0;
@@ -174,6 +175,9 @@ sub version {
}
sub rebuild {
+ if (quiet_run(qw/git-rev-parse --verify/,"refs/remotes/$GIT_SVN^0")) {
+ copy_remote_ref();
+ }
$SVN_URL = shift or undef;
my $newest_rev = 0;
if ($_upgrade) {
@@ -1940,6 +1944,7 @@ sub svn_cmd_checkout {
sub check_upgrade_needed {
if (!-r $REVDB) {
+ -d $GIT_SVN_DIR or mkpath([$GIT_SVN_DIR]);
open my $fh, '>>',$REVDB or croak $!;
close $fh;
}
@@ -2052,6 +2057,7 @@ sub migrate_revdb {
init_vars();
exit 0 if -r $REVDB;
print "Upgrading svn => git mapping...\n";
+ -d $GIT_SVN_DIR or mkpath([$GIT_SVN_DIR]);
open my $fh, '>>',$REVDB or croak $!;
close $fh;
rebuild();
@@ -2763,6 +2769,17 @@ sub revdb_get {
return $ret;
}
+sub copy_remote_ref {
+ my $origin = $_cp_remote ? $_cp_remote : 'origin';
+ my $ref = "refs/remotes/$GIT_SVN";
+ if (safe_qx('git-ls-remote', $origin, $ref)) {
+ sys(qw/git fetch/, $origin, "$ref:$ref");
+ } else {
+ die "Unable to find remote reference: ",
+ "refs/remotes/$GIT_SVN on $origin\n";
+ }
+}
+
package SVN::Git::Editor;
use vars qw/@ISA/;
use strict;
--
1.4.0
^ permalink raw reply related
* [PATCH 3/4] git-svn: svn (command-line) 1.0.x compatibility
From: Eric Wong @ 2006-06-16 17:57 UTC (permalink / raw)
To: Junio C Hamano, git; +Cc: Eric Wong
In-Reply-To: <11504806481800-git-send-email-normalperson@yhbt.net>
Tested on a plain Ubuntu Warty installation
using subversion 1.0.6-1.2ubuntu3
svn add --force was never needed, as it only affected
directories, which git (thankfully) doesn't track
The 1.0.x also didn't support symlinks(!), so allow NO_SYMLINK
to be defined for running tests
Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
contrib/git-svn/git-svn.perl | 4 +
contrib/git-svn/t/t0000-contrib-git-svn.sh | 90 +++++++++++++++-------------
2 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index 417fcf1..ab1d065 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -1306,12 +1306,12 @@ sub svn_checkout_tree {
} elsif ($m->{chg} eq 'T') {
sys(qw(svn rm --force),$m->{file_b});
apply_mod_line_blob($m);
- sys(qw(svn add --force), $m->{file_b});
+ sys(qw(svn add), $m->{file_b});
svn_check_prop_executable($m);
} elsif ($m->{chg} eq 'A') {
svn_ensure_parent_path( $m->{file_b} );
apply_mod_line_blob($m);
- sys(qw(svn add --force), $m->{file_b});
+ sys(qw(svn add), $m->{file_b});
svn_check_prop_executable($m);
} else {
croak "Invalid chg: $m->{chg}\n";
diff --git a/contrib/git-svn/t/t0000-contrib-git-svn.sh b/contrib/git-svn/t/t0000-contrib-git-svn.sh
index 0f52746..443d518 100644
--- a/contrib/git-svn/t/t0000-contrib-git-svn.sh
+++ b/contrib/git-svn/t/t0000-contrib-git-svn.sh
@@ -11,7 +11,10 @@ mkdir import
cd import
echo foo > foo
-ln -s foo foo.link
+if test -z "$NO_SYMLINK"
+then
+ ln -s foo foo.link
+fi
mkdir -p dir/a/b/c/d/e
echo 'deep dir' > dir/a/b/c/d/e/file
mkdir -p bar
@@ -129,46 +132,45 @@ test_expect_success "$name" \
-name='executable file becomes a symlink to bar/zzz (file)'
-rm exec.sh
-ln -s bar/zzz exec.sh
-git update-index exec.sh
-git commit -m "$name"
-
-test_expect_success "$name" \
- "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
- svn up $SVN_TREE &&
- test -L $SVN_TREE/exec.sh"
-
-
-
-name='new symlink is added to a file that was also just made executable'
-chmod +x bar/zzz
-ln -s bar/zzz exec-2.sh
-git update-index --add bar/zzz exec-2.sh
-git commit -m "$name"
-
-test_expect_success "$name" \
- "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
- svn up $SVN_TREE &&
- test -x $SVN_TREE/bar/zzz &&
- test -L $SVN_TREE/exec-2.sh"
-
-
-
-name='modify a symlink to become a file'
-git help > help || true
-rm exec-2.sh
-cp help exec-2.sh
-git update-index exec-2.sh
-git commit -m "$name"
-
-test_expect_success "$name" \
- "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
- svn up $SVN_TREE &&
- test -f $SVN_TREE/exec-2.sh &&
- test ! -L $SVN_TREE/exec-2.sh &&
- diff -u help $SVN_TREE/exec-2.sh"
+if test -z "$NO_SYMLINK"
+then
+ name='executable file becomes a symlink to bar/zzz (file)'
+ rm exec.sh
+ ln -s bar/zzz exec.sh
+ git update-index exec.sh
+ git commit -m "$name"
+
+ test_expect_success "$name" \
+ "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
+ svn up $SVN_TREE &&
+ test -L $SVN_TREE/exec.sh"
+
+ name='new symlink is added to a file that was also just made executable'
+ chmod +x bar/zzz
+ ln -s bar/zzz exec-2.sh
+ git update-index --add bar/zzz exec-2.sh
+ git commit -m "$name"
+
+ test_expect_success "$name" \
+ "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
+ svn up $SVN_TREE &&
+ test -x $SVN_TREE/bar/zzz &&
+ test -L $SVN_TREE/exec-2.sh"
+
+ name='modify a symlink to become a file'
+ git help > help || true
+ rm exec-2.sh
+ cp help exec-2.sh
+ git update-index exec-2.sh
+ git commit -m "$name"
+
+ test_expect_success "$name" \
+ "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
+ svn up $SVN_TREE &&
+ test -f $SVN_TREE/exec-2.sh &&
+ test ! -L $SVN_TREE/exec-2.sh &&
+ diff -u help $SVN_TREE/exec-2.sh"
+fi
if test -n "$GIT_SVN_LC_ALL" && echo $GIT_SVN_LC_ALL | grep -q '\.UTF-8$'
@@ -193,6 +195,12 @@ test_expect_success "$name" \
git-rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
diff -u a b"
+if test -n "$NO_SYMLINK"
+then
+ test_done
+ exit 0
+fi
+
name='check imported tree checksums expected tree checksums'
rm -f expected
if test -n "$GIT_SVN_LC_ALL" && echo $GIT_SVN_LC_ALL | grep -q '\.UTF-8$'
--
1.4.0
^ permalink raw reply related
* [PATCH 2/4] git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale
From: Eric Wong @ 2006-06-16 17:57 UTC (permalink / raw)
To: Junio C Hamano, git; +Cc: Eric Wong
In-Reply-To: <11504806472857-git-send-email-normalperson@yhbt.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
contrib/git-svn/Makefile | 5 +++--
contrib/git-svn/t/t0000-contrib-git-svn.sh | 8 ++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile
index d73aa56..6aedb10 100644
--- a/contrib/git-svn/Makefile
+++ b/contrib/git-svn/Makefile
@@ -32,9 +32,10 @@ test: git-svn
cd t && $(SHELL) ./t0000-contrib-git-svn.sh $(TEST_FLAGS)
cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh $(TEST_FLAGS)
+# we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
full-test:
- $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1
- $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1
+ $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
+ $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
$(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \
LC_ALL=en_US.UTF-8
$(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \
diff --git a/contrib/git-svn/t/t0000-contrib-git-svn.sh b/contrib/git-svn/t/t0000-contrib-git-svn.sh
index f896e2c..0f52746 100644
--- a/contrib/git-svn/t/t0000-contrib-git-svn.sh
+++ b/contrib/git-svn/t/t0000-contrib-git-svn.sh
@@ -194,8 +194,12 @@ test_expect_success "$name" \
diff -u a b"
name='check imported tree checksums expected tree checksums'
-cat > expected <<\EOF
-tree f735671b89a7eb30cab1d8597de35bd4271ab813
+rm -f expected
+if test -n "$GIT_SVN_LC_ALL" && echo $GIT_SVN_LC_ALL | grep -q '\.UTF-8$'
+then
+ echo tree f735671b89a7eb30cab1d8597de35bd4271ab813 > expected
+fi
+cat >> expected <<\EOF
tree 4b9af72bb861eaed053854ec502cf7df72618f0f
tree 031b8d557afc6fea52894eaebb45bec52f1ba6d1
tree 0b094cbff17168f24c302e297f55bfac65eb8bd3
--
1.4.0
^ permalink raw reply related
* [PATCH 0/4] git-svn: more improvements
From: Eric Wong @ 2006-06-16 17:57 UTC (permalink / raw)
To: Junio C Hamano, git
In-Reply-To: <11504049343825-git-send-email-normalperson@yhbt.net>
Another round of patches to git-svn, all depending on previous patches.
I've also setup a pullable repo here for all my latest git-svn stuff:
git://git.bogomips.org/git-svn.git
(http:// also works)
--
Eric Wong
^ permalink raw reply
* [PATCH 1/4] git-svn: bugfix and optimize the 'log' command
From: Eric Wong @ 2006-06-16 17:57 UTC (permalink / raw)
To: Junio C Hamano, git; +Cc: Eric Wong
In-Reply-To: <11504806463470-git-send-email-normalperson@yhbt.net>
Revisions with long commit messages were being skipped, since
the 'git-svn-id' metadata line was at the end and git-log uses a
32k buffer to print the commits.
Also the last 'git-svn-id' metadata line in a commit is always
the valid one, so make sure we use that, as well.
Made the verbose flag work by passing the correct option switch
('--summary') to git-log.
Finally, optimize -r/--revision argument handling by passing
the appropriate limits to revision
Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
contrib/git-svn/git-svn.perl | 60 ++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index 149149f..417fcf1 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -663,17 +663,15 @@ sub show_log {
my $pid = open(my $log,'-|');
defined $pid or croak $!;
if (!$pid) {
- my @rl = (qw/git-log --abbrev-commit --pretty=raw
- --default/, "remotes/$GIT_SVN");
- push @rl, '--raw' if $_verbose;
- exec(@rl, @args) or croak $!;
+ exec(git_svn_log_cmd($r_min,$r_max), @args) or croak $!;
}
setup_pager();
my (@k, $c, $d);
+
while (<$log>) {
if (/^commit ($sha1_short)/o) {
my $cmt = $1;
- if ($c && defined $c->{r} && $c->{r} != $r_last) {
+ if ($c && cmt_showable($c) && $c->{r} != $r_last) {
$r_last = $c->{r};
process_commit($c, $r_min, $r_max, \@k) or
goto out;
@@ -692,8 +690,7 @@ sub show_log {
} elsif ($d) {
push @{$c->{diff}}, $_;
} elsif (/^ (git-svn-id:.+)$/) {
- my ($url, $rev, $uuid) = extract_metadata($1);
- $c->{r} = $rev;
+ (undef, $c->{r}, undef) = extract_metadata($1);
} elsif (s/^ //) {
push @{$c->{l}}, $_;
}
@@ -715,6 +712,52 @@ out:
########################### utility functions #########################
+sub cmt_showable {
+ my ($c) = @_;
+ return 1 if defined $c->{r};
+ if ($c->{l} && $c->{l}->[-1] eq "...\n" &&
+ $c->{a_raw} =~ /\@([a-f\d\-]+)>$/) {
+ my @msg = safe_qx(qw/git-cat-file commit/, $c->{c});
+ shift @msg while ($msg[0] ne "\n");
+ shift @msg;
+ @{$c->{l}} = grep !/^git-svn-id: /, @msg;
+
+ (undef, $c->{r}, undef) = extract_metadata(
+ (grep(/^git-svn-id: /, @msg))[-1]);
+ }
+ return defined $c->{r};
+}
+
+sub git_svn_log_cmd {
+ my ($r_min, $r_max) = @_;
+ my @cmd = (qw/git-log --abbrev-commit --pretty=raw
+ --default/, "refs/remotes/$GIT_SVN");
+ push @cmd, '--summary' if $_verbose;
+ return @cmd unless defined $r_max;
+ if ($r_max == $r_min) {
+ push @cmd, '--max-count=1';
+ if (my $c = revdb_get($REVDB, $r_max)) {
+ push @cmd, $c;
+ }
+ } else {
+ my ($c_min, $c_max);
+ $c_max = revdb_get($REVDB, $r_max);
+ $c_min = revdb_get($REVDB, $r_min);
+ if ($c_min && $c_max) {
+ if ($r_max > $r_max) {
+ push @cmd, "$c_min..$c_max";
+ } else {
+ push @cmd, "$c_max..$c_min";
+ }
+ } elsif ($r_max > $r_min) {
+ push @cmd, $c_max;
+ } else {
+ push @cmd, $c_min;
+ }
+ }
+ return @cmd;
+}
+
sub fetch_child_id {
my $id = shift;
print "Fetching $id\n";
@@ -2206,6 +2249,7 @@ sub setup_pager { # translated to Perl f
sub get_author_info {
my ($dest, $author, $t, $tz) = @_;
$author =~ s/(?:^\s*|\s*$)//g;
+ $dest->{a_raw} = $author;
my $_a;
if ($_authors) {
$_a = $rusers{$author} || undef;
@@ -2440,7 +2484,7 @@ sub svn_grab_base_rev {
close $fh;
if (defined $c && length $c) {
my ($url, $rev, $uuid) = extract_metadata((grep(/^git-svn-id: /,
- safe_qx(qw/git-cat-file commit/, $c)))[0]);
+ safe_qx(qw/git-cat-file commit/, $c)))[-1]);
return ($rev, $c);
}
return (undef, undef);
--
1.4.0
^ permalink raw reply related
* Re: git-rebase nukes multiline comments
From: David Kowis @ 2006-06-16 17:55 UTC (permalink / raw)
To: David Kowis; +Cc: git, mhopf
In-Reply-To: <4492E8F9.4000106@shlrm.org>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
David Kowis wrote:
<snip>
>
> I'm new to git, but I tried what you said.
> my git log:
> commit c846bea8c61bec7cf0f7688c48abc42577b9ac7f
> Author: David Kowis <dkowis@kain.org>
> Date: Fri Jun 16 12:20:08 2006 -0500
>
> this is a multi
>
> line comment
> with three lines
>
>
> I'm using git 1.4.0. It added a blank line in there...
I'm going to note that the xorg ML cc doesn't work for anyone not
subscribed... You may miss out on replies.
- --
David Kowis
ISO Team Lead - www.sourcemage.org
Source Mage GNU/Linux
Progress isn't made by early risers. It's made by lazy men trying to
find easier ways to do something.
- Robert Heinlein
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
iQGVAwUBRJLwn8nf+vRw63ObAQqhmwv7BXLqVSJa2FV6RVhLnmARqh+MHBAX+XLu
zgg/kcYd97pXz9bUEFEmY9tp3afzghA6EQlrV/zRHe/R/e1ZFjvTE27mUe3CvtHu
dUPgx6b85vMLkT2k6jbZ5BoA9KtbNITQlZnQJcEAMBv7aUrclRFykABnXwfh3YxM
jVOGbqoNaKzeB5/Sccb27xnzU91UjztB5X7yNgJYosO6tTz164bQQQbIMGWGztPw
wTwQOPK2+v4oUqfvYbKlX/Fd/Fve6PPWOAj5cUjxPHf47oiF/HY3ir/V/k04qO34
KFKAr10ss/sVm7kbURyj7AWJ/putgy9zzYzSWjqh+4ahTwIFb2ciPsU64o1MsO1K
Mnwz0IowmUUZO57qV0gkYdZyPvudOpV2v52aqMEhMyq8GU56Fvsy0KJma235Sv0r
D0ucIrrorCG0FyY7wKpEM83GJDBaTzxb/Mv8bjCD9/av1uQMjmMvqcPFWsZL+nRx
igTF8LiWzBBEG5b+PPjKlS8uofj8cW5g
=90TM
-----END PGP SIGNATURE-----
^ permalink raw reply
* Re: Why so much time in the kernel?
From: Jon Smirl @ 2006-06-16 17:44 UTC (permalink / raw)
To: Keith Packard; +Cc: Linus Torvalds, git
In-Reply-To: <1150478968.6983.7.camel@neko.keithp.com>
[-- Attachment #1: Type: text/plain, Size: 2050 bytes --]
On 6/16/06, Keith Packard <keithp@keithp.com> wrote:
> On Fri, 2006-06-16 at 13:00 -0400, Jon Smirl wrote:
> > Is it a crazy idea to read the cvs files, compute an sha1 on each
> > expanded delta and then write the delta straight into a pack file? Are
> > the cvs and git delta formats the same? What about CVS's forward and
> > reverse delta use?
>
> At this point, merging blobs into packs isn't a significant part of the
> computational cost. parsecvs is spending all of its time in the
> quadratic traversal of the diff chains; fixing that to emit all of the
> versions in a single pass should speed up that part of the conversion
> process dramatically.
That's not true for the state I am in. cvsps can compute the changeset
tree in 15 minutes, cvs2svn can compute their version in a couple of
hours. cvs2svn builds a much better tree.
I've been extracting versions from cvs and adding them to git now for
2.5 days and the process still isn't finished. It is completely CPU
bound. It's just a loop of cvs co, add it to git, make tree, commit,
etc.
> > While this is going on, track the
> > branches/changsets in memory and then finish up by writing these trees
> > into the pack file too. This should take no more ram than cvsps needs
> > currently.
>
> cvsps drops too much state on the floor making branch point and branch
> contents inaccurate. What I'm hoping is that I can figure out a way to
> discard most of the per-version information by computing tree objects in
> reverse order, saving only the tree sha1 and other per-commit info, then
> stitch the commits together using that, without needing the full
> per-file data.
I agree cvsps is dropping a lot. My screen is full of "Skipping
#CVSPS_NO_BRANCH" and
"Skipping SpiderMonkey140_NES40Rtm_Branch" and "Skipping
SpiderMonkey140_BRANCH" etc.
What about the cvs2svn algorithm described in the attachment? A ram
based version could be faster. Compression could be acheived by
switching from using the full path to a version to the sha1 for it.
--
Jon Smirl
jonsmirl@gmail.com
[-- Attachment #2: design-notes.txt --]
[-- Type: text/plain, Size: 22780 bytes --]
How cvs2svn Works
=================
A cvs2svn run consists of eight passes. Each pass saves the data it
produces to files on disk, so that a) we don't hold huge amounts of
state in memory, and b) the conversion process is resumable.
Pass 1:
=======
The goal of this pass is to write to 'cvs2svn-data.revs' a summary of
all the revisions for each RCS file. Each revision will be
represented by one line. At the end of this stage, the revisions
(i.e., the lines) will be grouped by RCS file, not by logical commits.
We walk over the repository, processing each RCS file with
rcsparse.parse(), using cvs2svn's CollectData class, which is a
subclass of rcsparse.Sink(), the parser's callback class. For each
RCS file, the first thing the parser encounters is the administrative
header, including the head revision, the principal branch, symbolic
names, RCS comments, etc. The main thing that happens here is that
CollectData.define_tag() is invoked on each symbolic name and its
attached revision, so all the tags and branches of this file get
collected.
Next, the parser hits the revision summary section. That's the part
of the RCS file that looks like this:
1.6
date 2002.06.12.04.54.12; author captnmark; state Exp;
branches
1.6.2.1;
next 1.5;
1.5
date 2002.05.28.18.02.11; author captnmark; state Exp;
branches;
next 1.4;
[...]
For each revision summary, CollectData.define_revision() is invoked,
recording that revision's metadata in various variables of the
CollectData class instance.
After finishing the revision summaries, the parser invokes
CollectData.tree_completed(), which loops over the revision
information stored, determining if there are instances where a higher
revision was committed "before" a lower one (rare, but it can happen
when there was clock skew on the repository machine). If there are
any, it "resyncs" the timestamp of the earlier rev to be just before
that of the later rev, but saves the original timestamp in
self.rev_data[blah][2], so we can later write out a record to the
resync file indicating that an adjustment was made (this makes it
possible to catch the other parts of this commit and resync them
similarly, more details below).
Next, the parser encounters the *real* revision data, which has the
log messages and file contents. For each revision, it invokes
CollectData.set_revision_info(), which writes a new line to
cvs2svn-data.revs. The line is constructed by the CVSRevision class -
one of its many roles. Here is an example:
3dc32955 5afe9b4ba41843d8eb52ae7db47a43eaa9573254 3dc32954 3dc32956 C 1.1 1.2 1.3 1 1 1024 N * 0 0 foo/bar,v
The fields are:
1. a fixed-width timestamp
2. a digest of the log message + author
3. a fixed-width timestamp indicating the timestamp of this
revision's previous revision (or "*", if it's the first
revision on this line of development).
4. a fixed-width timestamp indicating the timestamp of this
revision's next revision (or "*", if it's the last revision on
this line of development).
5. the type of change ("A"dd, "C"hange, or "D"elete)
6. the revision number of the previous revision along this line of
development (or "*", if it's the first revision on this line of
development).
7. the revision number
8. the revision number of the next revision along this line of
development (or "*", if it's the last revision on this line of
development).
9. 1 if the RCS file is in the Attic, "*" if it isn't.
10. 1 is the RCS file has the executable bit set, "*" if not.
12. The size of the RCS file, in bytes.
12. "N" if this revision has non-empty deltatext, else "E" for empty
13. the RCS keyword substitution mode ("k", "b", etc), or "*" if none
14. the branch on which this commit happened, or "*" if not on a branch
15. the number of tags rooted at this revision (followed by their
names, space-delimited)
16. the number of branches rooted at this revision (followed by
their names, space-delimited)
17. the path of the RCS file in the repository
(Of course, in the above example, fields 15 and 16 are "0", so they have
no additional data.)
Also, for resync'd revisions, a line like this is written out to
'cvs2svn-data.resync':
3d6c1329 18a215a05abea1c6c155dcc7283b88ae7ce23502 3d6c1328
The fields are:
NEW_TIMESTAMP DIGEST OLD_TIMESTAMP
(The resync file will be explained later.)
That's it -- the RCS file is done.
When every RCS file is done, Pass 1 is complete, and:
- cvs2svn-data.revs contains a summary of every RCS file's
revisions. All the revisions for a given RCS file are grouped
together, but note that the groups are in no particular order.
In other words, you can't yet identify the commits from looking
at these lines; a multi-file commit will be scattered all over
the place.
- cvs2svn-data.resync contains a small amount of resync data, in
no particular order.
Pass 2:
=======
This is where the resync file is used. The goal of this pass is to
convert cvs2svn-data.revs to a new file, 'cvs2svn-data.c-revs' (clean
revs). It's the same as the original file, except for some resync'd
timestamps.
First, read the whole resync file into a hash table that maps each
author+log digest to a list of lists. Each sublist represents one of
the timestamp adjustments from Pass 1, and looks like this:
[old_time_lower, old_time_upper, new_time]
The reason to map each digest to a list of sublists, instead of to one
list, is that sometimes you'll get the same digest for unrelated
commits (for example, the same author commits many times using the
empty log message, or a log message that just says "Doc tweaks."). So
each digest may need to "fan out" to cover multiple commits, but
without accidentally unifying those commits.
Now we loop over cvs2svn-data.revs, writing each line out to
'cvs2svn-data.c-revs'. Most lines are written out unchanged, but
those whose digest matches some resync entry, and appear to be part of
the same commit as one of the sublists in that entry, get tweaked.
The tweak is to adjust the commit time of the line to the new_time,
which is taken from the resync hash and results from the adjustment
described in Pass 1.
The way we figure out whether a given line needs to be tweaked is to
loop over all the sublists, seeing if this commit's original time
falls within the old<-->new time range for the current sublist. If it
does, we tweak the line before writing it out, and then conditionally
adjust the sublist's range to account for the timestamp we just
adjusted (since it could be an outlier). Note that this could, in
theory, result in separate commits being accidentally unified, since
we might gradually adjust the two sides of the range such that they are
eventually more than COMMIT_THRESHOLD seconds apart. However, this is
really a case of CVS not recording enough information to disambiguate
the commits; we'd know we have a time range that exceeds the
COMMIT_THRESHOLD, but we wouldn't necessarily know where to divide it
up. We could try some clever heuristic, but for now it's not
important -- after all, we're talking about commits that weren't
important enough to have a distinctive log message anyway, so does it
really matter if a couple of them accidentally get unified? Probably
not.
NOTE: We currently have a fairly major bug in our resync code. The
resync_bug test demonstrates it. The bug is that, when resyncing in
pass 2, we take no care not to move cvs revisions before previous
cvs revisions of the same file, thus creating the very problem we were
attempting to avoid.
Pass 3:
=======
This is where we deduce the changesets, that is, the grouping of file
changes into single commits.
It's very simple -- run 'sort' on cvs2svn-data.c-revs, converting it
to 'cvs2svn-data.s-revs'. Because of the way the data is laid out,
this causes commits with the same digest (that is, the same author and
log message) to be grouped together. Poof! We now have the CVS
changes grouped by logical commit.
In some cases, the changes in a given commit may be interleaved with
other commits that went on at the same time, because the sort gives
precedence to date before log digest. However, Pass 4 detects this by
seeing that the log digest is different, and reseparates the commits.
Pass 4:
=======
This pass has two primary objectives:
1. Create a database that maps CVSRevision unique keys to the actual
CVSRevision string from the revs file (whose format is described
above in pass 1). This results in a database containing one
key-value pair for each line in the revs file. This gives us the
ability to pass around these smaller keys instead of whole CVS
revisions (which look like lines from the s-revs file). See the
CVSRevision class for more details on what the unique key is.
2. Find and create a database containing the last CVS revision that is
a source (also referred to as an "opening" revision) for all
symbolic names. This will result in a database containing
key-value pairs whose key is the unique key for a CVSRevision, and
whose value is a list of symbolic names for which that CVSRevision
is the last "opening."
The format for this file is:
cvs-symname-last-revs.db:
Key Value
CVS Revision array of Symbolic names
For example:
1.38/foo/bar/baz.txt,v --> [TAG11, BRANCH38]
1.93/foo/qux/bat.c,v --> [TAG39]
1.4/foo/bar/baz.txt,v --> [BRANCH48, BRANCH37]
1.18/foo/bar/quux.txt,v --> [TAG320, TAG1178]
Pass 5:
=======
Primarily, this pass gathers CVS revisions into Subversion revisions
(a Subversion revision is comprised of one or more CVS revisions)
before we actually begin committing (where "committing" means either
to a Subversion repository or to a dump file).
This pass does the following:
1. Creates a database file to map Subversion Revision numbers to their
corresponding CVS Revisions (cvs2svn-svn-revnums-to-cvs-revs.db).
Creates another database file to map CVS Revisions to their
Subversion Revision numbers (cvs2svn-cvs-revs-to-svn-revnums.db).
2. When a file is copied to a symbolic name in cvs2svn, there are a
range of valid Subversion revisions that we can copy the file from.
The first valid Subversion revision number for a symbolic name is
called the "Opening", and the first *invalid* Subversion revision
number encountered after the "Opening" is called the "Closing". In
this pass, the SymbolingsLogger class writes one line to
cvs2svn-symbolic-names.txt per CVS file, per symbolic name, per
opening or closing.
3. For each CVS Revision in s-revs, we write out a line (for each
symbolic name that it opens) to a symbolic-names.txt file if it is
the first possible source revision (the "opening" revision) for a
copy to create a branch or tag, or if it is the last possible
revision (the "closing" revision) for a copy to create a branch or
tag. Not every opening will have a corresponding closing.
The format of each line is:
SYMBOLIC_NAME SVN_REVNUM TYPE CVSRevision.unique_key()
For example:
MY_TAG1 234 O 1.3/foo/bar/baz.txt,v
MY_BRANCH3 245 O 1.13/foo/qux/bat.c,v
MY_TAG1 241 C 1.4/foo/bar/baz.txt,v
MY_BRANCH_BLAH 201 O 1.1/foo/bar/quux.txt,v
Here is what the columns mean:
SYMBOLIC_NAME: The name of the branch or tag that starts or ends
in this CVS Revision (There can be multiples per
CVS rev)
SVN_REVNUM: The Subversion revision number that is the opening or
closing for this SYMBOLIC_NAME.
TYPE: "O" for Openings and "C" for Closings.
CVSRevision.unique_key(): This is a unique key that identifies
the CVSRevision where this opening or
closing happened.
See SymbolingsLogger for more details.
Pass 6:
=======
This pass merely sorts cvs2svn-symbolic-names.txt into
cvs2svn-symbolic-names-s.txt. This orders the file first by symbolic
name, and second by Subversion revision number, thus grouping all
openings and closings for each symbolic name together.
Pass 7:
=======
This pass iterates through all the lines in
cvs2svn-symbolic-names-s.txt, writing out a database file mapping
SYMBOLIC_NAME to the file offset in SYMBOL_OPENINGS_CLOSINGS_SORTED
where SYMBOLIC_NAME is first encountered. This will allow us to seek
to the various offsets in the file and sequentially read only the
openings and closings that we need.
Pass 8:
=======
The 8th pass will has very little "thinking" to do--it basically going
opens the svn-nums-to-cvs-revs.db and, starting with Subversion
revision 2 (revision 1 creates /trunk, /tags, and /branches), and
sequentially play out all the commits to either a Subversion
repository or to a dumpfile.
In --dump-only mode, the result of this pass is a Subversion
repository dumpfile (suitable for input to 'svnadmin load'). The
dumpfile is the data's last static stage: last chance to check over
the data, run it through svndumpfilter, move the dumpfile to another
machine, etc.
However, when not in --dump-only mode, no full dumpfile is created for
subsequent load into a Subversion repository. Instead, miniature
dumpfiles represent a single revision are created, loaded into the
repository, and then removed.
In both modes, the dumpfile revisions are created by walking through
cvs2svn-data.s-revs.
===============================
Branches and Tags Plan.
===============================
This pass is also where tag and branch creation is done. Since
subversion does tags and branches by copying from existing revisions
(then maybe editing the copy, making subcopies underneath, etc), the
big question for cvs2svn is how to achieve the minimum number of
operations per creation. For example, if it's possible to get the
right tag by just copying revision 53, then it's better to do that
than, say, copying revision 51 and then sub-copying in bits of
revision 52 and 53.
Also, since CVS does not version symbolic names, there is the
secondary question of *when* to create a particular tag or branch.
For example, a tag might have been made at any time after the youngest
commit included in it, or might even have been made piecemeal; and the
same is true for a branch, with the added constraint that for any
particular file, the branch must have been created before the first
commit on the branch.
Answering the second question first: cvs2svn creates tags as soon as
possible and branches as late as possible.
Tags are created as soon cvs2svn encounters the last CVS Revision that
is a source for that tag. The whole tag is created in one Subversion
commit.
For branches, this is "just in time" creation -- the moment it sees
the first commit on a branch, it snaps the entire branch into
existence (or as much of it as possible), and then outputs the branch
commit.
The reason we say "as much of it as possible" is that it's possible to
have a branch where some files have branch commits occuring earlier
than the other files even have the source revisions from which the
branch sprouts (this can happen if the branch was created piecemeal,
for example). In this case, we create as much of the branch as we
can, that is, as much of it as there are source revisions available to
copy, and leave the rest for later. "Later" might mean just until
other branch commits come in, or else during a cleanup stage that
happens at the end of this pass (about which more later).
How just-in-time branch creation works:
In order to make the "best" set of copies/deletes when creating a
branch, cvs2svn keeps track of two sets of trees while it's making
commits:
1. A skeleton mirror of the subversion repository, that is, an
array of revisions, with a tree hanging off each revision. (The
"array" is actually implemented as an anydbm database itself,
mapping string representations of numbers to root keys.)
2. A tree for each CVS symbolic name, and the svn file/directory
revisions from which various parts of that tree could be copied.
Both tree sets live in anydbm databases, using the same basic schema:
unique keys map to marshal.dumps() representations of dictionaries,
which in turn map entry names to other unique keys:
root_key ==> { entryname1 : entrykey1, entryname2 : entrykey2, ... }
entrykey1 ==> { entrynameX : entrykeyX, ... }
entrykey2 ==> { entrynameY : entrykeyY, ... }
entrykeyX ==> { etc, etc ...}
entrykeyY ==> { etc, etc ...}
(The leaf nodes -- files -- are also dictionaries, for simplicity.)
The repository mirror allows cvs2svn to remember what paths exist in
what revisions.
For details on how branches and tags are created, please see the
docstring the SymbolingsLogger class (and its methods).
-*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*-
- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -
-*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*-
Some older notes and ideas about cvs2svn. Not deleted, because they
may contain suggestions for future improvements in design.
-----------------------------------------------------------------------
An email from John Gardiner Myers <jgmyers@speakeasy.net> about some
considerations for the tool.
------
From: John Gardiner Myers <jgmyers@speakeasy.net>
Subject: Thoughts on CVS to SVN conversion
To: gstein@lyra.org
Date: Sun, 15 Apr 2001 17:47:10 -0700
Some things you may want to consider for a CVS to SVN conversion utility:
If converting a CVS repository to SVN takes days, it would be good for
the conversion utility to keep its progress state on disk. If the
conversion fails halfway through due to a network outage or power
failure, that would allow the conversion to be resumed where it left off
instead of having to start over from an empty SVN repository.
It is a short step from there to allowing periodic updates of a
read-only SVN repository from a read/write CVS repository. This allows
the more relaxed conversion procedure:
1) Create SVN repository writable only by the conversion tool.
2) Update SVN repository from CVS repository.
3) Announce the time of CVS to SVN cutover.
4) Repeat step (2) as needed.
5) Disable commits to CVS repository, making it read-only.
6) Repeat step (2).
7) Enable commits to SVN repository.
8) Wait for developers to move their workspaces to SVN.
9) Decomission the CVS repository.
You may forward this message or parts of it as you seem fit.
------
-----------------------------------------------------------------------
Further design thoughts from Greg Stein <gstein@lyra.org>
* timestamp the beginning of the process. ignore any commits that
occur after that timestamp; otherwise, you could miss portions of a
commit (e.g. scan A; commit occurs to A and B; scan B; create SVN
revision for items in B; we missed A)
* the above timestamp can also be used for John's "grab any updates
that were missed in the previous pass."
* for each file processed, watch out for simultaneous commits. this
may cause a problem during the reading/scanning/parsing of the file,
or the parse succeeds but the results are garbaged. this could be
fixed with a CVS lock, but I'd prefer read-only access.
algorithm: get the mtime before opening the file. if an error occurs
during reading, and the mtime has changed, then restart the file. if
the read is successful, but the mtime changed, then restart the
file.
* use a separate log to track unique branches and non-branched forks
of revision history (Q: is it possible to create, say, 1.4.1.3
without a "real" branch?). this log can then be used to create a
/branches/ directory in the SVN repository.
Note: we want to determine some way to coalesce branches across
files. It can't be based on name, though, since the same branch name
could be used in multiple places, yet they are semantically
different branches. Given files R, S, and T with branch B, we can
tie those files' branch B into a "semantic group" whenever we see
commit groups on a branch touching multiple files. Files that are
have a (named) branch but no commits on it are simply ignored. For
each "semantic group" of a branch, we'd create a branch based on
their common ancestor, then make the changes on the children as
necessary. For single-file commits to a branch, we could use
heuristics (pathname analysis) to add these to a group (and log what
we did), or we could put them in a "reject" kind of file for a human
to tell us what to do (the human would edit a config file of some
kind to instruct the converter).
* if we have access to the CVSROOT/history, then we could process tags
properly. otherwise, we can only use heuristics or configuration
info to group up tags (branches can use commits; there are no
commits associated with tags)
* ideally, we store every bit of data from the ,v files to enable a
complete restoration of the CVS repository. this could be done by
storing properties with CVS revision numbers and stuff (i.e. all
metadata not already embodied by SVN would go into properties)
* how do we track the "states"? I presume "dead" is simply deleting
the entry from SVN. what are the other legal states, and do we need
to do anything with them?
* where do we put the "description"? how about locks, access list,
keyword flags, etc.
* note that using something like the SourceForge repository will be an
ideal test case. people *move* their repositories there, which means
that all kinds of stuff can be found in those repositories, from
wherever people used to run them, and under whatever development
policies may have been used.
For example: I found one of the projects with a "permissions 644;"
line in the "gnuplot" repository. Most RCS releases issue warnings
about that (although they properly handle/skip the lines), and CVS
ignores RCS newphrases altogether.
^ permalink raw reply
* Re: Why so much time in the kernel?
From: Keith Packard @ 2006-06-16 17:29 UTC (permalink / raw)
To: Jon Smirl; +Cc: keithp, Linus Torvalds, git
In-Reply-To: <9e4733910606161000t53328571u10a350eca894ccdc@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]
On Fri, 2006-06-16 at 13:00 -0400, Jon Smirl wrote:
> Is it a crazy idea to read the cvs files, compute an sha1 on each
> expanded delta and then write the delta straight into a pack file? Are
> the cvs and git delta formats the same? What about CVS's forward and
> reverse delta use?
At this point, merging blobs into packs isn't a significant part of the
computational cost. parsecvs is spending all of its time in the
quadratic traversal of the diff chains; fixing that to emit all of the
versions in a single pass should speed up that part of the conversion
process dramatically.
> While this is going on, track the
> branches/changsets in memory and then finish up by writing these trees
> into the pack file too. This should take no more ram than cvsps needs
> currently.
cvsps drops too much state on the floor making branch point and branch
contents inaccurate. What I'm hoping is that I can figure out a way to
discard most of the per-version information by computing tree objects in
reverse order, saving only the tree sha1 and other per-commit info, then
stitch the commits together using that, without needing the full
per-file data.
--
keith.packard@intel.com
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: git-rebase nukes multiline comments
From: David Kowis @ 2006-06-16 17:23 UTC (permalink / raw)
To: git, xorg
In-Reply-To: <20060616171251.GA29820@suse.de>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Matthias Hopf wrote:
> Hi all,
>
> I'm using git-1.2.4 on SL10.1, in centralized style development (for X.org).
>
> I wanted to commit a set of changes (4 local commits) upstream, so I had
> to do a git-rebase first (in that particular case a git-pull would have
> been possible as well, but git-rebase fits the CVS style development
> better). After git-fetch, git-rebase origin, and git-push all my changes
> had only the first line of the changelog comment, the remainder was
> nuked.
>
> To reproduce:
>
> mkdir /var/tmp/blaup
> cd /var/tmp/blaup
> git-init-db
> echo test > foo
> git-add foo
> git-commit (any comment)
> cd ..
> git-clone /var/tmp/blaup bla
> cd bla
> echo test2 >>foo
> git-commit foo (multiline comment)
> cd ../blaup
> echo test3 >bar
> git-add bar
> git-commit (any comment)
> cd ../bla
> git-fetch
> git-log (shows multiline comment for 'test2')
> git-rebase origin
> git-log (shows only the first line of the multiline comment!)
>
>
I'm new to git, but I tried what you said.
my git log:
commit c846bea8c61bec7cf0f7688c48abc42577b9ac7f
Author: David Kowis <dkowis@kain.org>
Date: Fri Jun 16 12:20:08 2006 -0500
this is a multi
line comment
with three lines
I'm using git 1.4.0. It added a blank line in there...
David Kowis
ISO Team Lead - www.sourcemage.org
Source Mage GNU/Linux
Progress isn't made by early risers. It's made by lazy men trying to
find easier ways to do something.
- Robert Heinlein
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
iQGVAwUBRJLo+cnf+vRw63ObAQomewv+L18ogJHgx3jQPt/B+K84GIAX5SugrSnZ
ASC2jm/sbMdidU1goOepXILw2DBOWKSpuDwTZXE0uDrldMTK4RW/2dDACbGVEQX/
Ter4cclIxNztaAwzXGHqKyOI24c5jQmlzW+yDcnErJZTexDA6xyp4xVZlySJpZev
tzfj1Di/uYNJ83lcgS9ID64JToZ5sYZjeqy5HjfEpEQR7xHSYoaR94LNjSHMrqU8
S32ryCMeBSX9SWP8lX7lv6YzIlPGYbOVIsskANVN4GyYVdoMXyXpNtDvziIXrxJj
FkSCloMq5bzVuykthPer0FQRXiySyM1bWsUt9i7Xf3fF8qzyVpIJghP3GAlwh4Gs
LRefaUkkVH61FmN+Uw65xxdx99L4ABoZJDpPBhQdOnY+BXbhNGM5p/lAi3iX72Bx
eIMmaWiwxF8XlIaLJFbDVtGA7lwJzneQQUyHHlTZhzu+VXf4ulKPE93NKEuWWqnL
FD9Tgmu5sFANq5iKSCyocvyAqiWljR8w
=hQWx
-----END PGP SIGNATURE-----
^ permalink raw reply
* git-rebase nukes multiline comments
From: Matthias Hopf @ 2006-06-16 17:12 UTC (permalink / raw)
To: git; +Cc: xorg
Hi all,
I'm using git-1.2.4 on SL10.1, in centralized style development (for X.org).
I wanted to commit a set of changes (4 local commits) upstream, so I had
to do a git-rebase first (in that particular case a git-pull would have
been possible as well, but git-rebase fits the CVS style development
better). After git-fetch, git-rebase origin, and git-push all my changes
had only the first line of the changelog comment, the remainder was
nuked.
To reproduce:
mkdir /var/tmp/blaup
cd /var/tmp/blaup
git-init-db
echo test > foo
git-add foo
git-commit (any comment)
cd ..
git-clone /var/tmp/blaup bla
cd bla
echo test2 >>foo
git-commit foo (multiline comment)
cd ../blaup
echo test3 >bar
git-add bar
git-commit (any comment)
cd ../bla
git-fetch
git-log (shows multiline comment for 'test2')
git-rebase origin
git-log (shows only the first line of the multiline comment!)
I doubt this is intended behavior.
Also, while trying to reproduce this with the original upstream
repository, I would have had to git-fetch my origin branch (upstream
master), but not to get _all_ new commits, but only up to a certain
revspec (the one *before* my own commits).
I tried "git-fetch <refspec>:", but this didn't work, neither did
anything else I tried. This is clearly beyond my understanding of git,
so how can this be done?
Thanks
Matthias
--
Matthias Hopf <mhopf@suse.de> __ __ __
Maxfeldstr. 5 / 90409 Nuernberg (_ | | (_ |__ mat@mshopf.de
Phone +49-911-74053-715 __) |_| __) |__ labs www.mshopf.de
^ permalink raw reply
* Re: Why so much time in the kernel?
From: Jakub Narebski @ 2006-06-16 17:09 UTC (permalink / raw)
To: git
In-Reply-To: <9e4733910606161000t53328571u10a350eca894ccdc@mail.gmail.com>
Jon Smirl wrote:
> Is it a crazy idea to read the cvs files, compute an sha1 on each
> expanded delta and then write the delta straight into a pack file?
That's what parsecvs does (i.e. read *,v files directly).
See http://git.or.cz/gitwiki/InterfacesFrontendsAndTools
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
^ permalink raw reply
* Re: Why so much time in the kernel?
From: Jon Smirl @ 2006-06-16 17:00 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
In-Reply-To: <Pine.LNX.4.64.0606160906250.5498@g5.osdl.org>
Is it a crazy idea to read the cvs files, compute an sha1 on each
expanded delta and then write the delta straight into a pack file? Are
the cvs and git delta formats the same? What about CVS's forward and
reverse delta use? While this is going on, track the
branches/changsets in memory and then finish up by writing these trees
into the pack file too. This should take no more ram than cvsps needs
currently.
This leaves the packfile is a non-optimal format but a repack should
fix that, right?
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox