Git / Gitorious

Moderator: Heart

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Mon Apr 12, 2010 5:47 pm

But already the svn version is not uptodate with all the commits on  git
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Mon Apr 12, 2010 6:13 pm

teddy wrote:During the last week I've installed Git bash/GUI on 2 different PCs and have followed a few tutorials on the web. Without success, I'd say. Which means I've not been able to work on the italian localization finalization I'd like to start (sorry, I'm not a dev, and neither tech savvy enough it seems). Perhaps any of you could replicate Kurt's tutorial on this thread?
http://www.joomleague.de/forum/index.ph ... 698.0.html
It would be very kind and useful...


Teddy , I understand,
but we checked the current language files, and they are not fully complete....+/-200 lines are already missing.
I think its better to wait for translation a week, or 2 weeks before a beta release.
So then we send the needed files, you can translate and send it back...

I hope you understand
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
teddy
.
Posts: 305
Joined: Wed Feb 28, 2007 12:01 pm

Re:Git / Gitorious

Postby teddy » Mon Apr 12, 2010 6:21 pm

I'm not in a hurry, I've just seen many contributors to language files and wanted to give my part... don't feel pressured at all, as you said translation should be the last thing!
The only major thing I feel lacking now is a complete frontend editing feature, and maybe some module (not mentioning tippspiel :-) besides that it's only bug hunting and fixing...
keep up the good work
PS
git is very useful for testing current releases, not only for translating, so mindh4nt3r work would be welcome!
Joomla 1.5.22
Joomleague 1.5.1

User avatar
mindh4nt3r
Joomleague Core Developer
Joomleague Core Developer
Posts: 125
Joined: Fri Apr 02, 2010 4:22 pm
Joomleague version: 2.0.x
Contact:

Re:Git / Gitorious

Postby mindh4nt3r » Mon Apr 12, 2010 7:04 pm

I'm currently working on writing a detailed manual on how to be able to work on JoomLeague while using GIT. I will bundle all the required software with it and post it on here when done.
Joomleague Developer

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Mon Apr 12, 2010 10:28 pm

teddy wrote:I'm not in a hurry, I've just seen many contributors to language files and wanted to give my part... don't feel pressured at all, as you said translation should be the last thing!
The only major thing I feel lacking now is a complete frontend editing feature, and maybe some module (not mentioning tippspiel :-) besides that it's only bug hunting and fixing...
keep up the good work
PS
git is very useful for testing current releases, not only for translating, so mindh4nt3r work would be welcome!


At least for the prediction game or TippSpiel we really need someone who is used to that and may help us on (re)coding that part of JoomLeague again :)

Every help on this is very useful :)
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
mindh4nt3r
Joomleague Core Developer
Joomleague Core Developer
Posts: 125
Joined: Fri Apr 02, 2010 4:22 pm
Joomleague version: 2.0.x
Contact:

Re:Git / Gitorious

Postby mindh4nt3r » Tue Apr 13, 2010 9:00 am

URGENT REQUEST for all developers to make sure your clone stays up-to-date so that once requesting a merge I don't have to merge your files manualy because you've been working with outdated files.

Thanx in advance
Joomleague Developer

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Tue Apr 13, 2010 9:03 am

to ALL

Before doing a merge request, make sure you update (pull master) your clone first !!!
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Tue Apr 13, 2010 5:15 pm

timoline wrote:But already the svn version is not uptodate with all the commits on  git

Its better to close the svn (write) access to SVN, I already see that svdoldie did a commit :bash:
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
Kasi
Donator
Donator
Posts: 67
Joined: Sat Apr 04, 2009 1:24 pm
Location: Geesthacht / Schleswig-Holstein
Contact:

Re:Git / Gitorious

Postby Kasi » Wed Apr 14, 2010 7:02 am

Hallöchen Jungs!

Da mein englisch echt nicht so dolle ist habe ich mal eine bitte.

Kann mir jemand mal auf deutsch erklären wie das updaten der Joomleague Komponente und der Module mit Git/Gitorious funktioniert?

Ich bekomme es einfach nicht hin!

Git habe ich bereits auf meinem Rechner geladen.  Mit SVN gings es ja sehr einfach!


Gruß Kasi
Joomla 1.5.23
Joomleague-1.5.2-sara (Beta 2)

Mannschaftshomepage: http://www.escheburg1.de

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Wed Apr 14, 2010 7:07 am

Kasi wrote:Hallöchen Jungs!

Da mein englisch echt nicht so dolle ist habe ich mal eine bitte.

