Re: Git migration schedule

2015-10-09 Thread Stefano Rivera 
Hi Brian (2015.10.09_01:52:20_+0200)
> Will the migration do packages like python-django?

It migrated everything that's in SVN. What happens to the result is up
to us. We can replace migrated results with existing git packages.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Re: Git migration schedule

2015-10-09 Thread Stefano Rivera 
Hi debian-python (2015.10.08_17:06:29_+0200)
> Done. And kicking off the migration now...

And it's done.

Things that need to be looked at:
http://whiteboard.debian.net/dpmt-git-migration.wb

Please mark them off if you've looked at them.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Re: Git migration schedule

2015-10-09 Thread Stefano Rivera 
Hi Barry (2015.10.05_17:36:05_+0200)
> Is there some documentation on how to use these scripts, or set up mr?  Or
> would that be obvious for anybody who's used mr before?

Fairly obvious. It's pretty simple.

> Can you add something about mr to https://wiki.debian.org/Python/GitPackaging

Here: 
https://wiki.debian.org/Python/GitPackaging#Where_do_the_team.27s_git_branches_live.3F

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Re: Git migration schedule

2015-10-09 Thread Barry Warsaw 
On Oct 09, 2015, at 10:01 AM, Stefano Rivera wrote:

>And it's done.

\o/

Thank you for all your amazing work on this Stefano!

>Things that need to be looked at:
>http://whiteboard.debian.net/dpmt-git-migration.wb
>
>Please mark them off if you've looked at them.

I've done an updating pass through the wiki page:

https://wiki.debian.org/Python/GitPackaging

and marked it "official".  Please pay special attention to the section on
post-migration clean ups that folks can help with:

https://wiki.debian.org/Python/GitPackaging#Post-migration_clean_up

I'd also like to send an email to debian-devel@ inviting people who may have
abandoned the DPMT because of our use of subversion, to come back to the team.

Cheers,
-Barry

Re: Git migration schedule

2015-10-09 Thread Arthur de Jong 
On Fri, 2015-10-09 at 10:47 -0400, Barry Warsaw wrote:
> I'd also like to send an email to debian-devel@ inviting people who
> may have abandoned the DPMT because of our use of subversion, to come
> back to the team.

Perhaps an email to d-d-announce would be in order. I for one don't
regularly read debian-python (pyton-*-team even less for that matter).

A short email of what changed with a few pointers to how we are working
now. I think the wiki page may also be very useful for other teams.

-- 
-- arthur - adej...@debian.org - http://people.debian.org/~adejong --



signature.asc
Description: This is a digitally signed message part

Re: Git migration schedule

2015-10-09 Thread Barry Warsaw 
On Oct 09, 2015, at 06:46 PM, Arthur de Jong wrote:

>Perhaps an email to d-d-announce would be in order.

Good idea, thanks.

-Barry


pgpt4EKqpYkKX.pgp
Description: OpenPGP digital signature

Re: Git migration schedule

2015-10-09 Thread Arthur de Jong 
On Fri, 2015-10-09 at 13:34 -0400, Barry Warsaw wrote:
> On Oct 09, 2015, at 06:46 PM, Arthur de Jong wrote:
> > Perhaps an email to d-d-announce would be in order.
> 
> Good idea, thanks.

Thanks everyone for the hard work. Time for me to learn a new tool ;)

-- 
-- arthur - adej...@debian.org - http://people.debian.org/~adejong --



signature.asc
Description: This is a digitally signed message part

Re: Git migration schedule

2015-10-09 Thread Brian May 
On Sat, 3 Oct 2015 at 00:24 Barry Warsaw  wrote:

> 5-Oct - Do one last test run with an updated svn dump.  Put the results in
> a
> public place for folks to play with and comment on.
>
> 8-Oct - Assuming no objections or showstoppers, turn off write access to
> all
> of DPMT svn.
>
> 9-Oct - One more svn dump and conversion run.  Move the git repos into
> their
> final resting place.
>
> Announce, celebrate, ???, profit!
>

We haven't finished yet. We still need to do the celebrate step :-)

