Github migration complete

classic Classic list List threaded Threaded
17 messages Options
Reply | Threaded
Open this post in threaded view
|

Github migration complete

Howard Butler-3
All,

Thanks to Thomas Bonfort, the proj.4 migration to github is complete. I would like to invite you to take a look at

https://github.com/OSGeo/proj.4

and if there are no major issues identified in the next few days, we will declare it complete and decommission the Trac instance at OSGeo.

Howard
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Kralidis,Tom [Ontario]
Thanks Thomas/Howard!

Some questions:

- will the trac instance be available after decommissioning?
- any interest in turning https://trac.osgeo.org/proj/ into GitHub pages
(thereby available at http://osgeo.github.io/proj.4/ ?  I offer to
implement this and setup/deploy


> -----Original Message-----
> From: [hidden email] [mailto:proj-
> [hidden email]] On Behalf Of Howard Butler
> Sent: 2015-05-22 09:48
> To: PROJ.4 and general Projections Discussions
> Subject: [Proj] Github migration complete
>
> All,
>
> Thanks to Thomas Bonfort, the proj.4 migration to github is complete.
I
> would like to invite you to take a look at
>
> https://github.com/OSGeo/proj.4
>
> and if there are no major issues identified in the next few days, we
will
> declare it complete and decommission the Trac instance at OSGeo.
>
> Howard
> _______________________________________________
> Proj mailing list
> [hidden email]
> http://lists.maptools.org/mailman/listinfo/proj
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Howard Butler-3

> On May 22, 2015, at 11:18 AM, Kralidis,Tom [Ontario] <[hidden email]> wrote:
>
> Thanks Thomas/Howard!
>
> Some questions:
>
> - will the trac instance be available after decommissioning?
> - any interest in turning https://trac.osgeo.org/proj/ into GitHub pages
> (thereby available at http://osgeo.github.io/proj.4/ ?  I offer to
> implement this and setup/deploy

I definitely have interest in that. I guess the plan was to only decomission the ticket creation capabiltiy, and leave the rest standing for as long as reasonable, with pointers to the github system for code/tickets going forward. Maybe this strategy is too confusing.

I was planning to leave the wiki pages alone, but we’d happily take some contribution on that front if you’re interested in porting it over and bring it up to date.

Thanks!

Howard

_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Elliott Sales de Andrade
In reply to this post by Howard Butler-3
Hi Howard,

Howard Butler <howard <at> hobu.co> writes:
>
> All,
>
> Thanks to Thomas Bonfort, the proj.4 migration to github is complete. I
would like to invite you to take a
> look at
>
> https://github.com/OSGeo/proj.4
>

There are a few minor things to clean up that I think would be good to
do before calling this complete. They would modify the commit hashes and
require all forks to be recreated, so it is best to do them early.

 * Flatten the directory structure. In git, you get the entire history,
   so moving the docs to the directory on the side doesn't really change
   anything. You can fix this with some `git filter-branch` calls.

 * Most tags are made on an extra commit with no changes. The tags can
   be moved back one commit to the one on master. Then the tags become
   ancestors of most commits for better logging and such.
   * 4.9.0 (twice)
   * 4.8.0 (twice)
   * 4.7.0 (twice)
   * proj_4_5_0
   * proj_4_4_9
   * proj_4_4_7
   * proj_4_4_6
   * proj_4_4_5
   * NOTE: These empty commits will be automatically removed by calling
     git filter-branch.

 * Some tags contain an extra commit, but I think they can be removed:
   * proj_4_6_1 - This commit adds some files that were removed
                  (renamed) about 10 commits earlier. I _think_ the
                  commit should not exist.
   * proj_4_6_0 - This commit also adds some files that were removed
                  about 8 commits earlier. Again, I _think_ the commit
                  should not exist.
   * proj_4_4_8 - This commit duplicates some changes on another commit
                  that is on master. I think this tag can simply be
                  _moved_ to the commit on master since the two trees
                  are equivalent.

 * There are a couple of puzzling tags
   * proj_4_4_4 or 4.4.4 do not exist
   * proj_4_4_3 - This tag contains one extra commit that occurs 3 years
                  after its parent and even after proj_4_4_7. It even
                  includes changes that are some mix of 4.4.8. I don't
                  think this commit should exist either, as it seems to
                  be some kind of Frankenstein commit.

 * You need to create a .gitignore file. This can be done with
   git svn show-ignore > .gitignore
   Unfortunately, I have never been able to figure out an easy way to
   apply this retroactively.

 * Are you intending to keep the Subversion repository around and in
   sync? If not, you can remove the "git-svn-id" from the commit message
   that would just be clutter in an independent git repository.

To confirm my suspicions about the tags, I would go looking at the
tarballs, but the trac instance does not seem to be working for me at
the moment.

To show you how this would look (except for the .gitignore and
git-svn-id suggestions, as those should be done when converting from
svn), I have uploaded a cleaned repo [1] and, for reference, the
commands I used to produce it [2].

> and if there are no major issues identified in the next few days, we will
declare it complete and
> decommission the Trac instance at OSGeo.
>
> Howard

[1] https://github.com/QuLogic/proj4-clean
[2] https://gist.github.com/QuLogic/ed9d5f5c4a8b0dbc794f

_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Howard Butler-3

> On May 23, 2015, at 3:22 AM, Elliott Sales de Andrade <[hidden email]> wrote:
>
> To show you how this would look (except for the .gitignore and
> git-svn-id suggestions, as those should be done when converting from
> svn), I have uploaded a cleaned repo [1] and, for reference, the
> commands I used to produce it [2].

Fantastic. Unless I hear otherwise, we will use this repo as our starting point. My concerns are to make sure tags/branches are preserved, and Trac ticket->revision and github ticket->sha linkages are preserved as part of the migration.

Howard
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Kralidis,Tom [Ontario]
> -----Original Message-----
> From: [hidden email] [mailto:proj-
> [hidden email]] On Behalf Of Howard Butler
> Sent: 2015-05-24 10:44
> To: PROJ.4 and general Projections Discussions
> Subject: Re: [Proj] Github migration complete
>
>
> > On May 23, 2015, at 3:22 AM, Elliott Sales de Andrade
> <[hidden email]> wrote:
> >
> > To show you how this would look (except for the .gitignore and
> > git-svn-id suggestions, as those should be done when converting from
> > svn), I have uploaded a cleaned repo [1] and, for reference, the
> > commands I used to produce it [2].
>
> Fantastic. Unless I hear otherwise, we will use this repo as our
starting point.
> My concerns are to make sure tags/branches are preserved, and Trac
ticket-
> >revision and github ticket->sha linkages are preserved as part of the
> migration.
>
+1

_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Elliott Sales de Andrade
In reply to this post by Howard Butler-3
On 24 May 2015 at 10:43, Howard Butler <[hidden email]> wrote:
>
>> On May 23, 2015, at 3:22 AM, Elliott Sales de Andrade <[hidden email]> wrote:
>>
>> To show you how this would look (except for the .gitignore and
>> git-svn-id suggestions, as those should be done when converting from
>> svn), I have uploaded a cleaned repo [1] and, for reference, the
>> commands I used to produce it [2].
>
> Fantastic. Unless I hear otherwise, we will use this repo as our starting point.

Feel free to do so. Make sure to clone the latest copy, as I removed
the docs/README.TXT that is now irrelevant.
Just keep in mind that I did not remove the git-svn-id information. I
just realized that this can be done without re-converting, but that
depends on whether you wish to keep that information available.

> My concerns are to make sure tags/branches are preserved,

Now that trac is available again, I checked the tarballs, and the tags
with extra-but-nonempty commits do appear to match with the tarballs
when the extra commit is removed (except for some harmless $Id$
changes). So the cleaned repository appears to be correct.

> and Trac ticket->revision and

I do not see any of these.

> github ticket->sha linkages are preserved as part of the migration.

These links will need to be updated. Re-writing all the commits
invalidates all existing hashes.

>
> Howard

--
Elliott
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

tbonfort
> These links will need to be updated. Re-writing all the commits
> invalidates all existing hashes.

This would have to be done manually, or a specific script would have
to be written to update all github issue comments in order to modify
the SHAs. This is not a trivial task.

Thomas

>
>>
>> Howard
>
> --
> Elliott
> _______________________________________________
> Proj mailing list
> [hidden email]
> http://lists.maptools.org/mailman/listinfo/proj
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Elliott Sales de Andrade
On 26 May 2015 at 07:48, thomas bonfort <[hidden email]> wrote:
>> These links will need to be updated. Re-writing all the commits
>> invalidates all existing hashes.
>
> This would have to be done manually, or a specific script would have
> to be written to update all github issue comments in order to modify
> the SHAs. This is not a trivial task.
>

I've created a script to do so on the original gist [1]. You need the
`newrefs` file (which lists the tickets, comments, old & new hashes)
and `update_ticket_refs.py`. You would also have to `pip install
github3.py`. Then create a personal access token [2] for proj4-bot,
export it as the environment variable GH_TOKEN, and run
update_ticket_refs.py.

> Thomas
>

[1] https://gist.github.com/QuLogic/ed9d5f5c4a8b0dbc794f
[2] https://help.github.com/articles/creating-an-access-token-for-command-line-use/

--
Elliott
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Tom Kralidis
In reply to this post by Howard Butler-3
>>
>> Thanks Thomas/Howard!
>>
>> Some questions:
>>
>> - will the trac instance be available after decommissioning?
>> - any interest in turning https://trac.osgeo.org/proj/ into GitHub pages
>> (thereby available at http://osgeo.github.io/proj.4/ ?  I offer to
>> implement this and setup/deploy
>
>I definitely have interest in that. I guess the plan was to only decomission the ticket creation capabiltiy, and leave the rest standing for as long as reasonable, with pointers to the >github system for code/tickets going forward. Maybe this strategy is too confusing.
>
>I was planning to leave the wiki pages alone, but we’d happily take some contribution on that front if you’re interested in porting it over and bring it up to date.
>

Update: it was difficult to figure out what parts of
https://trac.osgeo.org/proj/ were website-ish as opposed to wiki
pages, so I initially transferred the trac wiki pages [1] to GitHub
wiki [2] verbatim.  If there is further interest in making an actual
website presence for proj.4, I'm happy to move this along.

..Tom

[1] http://trac.osgeo.org/proj/wiki/TitleIndex
[2] https://github.com/OSGeo/proj.4/wiki
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

jmckenna
Administrator
On 2015-05-26 11:08 PM, Tom Kralidis wrote:
> Update: it was difficult to figure out what parts of
> https://trac.osgeo.org/proj/ were website-ish as opposed to wiki
> pages, so I initially transferred the trac wiki pages [1] to GitHub
> wiki [2] verbatim.  If there is further interest in making an actual
> website presence for proj.4, I'm happy to move this along.
>
Should we also make the old trac wiki read-only?  I don't know how it's
done, but this was done for the MapServer trac instance (see message at
top of https://trac.osgeo.org/mapserver/).


-jeff



_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Tom Kralidis
I've submitted a ticket to SAC [1] and have provided an update notice
on the (soon to be read-only) trac [2].

[1] https://trac.osgeo.org/osgeo/ticket/1494
[2] https://trac.osgeo.org/proj



On Wed, May 27, 2015 at 7:02 AM, Jeff McKenna
<[hidden email]> wrote:

> On 2015-05-26 11:08 PM, Tom Kralidis wrote:
>> Update: it was difficult to figure out what parts of
>> https://trac.osgeo.org/proj/ were website-ish as opposed to wiki
>> pages, so I initially transferred the trac wiki pages [1] to GitHub
>> wiki [2] verbatim.  If there is further interest in making an actual
>> website presence for proj.4, I'm happy to move this along.
>>
> Should we also make the old trac wiki read-only?  I don't know how it's
> done, but this was done for the MapServer trac instance (see message at
> top of https://trac.osgeo.org/mapserver/).
>
>
> -jeff
>
>
>
> _______________________________________________
> Proj mailing list
> [hidden email]
> http://lists.maptools.org/mailman/listinfo/proj
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Elliott Sales de Andrade
In reply to this post by Howard Butler-3
Hi Howard,

On 24 May 2015 at 10:43, Howard Butler <[hidden email]> wrote:

>
>> On May 23, 2015, at 3:22 AM, Elliott Sales de Andrade <[hidden email]> wrote:
>>
>> To show you how this would look (except for the .gitignore and
>> git-svn-id suggestions, as those should be done when converting from
>> svn), I have uploaded a cleaned repo [1] and, for reference, the
>> commands I used to produce it [2].
>
> Fantastic. Unless I hear otherwise, we will use this repo as our starting point. My concerns are to make sure tags/branches are preserved, and Trac ticket->revision and github ticket->sha linkages are preserved as part of the migration.
>

I see that an update was made yesterday where the existing repository
was merged with the proj4-clean version. However, that means that the
repository is twice as large as it needs to be, since you still have
all of the original commits *and* all of the re-written ones. It would
be better to replace it outright:

$ git clone [hidden email]:QuLogic/proj4-clean.git
$ cd proj4-clean
$ git remote add osgeo [hidden email]:OSGeo/proj.4.git
$ git push -f osgeo --all
$ git push -f osgeo --tags

> Howard

--
Elliott
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Howard Butler-3

> On May 28, 2015, at 1:57 AM, Elliott Sales de Andrade <[hidden email]> wrote:
>
> It would
> be better to replace it outright:
>
> $ git clone [hidden email]:QuLogic/proj4-clean.git
> $ cd proj4-clean
> $ git remote add osgeo [hidden email]:OSGeo/proj.4.git
> $ git push -f osgeo --all
> $ git push -f osgeo --tags

Done.

Thanks for your efforts.

Also, thanks to Tom Kralidis for migrating the wiki. I propose we freeze the existing Trac instance so the old links will continue to work

Unless someone sees any significant and blocking issue in either the git repository or the issues in the next day or so, I’m calling the migration complete.

Howard
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Tom Kralidis
On Thu, May 28, 2015 at 11:04 AM, Howard Butler <[hidden email]> wrote:

>
>> On May 28, 2015, at 1:57 AM, Elliott Sales de Andrade <[hidden email]> wrote:
>>
>> It would
>> be better to replace it outright:
>>
>> $ git clone [hidden email]:QuLogic/proj4-clean.git
>> $ cd proj4-clean
>> $ git remote add osgeo [hidden email]:OSGeo/proj.4.git
>> $ git push -f osgeo --all
>> $ git push -f osgeo --tags
>
> Done.
>
> Thanks for your efforts.
>
> Also, thanks to Tom Kralidis for migrating the wiki. I propose we freeze the existing Trac instance so the old links will continue to work
>

Agree.  I've issued a ticket to SAC [1] and updated the wiki [2].

[1] http://trac.osgeo.org/osgeo/ticket/1494
[2] http://trac.osgeo.org/proj/

> Unless someone sees any significant and blocking issue in either the git repository or the issues in the next day or so, I’m calling the migration complete.
>
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Elliott Sales de Andrade
In reply to this post by Howard Butler-3
Hi Howard,

On 28 May 2015 at 11:04, Howard Butler <[hidden email]> wrote:
>
>> On May 28, 2015, at 1:57 AM, Elliott Sales de Andrade <[hidden email]> wrote:
>>
>> It would
>> be better to replace it outright:
>>

Sorry, forgot one *very* important line to get the branches in sync:

$ git clone [hidden email]:QuLogic/proj4-clean.git
$ cd proj4-clean

# Copy branches locally
$ for br in 4.7 4.8 4.9; do git branch $br origin/$br; done

$ git remote add osgeo [hidden email]:OSGeo/proj.4.git
$ git push -f osgeo --all
$ git push -f osgeo --tags

>
> Done.
>
> Thanks for your efforts.
>
> Also, thanks to Tom Kralidis for migrating the wiki. I propose we freeze the existing Trac instance so the old links will continue to work
>
> Unless someone sees any significant and blocking issue in either the git repository or the issues in the next day or so, I’m calling the migration complete.
>
> Howard

--
Elliott
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj
Reply | Threaded
Open this post in threaded view
|

Re: Github migration complete

Howard Butler-3
Ok,

Thanks to Elliott, Tom, and Thomas, the PROJ.4 migration to github at http://github.com/OSGeo/proj.4 is now complete.

https://trac.osgeo.org/proj/ has been set to static, and now points to github.

The current PROJ.4 SVN is actually inside of MetaCRS. Should we just delete the ./proj tree from it and replace it with a README pointing to github?

Howard
_______________________________________________
Proj mailing list
[hidden email]
http://lists.maptools.org/mailman/listinfo/proj