threads / discuss / 2439

Re: git-archimport

Subject: Re: git-archimport

## tl;dr

6 messages between Nov 10, 2005 and Nov 12, 2005.

replies: 5people: 2as markdown or json

Kevin Geiss· Nov 10, 2005, 21:49 UTC · lore
ok. I tried this:
git-archimport kevin@desertsol.com--files/scripts--base kevin@desertsol.com--files/scripts--oco
and it always complains:
Cannot find patchset for 'kevin@desertsol.com--files/scripts--oco--0--patch-1' at /usr/bin/git-archimport line 784
I don't have any spaces or funny characters in filenames.
On Fri, Nov 11, 2005 at 10:32:12AM +1300, Martin Langhoff wrote:
Show 50 quoted lines
> If the two branches are related, and you want the imported git
> branches to be related, do
> 
>    git-archimport arch-eduforge@catalyst.net.nz--2004/scripts
> 
> that will bring all the stuff under scripts. If there are other
> branches or projects there that aren't related or you don't  want to
> pull, do
> 
>    git-archimport arch-eduforge@catalyst.net.nz--2004/scripts--base \
>         arch-eduforge@catalyst.net.nz--2004/scripts--oco
> 
> In any case, you shoud never pass the last token (base-0). Also, if
> you have filenames with spaces or funny chars, you'll want a patch
> that I'm about to post.
> 
> If you don't mind having this discussion on git@vger, could you
> forward it there?
> 
> cheers,
> 
> 
> martin
> 
> On 11/11/05, Kevin Geiss <kevin@desertsol.com> wrote:
> > hello, I was trying out the git-archimport script, I have a question.
> >
> > say I have two branches in tla (in the same archive):
> >
> > scripts--base--0
> > scripts--oco--0
> >
> > and scripts--oco--0--base-0 was tagged from scripts--base--0--patch-2.
> >
> > I first tried importing only the base branch, that worked fine. then
> > I started a new directory, and tried this:
> >
> > git arch-import -v archive/scripts--base--0 archive/scripts--oco--0
> >
> > and it keeps complaning about not being able to find scripts--oco--0--
> > patch-1.  patch-1 is just a regular commit in the tla archive.
> > (patch-2 and patch-3 are merges from scripts--base)
> >
> > anyway, am I understanding the paradigm of the git-archimport script?
> > that I should expect it to be able to create a git repository for me
> > from these 2 branches?
> >
> > thanks for any info
> >
>
Martin Langhoff· Nov 10, 2005, 22:21 UTC · re: Kevin Geiss · lore
On 11/11/05, Kevin Geiss <kevin@desertsol.com> wrote:
> Cannot find patchset for 'kevin@desertsol.com--files/scripts--oco--0--patch-1' at /usr/bin/git-archimport line 784
Hmmm. The script uses tla itself to get the patch. What happens if you do
  tla get-changeset -A kevin@desertsol.com--files/scripts--oco--0--patch-1

In short, you must have a recent tla configured and with the archive registered.

cheers,
martin
Kevin Geiss· Nov 11, 2005, 05:19 UTC · re: Martin Langhoff · lore
On Fri, Nov 11, 2005 at 11:21:12AM +1300, Martin Langhoff wrote:
Show 15 quoted lines
> On 11/11/05, Kevin Geiss <kevin@desertsol.com> wrote:
> > Cannot find patchset for 'kevin@desertsol.com--files/scripts--oco--0--patch-1' at /usr/bin/git-archimport line 784
> 
> Hmmm. The script uses tla itself to get the patch. What happens if you do
> 
>   tla get-changeset -A kevin@desertsol.com--files/scripts--oco--0--patch-1
> 
> In short, you must have a recent tla configured and with the archive
> registered.
> 
> cheers,
> 
> 
> 
> martin
I've got tla 1.3, and the changeset seems to be there:

10:15pm0raven>tla get-changeset -A kevin@desertsol.com--files/scripts--oco--0--patch-1 /tmp usage: tla get-changeset [options] revision [dir] try get-changeset --help 10:15pm1raven>tla get-changeset kevin@desertsol.com--files/scripts--oco--0--patch-1 /tmp gpg: Signature made Mon Feb 14 12:28:10 2005 MST using DSA key ID E1E6A3B1 gpg: Good signature from "Kevin Geiss <kevin@desertsol.com>" 10:15pm0raven>tla get-changeset --help /tmp retrieve a changeset from an archive usage: tla get-changeset [options] revision [dir]

  -h, --help     Display a help message and exit.
  -H             Display a verbose help message and exit.
  -V, --version  Display a release identifier string
                 and exit.
  -A, --archive  Override `my-default-archive'

10:16pm0raven>tla --version /tmp tla lord@emf.net--gnu-arch-2004/dists--tla--1.3--version-0(configs/gnu/This-release) from regexps.com

Martin Langhoff· Nov 11, 2005, 05:58 UTC · re: Kevin Geiss · lore
On 11/11/05, Kevin Geiss <kevin@desertsol.com> wrote:
> gpg: Signature made Mon Feb 14 12:28:10 2005 MST using DSA key ID E1E6A3B1

I've never imported a signed changeset, perhaps that's the problem. Is the repo public so I can test it myself?

cheers,
martin
Kevin Geiss· Nov 11, 2005, 23:24 UTC · re: Martin Langhoff · lore

it's not really public, perhaps I can make it public though. can a tla mirror be served over http? or does it require ssh?

I'm confident the gpg signatures aren't the problem. I imported some branches yesterday which were all signed, they worked fine.

I suspuect the problem is that after tagging the oco branch from the base branch, there are several places where I replayed some patches from one of the branches to the other. some patches were skipped, some were replayed. there was definitely a lot of hard core cherry picking going on, in both directions. do you think that would cause a problem?

the branches I've imported successfully were things where I had version 1, then tagged that to create version 2, then tagged that to create version 3, with no replay or merging going on between the branches. (everything was gpg signed though)

On Fri, Nov 11, 2005 at 06:58:34PM +1300, Martin Langhoff wrote:
Show 10 quoted lines
> On 11/11/05, Kevin Geiss <kevin@desertsol.com> wrote:
> > gpg: Signature made Mon Feb 14 12:28:10 2005 MST using DSA key ID E1E6A3B1
> 
> I've never imported a signed changeset, perhaps that's the problem. Is
> the repo public so I can test it myself?
> 
> cheers,
> 
> martin
>
Martin Langhoff· Nov 12, 2005, 11:30 UTC · re: Kevin Geiss · lore
On 11/12/05, Kevin Geiss <kevin@desertsol.com> wrote:
> it's not really public, perhaps I can make it public though. can a tla mirror
> be served over http? or does it require ssh?

It can be served over http, though the repo needs to be setup with some special options. You can easily setup a mirror that works over http, though I can't remember the exact options.

> I'm confident the gpg signatures aren't the problem. I imported some branches
> yesterday which were all signed, they worked fine.
Cool. That's good to know...
Show 5 quoted lines
> I suspuect the problem is that after tagging the oco branch from the base
> branch, there are several places where I replayed some patches from one of the
> branches to the other. some patches were skipped, some were replayed.  there
> was definitely a lot of hard core cherry picking going on, in both directions.
> do you think that would cause a problem?

The archimport script was written and tested against the branches I maintained in Arch, which had a reasonably rich and messy scheme of branching, cherry picking and replaying of patches. We just imported some additional branches from an unrelated project and it worked pretty well. So cherry picking/replaying itself should not be an issue.

On the other hand, some versions of tla are notoriously sloppy in the patchsets they generate, forgetting to add files or adding them in two consecutive patchsets. I don't think archimport is too tolerant, and I did find some particular patchsets that wouldn't work correctly.

I'm interested in patches that make the import more resilient, though. So if you can fixup archimport so your import works, and the patch is sane, I'll vouch for its inclusion.

cheers,
martin

← back to recent threads