Re: Git migration schedule

2015-10-09 Thread Brian May 
On Fri, 9 Oct 2015 at 19:01 Stefano Rivera  wrote:

> Things that need to be looked at:
> http://whiteboard.debian.net/dpmt-git-migration.wb
>

Not sure what the headings mean. "Git packages moved out the way" seems
obvious - and probably exactly what I mentioned before with Django, but
what about "Merge SVN"? Is this the same thing or different? What is
"Orphaned tags"?

Re: Git migration schedule

2015-10-09 Thread Brian May 
On Fri, 9 Oct 2015 at 18:58 Stefano Rivera  wrote:

> It migrated everything that's in SVN. What happens to the result is up
> to us. We can replace migrated results with existing git packages.
>

Ok, I probably should create another thread to discuss this for Django then.

Also, contrary to the rules we just agreed on, this sounds like one rare
time when all uploaders should be contacted before moving any repositories
around.

Re: Git migration schedule

2015-10-09 Thread Barry Warsaw 
On Oct 09, 2015, at 10:30 PM, Brian May wrote:

>Ok, I probably should create another thread to discuss this for Django then.
>
>Also, contrary to the rules we just agreed on, this sounds like one rare
>time when all uploaders should be contacted before moving any repositories
>around.

Probably so.  I have a checkout of python-django here and it seems to already
be in git.  I haven't looked at the converted svn->git repo yet, but I'm
wondering if what was converted was just old and out of date?  I'm pretty sure
it was in git to manage the 1.8 transition.  The debian/sid branch has 1.7.9-1
at its top while debian/experimental has UNRELEASED 1.8.3-2.

That's probably necessary given the complexity of python-django, but since it
deviates from GitPackaging, there should be a debian/README.source to explain
to other team members how the repo is supposed to be used.

Cheers,
-Barry

python-django

2015-10-09 Thread Brian May 
Hello,

Question is what do we do with Django now the git-migrations have taken
place?

We can move the migrated version out of the way, restore the old version,
and update it to the required standards (e.g. git-dpm). Is everyone happy
with this approach?

Regards

Re: Git migration schedule

2015-10-09 Thread Brian May 
On Fri, 9 Oct 2015 at 19:26 Stefano Rivera  wrote:

>
> Here:
> https://wiki.debian.org/Python/GitPackaging#Where_do_the_team.27s_git_branches_live.3F
>
>
I seem to have problems with this because my username on my local box is
"brian" however my username on git.debian.org is "bam". There doesn't
appear to be an easy way of overriding it.

I seem to recall git supports rewriting URLs, maybe this is the way to go
here? Lets see if I can find that blog post aimed at Debian developers
again...

Re: Git migration schedule

2015-10-09 Thread Ben Finney 
Brian May  writes:

> On Fri, 9 Oct 2015 at 19:26 Stefano Rivera  wrote:
>
> >
> > Here:
> > https://wiki.debian.org/Python/GitPackaging#Where_do_the_team.27s_git_branches_live.3F
>
> I seem to have problems with this because my username on my local box is
> "brian" however my username on git.debian.org is "bam". There doesn't
> appear to be an easy way of overriding it.

You need to specify which username to connect to over SSH. I have
updated the Wiki page above to clarify this.

Now that you already have the remote configured, you can re-configure it
with:

$ git remote set-url origin 
git+ssh://usern...@git.debian.org/git/python-modules/tools/python-modules.git

where “origin” is the name of the remote, and “USERNAME” is your Alioth
username.

-- 
 \ “When we pray to God we must be seeking nothing — nothing.” |
  `\—Francis of Assisi |
_o__)  |
Ben Finney

Re: Git migration schedule

2015-10-09 Thread Mattia Rizzolo 
On Sat, Oct 10, 2015 at 12:18:20PM +1100, Ben Finney wrote:
> Brian May  writes:
> 
> > On Fri, 9 Oct 2015 at 19:26 Stefano Rivera  wrote:
> >
> > >
> > > Here:
> > > https://wiki.debian.org/Python/GitPackaging#Where_do_the_team.27s_git_branches_live.3F
> >
> > I seem to have problems with this because my username on my local box is
> > "brian" however my username on git.debian.org is "bam". There doesn't
> > appear to be an easy way of overriding it.
> 
> You need to specify which username to connect to over SSH. I have
> updated the Wiki page above to clarify this.
> 
> Now that you already have the remote configured, you can re-configure it
> with:
> 
> $ git remote set-url origin 
> git+ssh://usern...@git.debian.org/git/python-modules/tools/python-modules.git
> 
> where “origin” is the name of the remote, and “USERNAME” is your Alioth
> username.

You can also add a snipped like mine to ~/.ssh/config:

Host alioth svn.debian.org git.debian.org bzr.debian.org hg.debian.org 
darcs.debian.org arch.debian.org anonscm.debian.org
HostName alioth.debian.org
User mapreri-guest


so you avoid fiddling with every git remote.

-- 
regards,
Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540  .''`.
more about me:  http://mapreri.org  : :'  :
Launchpad user: https://launchpad.net/~mapreri  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-


signature.asc
Description: PGP signature

Re: Git migration schedule

2015-10-09 Thread Brian May 
On Sat, 10 Oct 2015 at 12:18 Ben Finney  wrote:

> Now that you already have the remote configured, you can re-configure it
> with:
>
> $ git remote set-url origin git+ssh://
> usern...@git.debian.org/git/python-modules/tools/python-modules.git
>
> where “origin” is the name of the remote, and “USERNAME” is your Alioth
> username.
>

Insufficient.   .mrconfig in the repository contains a reference to the URL
without the username.

I tried updating the repository in .mrconfig.  Curiously, a quick-update
reverted the URL back to the original value, and then deleted all the
repositories from file. Which seems just a little bit weird. Maybe when I
get to know mr better I will be able to understand just what happened.

I didn't even think of doing it via ssh configuration, as per Mattia's
suggestion. I think that might be a better option.

tagging releases in git

2015-10-09 Thread Brian May 
According to the wiki I do this with the following command:

brian@prune:~/tree/debian/python-modules/django-ajax-selects$ git-dpm tag
git-dpm: ERROR: tag 'upstream/1.3.6' already exists and differs!

This wasn't the response I was expecting. I am not sure why it is trying to
change the upstream tag, or what it is trying to change it to. Should I
just create the debian/1.3.6-4 tag manually?

Regards

git.debian.org broken link

2015-10-09 Thread Brian May 
When I fixed a bug in git:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801208

It put a link to a diff in the bug report:

http://git.debian.org/?p=python-modules/packages/django-ajax-selects.git;a=commitdiff;h=9d026b4

Initially this was coming up with "Internal Server Error". Now it is coming
up with "No repositories found".

Ooops.

Re: git.debian.org broken link

2015-10-09 Thread Scott Kitterman 
On Saturday, October 10, 2015 05:08:05 AM Brian May wrote:
> When I fixed a bug in git:
> 
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801208
> 
> It put a link to a diff in the bug report:
> 
> http://git.debian.org/?p=python-modules/packages/django-ajax-selects.git;a=c
> ommitdiff;h=9d026b4
> 
> Initially this was coming up with "Internal Server Error". Now it is coming
> up with "No repositories found".
> 
> Ooops.

http://git.debian.org/?p=python-modules/packages/ redirects to 
http://anonscm.debian.org/cgit/python-modules/packages which doesn't show a 
repository for django-ajax-selects, so it looks like it's actually missing.

Scott K

Re: git.debian.org broken link

2015-10-09 Thread Brian May 
On Sat, 10 Oct 2015 at 16:43 Scott Kitterman  wrote:

> http://git.debian.org/?p=python-modules/packages/ redirects to
> http://anonscm.debian.org/cgit/python-modules/packages which doesn't show
> a
> repository for django-ajax-selects, so it looks like it's actually missing.
>

I noticed that too.

I seem to be able to push/fetch it without problems however. The git URL is

git+ssh://git.debian.org/git/python-modules/packages/django-ajax-selects.git

Doesn't this mean it should be visible on anonscm.debian.org
?