New release?

New release?, a forum discussion on Jojo CMS. Join us for more discussions on New release? on our General Announcements forum.

Back to Forum Index : Back to General Announcements Page << [1] [2] [3] [4] [5] >>  RSS
Jaijaz Jaijaz

19 Apr 2012
Posts: 215

I've created an organization on github (https://github.com/JojoCMS) that I have added Tom and Rick to as owners as I knew from previous posts there username. If Harvey and Anthony wish to get me their github usernames I'll add them too.

We can have unlimited public repos on the free account, which as open source we want. As owners we can commit straight to it. Any non owner can branch the code, make changes, then put in a pull request that we can choose whether we wish to accept or not.

Sometime tonight I will start the process of creating the repos on the site.

Interestingly the free account has a 300MB limit which all the plugins may push us over but I'll cross that bridge when I get to it.
If you not living on the edge you taking up too much space.
tom

Developer

tom

19 Apr 2012
Posts: 379

Nice one, thanks Jai - have transferred the Jojo-CMS repo to that account.
Rick Rick

19 Apr 2012
Posts: 336

Apparently 300mb is a "soft limit" and can sometimes be increased by asking.
antony

19 Apr 2012
Posts: 17

Okay just setup "antonyspalding" for me and "gh-webmaster" for gardyneHOLT. If you could add those that would be great.
tom

Developer

tom

19 Apr 2012
Posts: 379

Nice - github picked you up - presumably by email address - from the commit authors I assigned to the repo, so your commits are linked to your profile
Jaijaz Jaijaz

19 Apr 2012
Posts: 215

Liking the auto pickup by github.

Tom did the current 1.1 go onto github?

Going to start bringing over plugins
If you not living on the edge you taking up too much space.
tom

Developer

tom

19 Apr 2012
Posts: 379

Yip - I moved the whole repo, including the 1.1 tag (which includes a few of Harvey's commits which weren't in the SVN when I tagged it there)
Jaijaz Jaijaz

19 Apr 2012
Posts: 215

Tom, how did you extract the svn? I have been trying several ways and can't get anything to work.
If you not living on the edge you taking up too much space.
Rick Rick

20 Apr 2012
Posts: 336

Wow, I just created and pushed a branch for working on pluggable editors and although it only changed 8 files, Github shows plenty of changes... might be my line endings. Time to investigate.
Rick Rick

20 Apr 2012
Posts: 336

@Jaijaz, Tom might've used svn2git, I've seen it mentioned in plenty of places. svn export is also useful but not really suited for this as you'd lose all your commit history.
tom

Developer

tom

20 Apr 2012
Posts: 379

i did indeed use svn2git, and it wasn't pleasant - which is why there's only the branch up there, and the tag that I generated from git rather than the svn copy. Mostly it seems to be an issue with the fact that the branch/trunk structure was added to the svn repo mid way through, which confuses the hell out of svn2git as it tries to work out the commit history. That and you need to have author records for everybody.

svn2git http://svn.jojocms.org/branches/jojo1.0/ --authors /var/www/authors.txt --rootistrunk --no-minimize-url --v

rootistrunk is because I'm only extracting the one bit (branch) and I want it to be master, no-minimize is because if you go into the folder structure and use rootistrunk is doesn't like it, --v is the only way to see what's going on and work out why it fails. I'll email you the authors.txt - it should be good for anything on the Jojo svn.

When you have the repo (you start with an empty folder - svn2git creates the repo - and you have to delete the .git file if you screw up any of the above or it fails, again..) then you can use git to add the remote origin and push it up

Having built it you can refresh your svn2git repo quite easily from svn with

svn2git --rebase

although as Rick noticed, its not always as clean as you like when you go to push it up.

As a consequence I'd like to move to git as the primary as soon as possible (svn can stay where it is, but be treated as a fork)
Jaijaz Jaijaz

20 Apr 2012
Posts: 215

By 1am I had some success with the git svn command through getting that install correctly appears to be what was stopping svn2git working properly for me. Will have another go tonight. The tricky part as I see it is that we really want the branch of each plugin rather than the trunk, correct?
If you not living on the edge you taking up too much space.
tom

