Opened 6 years ago

Closed 6 years ago

#7074 closed Bug/Something is broken (fixed)

transition village from svn to git

Reported by: https://id.mayfirst.org/dkg Owned by: https://id.mayfirst.org/dkg
Priority: Medium Component: Tech
Keywords: hay.mayfirst.org members.mayfirst.org village git-to-svn Cc:
Sensitive: no

Description (last modified by https://id.mayfirst.org/dkg)

village (served from hay) is in kind of rough shape. Also, it's backed by svn, which we're trying to get away from.

This ticket covers the process of trying to move village from svn to git and cleaning up and knowing what code we're actually running on https://members.mayfirst.org/

Change History (4)

comment:1 Changed 6 years ago by https://id.mayfirst.org/dkg

  • Description modified (diff)
  • Owner set to https://id.mayfirst.org/dkg
  • Status changed from new to assigned

comment:2 Changed 6 years ago by https://id.mayfirst.org/dkg

Here's the (strange) state on hay:

0 mayfirst@hay:/usr/local/share/village/live$ svn status
!       .
?       config.inc.php
    S   config.inc.php.sample
    S   src
M       src/class.village.inc.php
?       ihtml/header.ihtml
?       ihtml/footer.ihtml
    S   ihtml/message.ihtml
    S   ihtml/rss.ihtml
    S   ihtml/header.ihtml.sample
    S   ihtml/footer.ihtml.sample
?       web/banner.jpg
?       web/favicon.ico
    S   web/cache
    S   web/scripts
    S   web/village_style.css
    S   web/index.php
0 mayfirst@hay:/usr/local/share/village/live$ svn info | grep URL
URL: https://svn.mayfirst.org/mfpl/tags/village/25
0 mayfirst@hay:/usr/local/share/village/live$ svn info $(svn status | awk '/S/{ print $2 }')  | grep ^URL
URL: https://svn.mayfirst.org/mfpl/tags/village/24/config.inc.php.sample
URL: https://svn.mayfirst.org/mfpl/tags/village/24/src
URL: https://svn.mayfirst.org/mfpl/tags/village/24/ihtml/message.ihtml
URL: https://svn.mayfirst.org/mfpl/tags/village/24/ihtml/rss.ihtml
URL: https://svn.mayfirst.org/mfpl/tags/village/24/ihtml/header.ihtml.sample
URL: https://svn.mayfirst.org/mfpl/tags/village/24/ihtml/footer.ihtml.sample
URL: https://svn.mayfirst.org/mfpl/tags/village/24/web/cache
URL: https://svn.mayfirst.org/mfpl/tags/village/24/web/scripts
URL: https://svn.mayfirst.org/mfpl/tags/village/24/web/village_style.css
URL: https://svn.mayfirst.org/mfpl/tags/village/24/web/index.php
0 mayfirst@hay:/usr/local/share/village/live$ 

so a bunch of stuff appears to still be on tag 24, even though the root is at tag 25; and yet the only files changed between tags 24 and 25 do appear to have been updated to tag 25:

0 dkg@alice:~$ svn diff https://svn.mayfirst.org/mfpl/tags/village/{24,25} | diffstat
 ihtml/main.ihtml |   47 +++------------------------
 web/style.css    |   93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 41 deletions(-)
0 dkg@alice:~$ 

very strange.

Aside from the tag issue, we have one meaningless divergence from the source, which i think i should just remove:

0 mayfirst@hay:/usr/local/share/village/live$ svn diff
Index: src/class.village.inc.php
===================================================================
--- src/class.village.inc.php	(revision 2474)
+++ src/class.village.inc.php	(working copy)
@@ -9,6 +9,7 @@
 			'http://lists.mayfirst.org/rss/service-advisories.xml',
 			'http://lists.mayfirst.org/rss/lowdown.xml'
 		);
+//var $_rss_feeds = array();
 
 		function set_config($config)
 		{
0 mayfirst@hay:/usr/local/share/village/live$ 

and then we have the remaining uncommitted files:

0 mayfirst@hay:/usr/local/share/village/live$ ls -la ihtml/{header,footer}.ihtml web/{banner.jpg,favicon.ico} config.inc.php
-rw-r--r-- 1 mayfirst mayfirst  1196 May 26  2012 config.inc.php
lrwxrwxrwx 1 mayfirst mayfirst    44 Apr 14  2008 ihtml/footer.ihtml -> /usr/local/share/mayfirst_theme/footer.ihtml
lrwxrwxrwx 1 mayfirst mayfirst    44 Apr 14  2008 ihtml/header.ihtml -> /usr/local/share/mayfirst_theme/header.ihtml
-rw-r--r-- 1 root     mayfirst 39557 Feb 15 17:04 web/banner.jpg
-rw-r--r-- 1 mayfirst mayfirst 17473 Apr  4 12:21 web/favicon.ico
0 mayfirst@hay:/usr/local/share/village/live$ 

I suspect that the banner and favicon just belong directly in the repository. i'm not sure what to do about config.inc.php or the symlinks to the mayfirst theme.

comment:3 Changed 6 years ago by https://id.mayfirst.org/dkg

I just converted village's SVN repository to git with the same technique discussed in #7068 and #7046:

git init village
cd village/
git svn init https://svn.mayfirst.org/mfpl --trunk trunk/village --tags tags/village
git svn fetch --authors-file=../svn-authors-for-git 
../convert-git-svn-tags 

I set up a repo on git.mayfirst.org, and made it so it pushes to the bare repo here on moses, and i pushed the changes to it, so it's now visible here at SMO.

still to do: update the installation on hay to pull from tags in the git repo, but i'm fading right now; i'll wrap this up in the morning.

comment:4 Changed 6 years ago by https://id.mayfirst.org/dkg

  • Resolution set to fixed
  • Status changed from assigned to closed

OK, village is now pulling from the git repository.

I moved all the old files that were in hay:/usr/local/share/village to mayfirst@hay:~/tickets/7074/ so they can be retrieved if need be.

and i just the image files to the repository.

There are still some outstanding untracked files in that repo, but there are fewer of them than there used to be. anyone who wants to clean them up and get village finally fully tracked would be welcome to do so.

I also removed village from svn to round out this cleanup.

Please login to add comments to this ticket.

Note: See TracTickets for help on using tickets.