Merge lp:~naesten/bzr-fastimport/import-tars into lp:~bzr/bzr-fastimport/fastimport.dev

Proposed by Samuel Bronson
Status: Work in progress
Proposed branch: lp:~naesten/bzr-fastimport/import-tars
Merge into: lp:~bzr/bzr-fastimport/fastimport.dev
Diff against target: None lines
To merge this branch: bzr merge lp:~naesten/bzr-fastimport/import-tars
Reviewer Review Type Date Requested Status
Ian Clatworthy Needs Information
Review via email: mp+9984@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Samuel Bronson (naesten) wrote :

Hey, Ian, this is the script that generated the fast-import streams that led me to most of the bugs I've reported in bzr-fastimport so far.

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

I'm happy to include this but I think we need to explicitly check the licensing of the original code to confirm it's OK for us to redistribute it.

We probably need something like exporters/import-tars.README (and exporters/import-tars.LICENSE?) acknowledging the original author and your tweaks to it. Perhaps explicitly mention yourself as the maintainer of the script as well, if that's the case.

review: Needs Information
Revision history for this message
Samuel Bronson (naesten) wrote :

> I'm happy to include this but I think we need to explicitly check the
> licensing of the original code to confirm it's OK for us to redistribute it.
>
> We probably need something like exporters/import-tars.README (and exporters
> /import-tars.LICENSE?) acknowledging the original author and your tweaks to
> it. Perhaps explicitly mention yourself as the maintainer of the script as
> well, if that's the case.

Well, the most specific license info for that file is in git's top-level COPYING, as far as I can tell, which says "GPL v2 only -- not v2.1, not v3, *v2*" (paraphrased).

The contributers shown by

naesten@hydrogen:~/hacking/git% ../tig/tig v1.6.3.3 -- contrib/fast-import/import-tars.perl

(the ../tig/ is because I added something to tig to make the dates narrower) are:

2009-06-17 14:49 Johannes Schindelin + import-tars: support symlinks
2009-03-20 10:57 Giuseppe Bilotta * import-tars: separate author from commit~
2007-05-16 12:43 Junio C Hamano M Merge branch 'maint'
2007-05-16 17:22 Johannes Schindelin │`* import-tars: Use the "Link indicator" ~
2007-05-10 14:48 Junio C Hamano M │ Merge branch 'maint'
2007-05-07 21:13 Shawn O. Pearce │`* Properly handle '0' filenames in impor~
2007-05-02 13:24 Shawn O. Pearce M │ Merge branch 'gfi-maint' into gfi-mast~
2007-05-01 23:42 Johannes Schindelin │`* Teach import-tars about GNU tar's @Lon~
2007-04-29 01:52 Junio C Hamano M │ Merge branch 'maint'
2007-04-29 00:31 Junio C Hamano │`* Fix import-tars fix.
2007-04-29 01:59 Johannes Schindelin │ * import-tars: be nice to wrong director~
2007-04-24 13:51 Uwe Kleine-König * │ fix importing of subversion tars
2007-02-14 17:03 Michael Loeffler *' Use gunzip -c over gzcat in import-tars~
2007-02-12 15:17 Michael Loeffler * import-tars: brown paper bag fix for fil~
2007-02-08 15:26 Shawn O. Pearce * tar archive frontend for fast-import.

And I'd be happy to try and fix any bugs people may find in the script.

Oh, btw, I'm going to my grandpa's house for a week (... say, ten minutes ago?), leaving my computer behind, so I probably won't be able to do much except maybe talk until I'm back.

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

Where is this up too now?

Revision history for this message
Samuel Bronson (naesten) wrote :

On Mon, Nov 23, 2009 at 2:08 AM, Ian Clatworthy
<email address hidden> wrote:
> Where is this up too now?