Developer

tom

20 Apr 2012
Posts: 379

That makes it tricky because svn2git is expecting to get either a normal tag/branch/trunk structure, or none - and
because the history of that structure is incomplete (it was added later), trying for everything fails

and because we don't want the trunk as master and it doesn't like you trying to tell it to use the branch as trunk..

you're forced (as far as I can work out) to use the approach above, which means you don't get anything but the branch.

There are ways you can extract each individually and then stitch them back into one repo but by that time of the evening i wasn't that interested anymore...
I figure you can make a 1.1 tag from git once the branch is there. The older tags.. maybe just leave them accessible from svn?

Not having all the authors in authors.txt, including (no author), will also cause a silent fail. If the name or email match an existing Git user, it will link them as commit authors.
Rick Rick

20 Apr 2012
Posts: 336

, that was a lot harder than I anticipated. Well done on ripping through it.

Github has reasonable SVN support for any users that wish to remain using SVN once Githib is the primary repo.

I know that mikec did some work in the trunk towards PHP 2.3 and other things... Does anyone know what state it's in? Should we bring it over as a branch? I haven't seen mikec round for a while.
tom

Developer

tom

20 Apr 2012
Posts: 379

I don't think Mike will be back in any short order - from what i can see on github he's been working on Silverstripe .. presumably as part of his new job. You never know though.

Trunk is so far out of whack from branch now I don't see any way of cleanly bringing it back in as is, but I'd like to leave the svn copy there so that we can at some point dig through it and extract the multi-domain stuff (which mostly works, but is not very well supported on in the Admin).

Jojo branch is fine on 5.3 - Mike was making it a minimum requirement for trunk (along with Dwoo) which meant he could use some of the shortcuts without worrying about backwards compatibility.
Rick Rick

20 Apr 2012
Posts: 336

Oh, I hadn't realised Mike had left. I caught the tail end of a conversation when the Hangout was messing up but I thought he'd moved to other projects.

Dwoo is great but sometimes I miss some of Smarty3's features such as being able to assign data even after fetching has started (eg via a hook) and to assign objects too.
Jaijaz Jaijaz

25 Apr 2012
Posts: 215

Update on the plugin front.

After adding a few plugins to the JojoCMS organisation I realized how crowded it was going to be with all the plugins in there. Plus there was the potential for us having troubles with the 300MB.

So I have created a separate organisation JojoCMS-Plugins and have started the process of uploading all the plugins there.
If you not living on the edge you taking up too much space.
tom

Developer

tom

26 Apr 2012
Posts: 379

Given the ease-of-use and update-ability that github offers it may make sense to publish plugins more separately. Using git will mean linking to a separate repo for each plugin anyway, so it won't make any difference what account they fall under or if they're are housed under multiple accounts.

So developers can create and publish their own plugins under their own accounts and we can use the central Jojo-Cms account to link to them and publicize them, perhaps?

I presume there is a way to assign push rights to whole groups (so that you could allow anyone from the Jojo owners group to modify and contribute to one of your plugins)
Jaijaz Jaijaz

26 Apr 2012
Posts: 215

Actually I was thinking along the same lines.

Why thinking was there will be "official Jojo plugins" that will exist in JojoCMS-Plugins, like gallery and cart etc. Then there will be ones that we have developed and have on our own accounts. If someone wishes to work on the plugin, they can clone and do the pull request or the owner can give full owner rights for the bigger collaboration stuff.

On that note, if there is something that exists on the Plugin SVN that you put in there and want to pull to your own account, speak now. It can be transferred at a later date though.
If you not living on the edge you taking up too much space.
antony

26 Apr 2012
Posts: 17

Hi,

Those having trouble with lots of .svn folders I found this command quite useful

find . -type d -name .svn (finds all .svn folders from the current directory down)

rm -rf `find . -type d -name .svn` (passes it to rm with recursive and force delete options)

cheers,
Antony
Back to Forum Index : Back to General Announcements Page << [1] [2] [3] [4] [5] >>  RSS
You must be logged in to post a reply



You need to Register or Log In before posting on these forums.