Kann mir jemand mal auf deutsch erklären wie das updaten der Joomleague Komponente und der Module mit Git/Gitorious funktioniert?

Ich bekomme es einfach nicht hin!

Git habe ich bereits auf meinem Rechner geladen.  Mit SVN gings es ja sehr einfach!


Gruß Kasi

http://wiki.impressive-media.de/searchp ... xonomy:418

Google is your friend;)
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
Kasi
Donator
Donator
Posts: 67
Joined: Sat Apr 04, 2009 1:24 pm
Location: Geesthacht / Schleswig-Holstein
Contact:

Re:Git / Gitorious

Postby Kasi » Wed Apr 14, 2010 7:17 am

timoline wrote:
http://wiki.impressive-media.de/searchp ... xonomy:418

Google is your friend;)


:thx:
Joomla 1.5.23
Joomleague-1.5.2-sara (Beta 2)

Mannschaftshomepage: http://www.escheburg1.de

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Wed Apr 14, 2010 7:24 am

http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Wed Apr 14, 2010 8:50 am

http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
svdoldie
.
Posts: 667
Joined: Fri Feb 16, 2007 7:34 pm
Joomleague version: 2.0.x
Contact:

Re:Git / Gitorious

Postby svdoldie » Wed Apr 14, 2010 9:56 am

Für mich ist Git bis jetzt ziemlich kompliziert im Gegensatz zu SVN  :(
Das geht schon los mit dem ganzen Klones, die es auf Gitorious gibt.
Welcher ist derjenige, bei dem ich den neuesten Stand herunterladen kann.
Oder wird es auch wieder nightly-builts geben?

Gruß svdoldie
SV Dörpum http://svdoerpum.de
Joomla 2.5.11
JL-2.x.x Komplettpaket von Diddi Poeler, mit vielen Verbesserungen und Erweiterungen zur Originalversion https://github.com/diddipoeler/joomleag ... plettpaket
Link zu Diddi's Seite: http://fussball in europa.de/index.php (Leerzeichen müssen entfernt werden)

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Wed Apr 14, 2010 9:59 am

Is it possible to have 5 different git-directories or clones or truncs or however that might be called from the only one that we have now???

1) 3rd_party
2) com_joomleague
3) languages
4) modules
5) plugins

What I miss with git and the actual structure is to pull only one of the 5 parts written above.
I think you might understand what I want to do :)

To create a repository directly inside a local Joomla-Installation so all files for example inside "com_joomleague" on git directly point to my local Joomla-Installation dirs and files. So I could be able to work with the code inside a local Joomla installation, ignore all files and dirs not belonging to JoomLeague and can directly commit and push from this "locally active" files.

That was the way I worked with SVN till now but as git only has one hidden git-settings-dir I don't seem to be able to work with git as I did it with svn :(

Is this possible??? Maybe also just by a special clone which may let me just work with all dirs and files inside the directory master/com_coomleague???
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Wed Apr 14, 2010 10:08 am

svdoldie wrote:Für mich ist Git bis jetzt ziemlich kompliziert im Gegensatz zu SVN   :(
Das geht schon los mit dem ganzen Klones, die es auf Gitorious gibt.
Welcher ist derjenige, bei dem ich den neuesten Stand herunterladen kann.
Oder wird es auch wieder nightly-builts geben?

Gruß svdoldie


Scheint alles Gewöhnungssache zu sein ;)

Der aktuell offizielle Part ist wohl immer der "master" (also "git@gitorious.org:joomleague/joomleague.git"). Alle Klons sind persönliche Klons der jeweiligen Entwickler, bis sie einen Teil beendet haben. Wenn ich z.B. der Meinung bin, dass ich alle meine Änderungen in meinen Klon eingebaut habe und sie in den Master integrieren möchte - damit auch jeder andere damit arbeiten kann - dann wird mein Klon mit dem Master verschmolzen. Alle, die sich den Master nach dem Verschmelzen mit meinem Klon ziehen, haben meine Änderungen automatisch eingebunden, sobald sie den Master erneut auf ihrer lokalen Installation aktualisieren.

Wir versuchen gerade eine für uns passende Anleitung zusammenzuschreiben, damit sich nicht Jeder alles Informationen über den Umgang im Git selber zusammenklauben muss ;)
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Wed Apr 14, 2010 10:08 am

it's possible to create 5 repos, but it might then be difficult to keep them synced in the long term (for exemple, if you start working on a feature that will require changes in component and modules, you will have to create a dev branch in both the repo...). So having a single repo is easier for me, as I am sure the the included modules/plugins/component are supposed  to work together in the same branch.

Now, regarding your problem, i think this wouldn't be possible anyway, as you would have to add on ignore list all the joomla folders (git just creates a single .git folder at the root of the repo, not a .svn folder in every branch folder as svn !). What you can do however, and what i recommand, is to create symbolic links from your webserver to your joomleague workspace. On linux, it's really straightforward, I am not sure if and how this can work on windows though (if windows 'link' do not work, maybe you can set that in the webserver settings)
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Wed Apr 14, 2010 10:17 am

answering to myself, just googling a bit, i found out that it is indeed possible to use symbolic link in windows, it's just that you need a 3rd party utility to do it:
http://drupal.org/node/31489
http://technet.microsoft.com/en-us/sysi ... 96768.aspx

so basically, all you have to do, is install the component once, then you delete the folders com_joomleague in administror/components/ and components/, and replace them with symbolic links to your local git repository.
same with modules, language files, etc...
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Wed Apr 14, 2010 10:21 am

julienV wrote:answering to myself, just googling a bit, i found out that it is indeed possible to use symbolic link in windows, it's just that you need a 3rd party utility to do it:
http://drupal.org/node/31489
http://technet.microsoft.com/en-us/sysi ... 96768.aspx

so basically, all you have to do, is install the component once, then you delete the folders com_joomleague in administror/components/ and components/, and replace them with symbolic links to your local git repository.
same with modules, language files, etc...



thx I'll try this out.....this is exactly what I needed :)
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Wed Apr 14, 2010 10:23 am

:D :'( :oops:

I first need to read and really understand this :(

Or Timoline will test that and show us how it really works on windows ;)  :p
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Wed Apr 14, 2010 10:25 am

You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Wed Apr 14, 2010 10:27 am

timoline wrote:
julienV wrote:answering to myself, just googling a bit, i found out that it is indeed possible to use symbolic link in windows, it's just that you need a 3rd party utility to do it:
http://drupal.org/node/31489
http://technet.microsoft.com/en-us/sysi ... 96768.aspx

so basically, all you have to do, is install the component once, then you delete the folders com_joomleague in administror/components/ and components/, and replace them with symbolic links to your local git repository.
same with modules, language files, etc...



thx I'll try this out.....this is exactly what I needed :)


On vista or windows 7 / 2008 you can use MKLINK /j
http://www.windows7home.net/how-to-crea ... windows-7/
http://technet.microsoft.com/en-us/libr ... 10%29.aspx
http://windowsmvp.spaces.live.com/blog/ ... !432.entry
Last edited by timoline on Wed Apr 14, 2010 10:34 am, edited 1 time in total.
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Wed Apr 14, 2010 10:29 am

Or...

Just pull the the whole structure from git into a local dir and just copy the local joomlainstall into the subdir "com_joomleague". MArk all Joomla files to be ignored...

That could also work... Maybe... I hope...  :p
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Wed Apr 14, 2010 10:39 am

Kurt wrote:Or...

Just pull the the whole structure from git into a local dir and just copy the local joomlainstall into the subdir "com_joomleague". MArk all Joomla files to be ignored...

That could also work... Maybe... I hope...  :p


don't do that.... Really, the symblic links method is much better, and not so difficult !

say you have you git repo here: c:\workspace\joomleague_git
and you webserver joomla install here: c:\xampp\htdocs\joomla

then, to create the links:

Code: Select all

mklink c:\xampp\htdocs\joomla\administrator\components\com_joomleague c:\workspace\joomleague_git\com_joomleague\administrator\components\com_joomleague
mklink c:\xampp\htdocs\joomla\components\com_joomleague c:\workspace\joomleague_git\com_joomleague\components\com_joomleague


it can't try, but it should be something like this... I think this could be something interesting to put on the wiki...
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Wed Apr 14, 2010 10:47 am

C:\Windows\system32\mklink
Creates a symbolic link.

MKLINK [[/D] | [/H] | [/J]] Link Target

/D      Creates a directory symbolic link.  Default is a file
symbolic link.
/H      Creates a hard link instead of a symbolic link.
/J      Creates a Directory Junction.
Link    specifies the new symbolic link name.
Target  specifies the path (relative or absolute) that the new link
refers to.


So I assume you need option /J
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
julienV
Joomleague Core Developer
Joomleague Core Developer
Posts: 2016
Joined: Tue Jun 19, 2007 9:27 am
Location: France
Contact:

Re:Git / Gitorious

Postby julienV » Wed Apr 14, 2010 10:49 am

maybe... please try, and when you get the right formula, put in on the gitorious wiki
You can hire me, I'm a Joomla professional freelance developer.
Please contact me at jlv@jlv-solutions.com
NO PM, please use email !

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Wed Apr 14, 2010 10:54 am

julienV wrote:say you have you git repo here: c:\workspace\joomleague_git
and you webserver joomla install here: c:\xampp\htdocs\joomla

then, to create the links:

Code: Select all

mklink c:\xampp\htdocs\joomla\administrator\components\com_joomleague c:\workspace\joomleague_git\com_joomleague\administrator\components\com_joomleague
mklink c:\xampp\htdocs\joomla\components\com_joomleague c:\workspace\joomleague_git\com_joomleague\components\com_joomleague



Would this also mean that before I call the two mklink commands I should be sure not to have the dir

"c:\xampp\htdocs\joomla\administrator\components\com_joomleague"

and

"c:\xampp\htdocs\joomla\components\com_joomleague"

inside my local Joomla-Installation (or webserver)???
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a

User avatar
timoline
Joomleague Core Developer, Donator
Joomleague Core Developer, Donator
Posts: 3331
Joined: Thu Mar 12, 2009 8:03 am
Contact:

Re:Git / Gitorious

Postby timoline » Wed Apr 14, 2010 11:00 am

Sorry cant test it right now,

But I think you have to delete them (or rename them)
Joomla 1.5.x
Joomleague 1.5.....latest git version

User avatar
svdoldie
.
Posts: 667
Joined: Fri Feb 16, 2007 7:34 pm
Joomleague version: 2.0.x
Contact:

Re:Git / Gitorious

Postby svdoldie » Wed Apr 14, 2010 11:43 am

Kurt wrote:
At least for the prediction game or TippSpiel we really need someone who is used to that and may help us on (re)coding that part of JoomLeague again :)

Every help on this is very useful :)


Ich nutze das Tippspiel, aber ich kann leider nicht programmieren.  :(
Wenn ich anders helfen kann um das Tippspiel in die neue Version zu bekommen, würde ich das gerne tun.

Gruß svdoldie
SV Dörpum http://svdoerpum.de
Joomla 2.5.11
JL-2.x.x Komplettpaket von Diddi Poeler, mit vielen Verbesserungen und Erweiterungen zur Originalversion https://github.com/diddipoeler/joomleag ... plettpaket
Link zu Diddi's Seite: http://fussball in europa.de/index.php (Leerzeichen müssen entfernt werden)

User avatar
Kurt
Donator
Donator
Posts: 932
Joined: Mon Mar 19, 2007 7:40 pm
Location: Germany
Contact:

Re:Git / Gitorious

Postby Kurt » Wed Apr 14, 2010 11:52 am

julienV wrote:say you have you git repo here: c:\workspace\joomleague_git
and you webserver joomla install here: c:\xampp\htdocs\joomla


With the settings above as an example this seems to work for me under vista

Code: Select all

mklink /j "c:\xampp\htdocs\joomla\administrator\components\com_joomleague" "c:\workspace\joomleague_git\com_joomleague\administrator\components\com_joomleague"

mklink /j "c:\xampp\htdocs\joomla\components\com_joomleague" "c:\workspace\joomleague_git\com_joomleague\components\com_joomleague"

mklink /j "c:\xampp\htdocs\joomla\media\com_joomleague" "c:\workspace\com_joomleague\media\com_joomleague"

mklink "c:\xampp\htdocs\joomla\language\en-GB\en-GB.com_joomleague.ini" "c:\workspace\com_joomleague\language\en-GB\en-GB.com_joomleague.ini"

mklink "c:\xampp\htdocs\joomla\administrator\language\en-GB\en-GB.com_joomleague.ini" "c:\workspace\com_joomleague\administrator\language\en-GB\en-GB.com_joomleague.ini"

mklink "c:\xampp\htdocs\joomla\administrator\language\en-GB\en-GB.com_joomleague.ini" "c:\workspace\com_joomleague\administrator\language\en-GB\en-GB.com_joomleague.ini"


I think I didn't forget any other file or dir???
http://fc-bergheim 2000.de
http://2010.fc-bergheim-2000.de
Joomla 1.0.14 & 1.5.15 - JL 0.93b / 1.5.05a


Return to “German”

Who is online

Users browsing this forum: No registered users and 2 guests

cron