Uh, mostly forgotten, sorry :-(. Maybe I'll look at it over christmas break...

Unmerged revisions

201. By Samuel Bronson

Adapt import-tars.perl to output fast-import data to stdout.

(The version from git's contrib/ directory fed it directly to 'git
fast-import'!)

Also make the script executable.

200. By Samuel Bronson

Import git's contrib/fast-import/import-tars.perl (git version 1.6.3.3).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'exporters/import-tars.perl'
--- exporters/import-tars.perl 1970-01-01 00:00:00 +0000
+++ exporters/import-tars.perl 2009-08-11 03:35:05 +0000
@@ -0,0 +1,144 @@
1#!/usr/bin/perl
2
3## tar archive frontend for git-fast-import
4##
5## For example:
6##
7## mkdir project; cd project; git init
8## perl import-tars.perl *.tar.bz2 | git fast-import
9## git whatchanged import-tars
10##
11
12use strict;
13die "usage: import-tars *.tar.{gz,bz2,Z}\n" unless @ARGV;
14
15my $branch_name = 'import-tars';
16my $branch_ref = "refs/heads/$branch_name";
17my $author_name = $ENV{'GIT_AUTHOR_NAME'} || 'T Ar Creator';
18my $author_email = $ENV{'GIT_AUTHOR_EMAIL'} || 'tar@example.com';
19my $committer_name = $ENV{'GIT_COMMITTER_NAME'} || `git config --get user.name`;
20my $committer_email = $ENV{'GIT_COMMITTER_EMAIL'} || `git config --get user.email`;
21
22chomp($committer_name, $committer_email);
23
24*FI = *stdout;
25
26foreach my $tar_file (@ARGV)
27{
28 my $commit_time = time;
29 $tar_file =~ m,([^/]+)$,;
30 my $tar_name = $1;
31
32 if ($tar_name =~ s/\.(tar\.gz|tgz)$//) {
33 open(I, '-|', 'gunzip', '-c', $tar_file)
34 or die "Unable to gunzip -c $tar_file: $!\n";
35 } elsif ($tar_name =~ s/\.(tar\.bz2|tbz2)$//) {
36 open(I, '-|', 'bunzip2', '-c', $tar_file)
37 or die "Unable to bunzip2 -c $tar_file: $!\n";
38 } elsif ($tar_name =~ s/\.tar\.Z$//) {
39 open(I, '-|', 'uncompress', '-c', $tar_file)
40 or die "Unable to uncompress -c $tar_file: $!\n";
41 } elsif ($tar_name =~ s/\.tar$//) {
42 open(I, $tar_file) or die "Unable to open $tar_file: $!\n";
43 } else {
44 die "Unrecognized compression format: $tar_file\n";
45 }
46
47 my $author_time = 0;
48 my $next_mark = 1;
49 my $have_top_dir = 1;
50 my ($top_dir, %files);
51
52 while (read(I, $_, 512) == 512) {
53 my ($name, $mode, $uid, $gid, $size, $mtime,
54 $chksum, $typeflag, $linkname, $magic,
55 $version, $uname, $gname, $devmajor, $devminor,
56 $prefix) = unpack 'Z100 Z8 Z8 Z8 Z12 Z12
57 Z8 Z1 Z100 Z6
58 Z2 Z32 Z32 Z8 Z8 Z*', $_;
59 last unless length($name);
60 if ($name eq '././@LongLink') {
61 # GNU tar extension
62 if (read(I, $_, 512) != 512) {
63 die ('Short archive');
64 }
65 $name = unpack 'Z257', $_;
66 next unless $name;
67
68 my $dummy;
69 if (read(I, $_, 512) != 512) {
70 die ('Short archive');
71 }
72 ($dummy, $mode, $uid, $gid, $size, $mtime,
73 $chksum, $typeflag, $linkname, $magic,
74 $version, $uname, $gname, $devmajor, $devminor,
75 $prefix) = unpack 'Z100 Z8 Z8 Z8 Z12 Z12
76 Z8 Z1 Z100 Z6
77 Z2 Z32 Z32 Z8 Z8 Z*', $_;
78 }
79 next if $name =~ m{/\z};
80 $mode = oct $mode;
81 $size = oct $size;
82 $mtime = oct $mtime;
83 next if $typeflag == 5; # directory
84
85 print FI "blob\n", "mark :$next_mark\n";
86 if ($typeflag == 2) { # symbolic link
87 print FI "data ", length($linkname), "\n", $linkname;
88 $mode = 0120000;
89 } else {
90 print FI "data $size\n";
91 while ($size > 0 && read(I, $_, 512) == 512) {
92 print FI substr($_, 0, $size);
93 $size -= 512;
94 }
95 }
96 print FI "\n";
97
98 my $path;
99 if ($prefix) {
100 $path = "$prefix/$name";
101 } else {
102 $path = "$name";
103 }
104 $files{$path} = [$next_mark++, $mode];
105
106 $author_time = $mtime if $mtime > $author_time;
107 $path =~ m,^([^/]+)/,;
108 $top_dir = $1 unless $top_dir;
109 $have_top_dir = 0 if $top_dir ne $1;
110 }
111
112 print FI <<EOF;
113commit $branch_ref
114author $author_name <$author_email> $author_time +0000
115committer $committer_name <$committer_email> $commit_time +0000
116data <<END_OF_COMMIT_MESSAGE
117Imported from $tar_file.
118END_OF_COMMIT_MESSAGE
119
120deleteall
121EOF
122
123 foreach my $path (keys %files)
124 {
125 my ($mark, $mode) = @{$files{$path}};
126 $path =~ s,^([^/]+)/,, if $have_top_dir;
127 $mode = $mode & 0111 ? 0755 : 0644 unless $mode == 0120000;
128 printf FI "M %o :%i %s\n", $mode, $mark, $path;
129 }
130 print FI "\n";
131
132 print FI <<EOF;
133tag $tar_name
134from $branch_ref
135tagger $author_name <$author_email> $author_time +0000
136data <<END_OF_TAG_MESSAGE
137Package $tar_name
138END_OF_TAG_MESSAGE
139
140EOF
141
142 close I;
143}
144close FI;

Subscribers

People subscribed via source and target branches

to all changes: