You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sis.apache.org by Martin Desruisseaux <ma...@geomatys.com> on 2021/05/11 10:36:16 UTC

Re: SIS web site repository

Hello Bruno and all

I have imported the SIS web site history with the following command:

    git svn clone --stdlayout https://svn.apache.org/repos/asf/sis/site/trunk/ --authors-file=authors.txt

I pushed the result on the Git repository, mirrored there:

    https://github.com/apache/sis-site

It contains the SVN revision numbers in each commit. I named the branch 
"main" instead of "master" since it seems to be a recommended practice.


Le 10/05/2021 à 12:30, Bruno P. Kinoshita a écrit :

> Feel free to modify those commits, squash, edit. I don't mind even if 
> the authorship changes too :)
>
I would like to keep the attribution to you if you don't mind :-). Can 
you create a fork of above GitHub repository, then execute the following 
Unix commands?

    git clone https://github.com/path/to/your/repo/sis-site
    git clone https://github.com/kinow/sis-site-draft
    cd sis-site-draft
    rm -rf .git
    mv ../sis-site/.git .
    git add -A
    git commit -m "Some commit message"
    git push

However before to execute above instruction, I noticed that the "book" 
directory seems to have disappeared. We would need to add it somewhere, 
I'm not sure where is the appropriate place. They are sources, but in 
HTML instead of Markdown. After missing files are put in place, a "git 
status" before above "git commit" should show "renamed" for almost every 
files, except the ones that are specific to the CMS.

     Martin

Re: SIS web site repository

Posted by "Bruno P. Kinoshita" <ki...@apache.org>.
 That's great news! Later when I have more spare time I will update the CSS libs (bootstrap I think) of both SIS site and GeoAPI, and try to improve accessibility.

Even though my eyes are not that bad, I do use a somewhat bigger screen font, so I sympathize a lot with visual impaired users :) and both sites are pretty easy to improve accessibility.

>Sorry for the extra work caused by my mistake

It was not a problem at all Martin, it's been fun working with you on SIS. And thanks a lot for going the extra mile and providing the command line examples with your message, that helped me understanding more your feedback :)


I'm still lurking in that INFRA ticket, so looking forward to the new site once they have finished migrating it.


Thanks!
Bruno


    On Wednesday, 12 May 2021, 9:07:13 pm NZST, Martin Desruisseaux <ma...@geomatys.com> wrote:  
 
 Pull request merged

Just for the record, the "find" command that I provided in my previous 
emails was wrong. It should have been:

    find static/ -name "*.html" -exec git reset '{}' \;

Sorry for the extra work caused by my mistake

     Martin

Re: SIS web site repository

Posted by Martin Desruisseaux <ma...@geomatys.com>.
Pull request merged

Just for the record, the "find" command that I provided in my previous 
emails was wrong. It should have been:

    find static/ -name "*.html" -exec git reset '{}' \;

Sorry for the extra work caused by my mistake

     Martin

Re: SIS web site repository

Posted by Martin Desruisseaux <ma...@geomatys.com>.
Hello Hugo

Le 12/05/2021 à 00:58, Bruno P. Kinoshita a écrit :

> I tried to execute the commands you sent (thanks for that!), but it didn't work. Are you on macos? If so, macos' find has a different, non-posix, syntax I believe (had a similar issue with a co-worker some years ago and learned that, I think BSD introduced the changes).

Yes, for the "find" command MacOS requires that we specify the base 
directory, which was ".". So the following command:

    find -name "static/*.html" -exec git reset '{}' \;

become:

    find . -name "static/*.html" -exec git reset '{}' \;


> Anyhow, I took the longer way, and edited each file that had http-https changes manually by looking at the GitHub UI to see what files had changes.

I'm sorry for the extra work!


> Also moved books/ to the top level of the Hugo site (won't be deployed, but it's available to devs as source to produce the new book I think?).
>
> Same with templates. I've moved the files from templates/ and content/templates both to under /templates/. It won't be in the SIS website, but devs can be use it.
>
> Let me know if it's looking better now, and if there are any changes pending.
>
> I've squashed the commits and did a quick test with Hugo again locally, and found no issues.

It all sound very good for me! At a first look I don't see anything to 
change. I will push soon. Thanks again!

     Martin

Re: SIS web site repository

Posted by "Bruno P. Kinoshita" <ki...@apache.org>.
 Hi Martin,

I tried to execute the commands you sent (thanks for that!), but it didn't work. Are you on macos? If so, macos' find has a different, non-posix, syntax I believe (had a similar issue with a co-worker some years ago and learned that, I think BSD introduced the changes).

Anyhow, I took the longer way, and edited each file that had http-https changes manually by looking at the GitHub UI to see what files had changes.

Also moved books/ to the top level of the Hugo site (won't be deployed, but it's available to devs as source to produce the new book I think?).

Same with templates. I've moved the files from templates/ and content/templates both to under /templates/. It won't be in the SIS website, but devs can be use it.

Let me know if it's looking better now, and if there are any changes pending.

I've squashed the commits and did a quick test with Hugo again locally, and found no issues.

Cheers
Bruno

    On Wednesday, 12 May 2021, 12:53:19 am NZST, Martin Desruisseaux <ma...@geomatys.com> wrote:  
 
 Le 11/05/2021 à 13:36, Bruno P. Kinoshita a écrit :

> Out of curiosity, how long did `git svn clone` take? Just to compare 
> with svn2git :)
>
I do not really know. It finished somewhere in the middle of the night. 
But it has been many hours.


> I've created a PR here with the new site: 
> https://github.com/apache/sis-site/pull/1
> Take a look to see if I forgot anything, or if something changed after 
> the porting to Hugo.
>
Thanks! The main thing is the missing "book/*.html" files. Would it be 
possible to add them, then squash the commits? With a squash, the pull 
request will be automatically updated with a new "diff" page saying that 
those files have been moved rather than deleted. The main question is 
where to put them… Not in the "static" directory I think, since they are 
source files used for building the static HTML file.

There is also many URL that changed. I think it is because I did an 
update of those URLs after the migration to Hugo. Would it be possible 
to do the following? Repeat the steps given in my previous email, but 
before to do "git commit", execute the following commands:

    find -name "static/*.html" -exec git reset '{}' \;
    find -name "book/*" -exec git reset '{}' \;
    git checkout .

It should cancel all changes in HTML files, on the assumption that 
migration to Hugo should not change those files. Then the following 
command would help to see if there is any remaining URL changes:

    git diff --staged | grep "http"

Thanks!

     Martin

Re: SIS web site repository

Posted by Martin Desruisseaux <ma...@geomatys.com>.
Le 11/05/2021 à 13:36, Bruno P. Kinoshita a écrit :

> Out of curiosity, how long did `git svn clone` take? Just to compare 
> with svn2git :)
>
I do not really know. It finished somewhere in the middle of the night. 
But it has been many hours.


> I've created a PR here with the new site: 
> https://github.com/apache/sis-site/pull/1
> Take a look to see if I forgot anything, or if something changed after 
> the porting to Hugo.
>
Thanks! The main thing is the missing "book/*.html" files. Would it be 
possible to add them, then squash the commits? With a squash, the pull 
request will be automatically updated with a new "diff" page saying that 
those files have been moved rather than deleted. The main question is 
where to put them… Not in the "static" directory I think, since they are 
source files used for building the static HTML file.

There is also many URL that changed. I think it is because I did an 
update of those URLs after the migration to Hugo. Would it be possible 
to do the following? Repeat the steps given in my previous email, but 
before to do "git commit", execute the following commands:

    find -name "static/*.html" -exec git reset '{}' \;
    find -name "book/*" -exec git reset '{}' \;
    git checkout .

It should cancel all changes in HTML files, on the assumption that 
migration to Hugo should not change those files. Then the following 
command would help to see if there is any remaining URL changes:

    git diff --staged | grep "http"

Thanks!

     Martin

Re: SIS web site repository

Posted by "Bruno P. Kinoshita" <ki...@apache.org>.
 Hi Martin!

Out of curiosity, how long did `git svn clone` take? Just to compare with svn2git :)

I've created a PR here with the new site: https://github.com/apache/sis-site/pull/1

Take a look to see if I forgot anything, or if something changed after the porting to Hugo.

>However before to execute above instruction, I noticed that the "book" 
directory seems to have disappeared. We would need to add it somewhere, 


It should be in the static/book folder now. You will notice I left the templates folder outside, as I don't think they are intended to be published with the site, but rather used by developers for e-mails, releases, etc.

If  you have archives that you want to include that will be accessible somewhere when the site is deployed, move them somewhere under that static folder. Otherwise use a top level folder. It shouldn't interefere with the ASF site publication, or how Hugo works.

Thanks heaps!
Bruno




    On Tuesday, 11 May 2021, 10:36:25 pm NZST, Martin Desruisseaux <ma...@geomatys.com> wrote:  
 
 Hello Bruno and all

I have imported the SIS web site history with the following command:

    git svn clone --stdlayout https://svn.apache.org/repos/asf/sis/site/trunk/ --authors-file=authors.txt

I pushed the result on the Git repository, mirrored there:

    https://github.com/apache/sis-site

It contains the SVN revision numbers in each commit. I named the branch 
"main" instead of "master" since it seems to be a recommended practice.


Le 10/05/2021 à 12:30, Bruno P. Kinoshita a écrit :

> Feel free to modify those commits, squash, edit. I don't mind even if 
> the authorship changes too :)
>
I would like to keep the attribution to you if you don't mind :-). Can 
you create a fork of above GitHub repository, then execute the following 
Unix commands?

    git clone https://github.com/path/to/your/repo/sis-site
    git clone https://github.com/kinow/sis-site-draft
    cd sis-site-draft
    rm -rf .git
    mv ../sis-site/.git .
    git add -A
    git commit -m "Some commit message"
    git push

However before to execute above instruction, I noticed that the "book" 
directory seems to have disappeared. We would need to add it somewhere, 
I'm not sure where is the appropriate place. They are sources, but in 
HTML instead of Markdown. After missing files are put in place, a "git 
status" before above "git commit" should show "renamed" for almost every 
files, except the ones that are specific to the CMS.

     Martin