Today on Apolyton POLYCAST #57 CIVCON '09 ANNOUNCED: AUGUST 7-9, 2009 TRI-LEAGUE #25 & #26 MODCAST #22 BTS TEAM D.G.: ENGAGE NOW
Apolyton Civilization Site Forums
main | civ4 | col | civrev | galciv2 | alt | civ3 | civ2 | ctp2 | smac | about | polycast
- Order Civilization IV: Colonization (Amazon US)/(UK) -
- Order Civilization: Revolution [360] (Amazon US)/(UK) | [PS3] (US)/(UK) | [DS] (US)/(UK) -
ApolytonPLUS | register | new posts | pm (-/-) | members
faq | news | civgroups (news) | hall of fame | downloads | upload | plus | store | search
Apolyton Civilization Site Forums : Powered by vBulletin version 2.0.3 Apolyton Civilization Site Forums > Call To Power > CtP2 Source Code Project > GENERAL: New SubVersion server
Page: Print | Email | Subscribe | Report News       0 votes -  average
20.Nov: SPORE: PATCH 3 & CREEPY AND CUTE!
16.Nov: POLYCAST EPISODE 57: `GEEKING OUT`
11.Nov: MODCAST #22: `ADULT DIAPERS`
CivGroups
CTP2 Source Code Project (77): Not a Member - Join

bottom of page
  GALACTIC CIVILIZATIONS $19.99 - CIV3 CONQUESTS $29.99 - CIV3 from $9.99 - SMAC+SMAX $19.99
Author
Thread   
Pages (2): [ 1   2   ]
< Last Thread     Next Thread > Post New Thread     Post A Reply
DarkDust
Settler
Feb 2006
time: 09:25
27-02-2006 20:36
edit | quote
#1 | report |
New SubVersion server Tired of ads?


Hi folks,
I've now set up a new SubVersion server. You can find it and some instructions at http://ctp2.darkdust.net. The SubVersion URL is https://ctp2.darkdust.net/svn.

After reading through the EULA and the FAQ here in the forum I think I can't provide anonymous access as that seems to be against the EULA since I can't guarantee that someone who checks out anonymously has read and agreed to the EULA. So you need to send me an e-mail stating that you have read and agreed to the EULA and what username and password you'd like to use.

If you've checked out from kaan's SubVersion repository you don't need to re-checkout the source. You can use "svn switch" like this:

code:
cd workingcopy svn switch --relocate oldurl https://user@ctp2.darkdust.net/svn


If you can't remember the old URL, just have a look at the .svn/entries file.

Because I don't have Windows I can't tell you how to do this relocating with TortoiseSVN.

I've also create a mailing list ctp2-commit@darkdust.net. Every commit will generate a mail on that list, so if you subscribe to that list (infos and link to archive on http://ctp2.darkdust.net) you won't miss a commit :-) And if I manage to get that archive searchable we can then easily search in the commit logs. You can already see the commit logs from the past revisions in the archive.

There's also a second mailing list, ctp2-dev@darkdust.net. I personally like mailing lists more than forums when it comes to discussing coding issues, but that's just my personal taste. Please tell me if you think a mailing list is a good idea or whether you'd like to stick to the forum.

This is the first time I've actually set up SubVersion with https, I normally use SSH but this is out of question here, IMHO. And this is the first time I've installed/set up Mailman/Hypermail, so if you notice any problems (especially potential security problems) please tell me. Thanks.

Martin Gühmann
Call to Power II Democracy GameCall to Power Democracy GameCTP2 Source Code Project
Moderator
Berlin, Germany
Mar 2001
time: 10:25
27-02-2006 20:49 | www
edit | quote
#2 | report |
Re: New SubVersion server Increase Your PM Length


quote:
Originally posted by DarkDust
After reading through the EULA and the FAQ here in the forum I think I can't provide anonymous access as that seems to be against the EULA since I can't guarantee that someone who checks out anonymously has read and agreed to the EULA. So you need to send me an e-mail stating that you have read and agreed to the EULA and what username and password you'd like to use.


Why do you think that the EULA forbids you to provide an anonymous access? Just put the EULA above the instructions and state that everyone aggrees to the EULA by using the anonymous access. If someone didn't read the EULA then it is his problem that he accepted something that he even doesn't know.

The problem without having anonymous access is that it is a very high hurdle to ask you, that we lose all the people who just want to have a look on it and that prevents them from doing anything with the code.

-Martin

DarkDust
Settler
Feb 2006
time: 09:25
27-02-2006 21:06
edit | quote
#3 | report |
Re: Re: New SubVersion server Support Apolyton, buy Civilization III: Complete


quote:
Originally posted by Martin Gühmann


Why do you think that the EULA forbids you to provide an anonymous access? Just put the EULA above the instructions and state that everyone aggrees to the EULA by using the anonymous access. If someone didn't read the EULA then it is his problem that he accepted something that he even doesn't know.

The problem without having anonymous access is that it is a very high hurdle to ask you, that we lose all the people who just want to have a look on it and that prevents them from doing anything with the code.

-Martin


I agree with you that easy access is very desirable :-) The problematic part in the EULA for me is:

quote:

You agree that, as a condition to your using the Call to Power II Source Code you will not use or allow third parties to use the Call to Power II Source Code and/or the New Game Materials created by you for any commercial purposes, including but not limited to selling, renting, leasing, licensing, distributing, or otherwise transferring the ownership of such New Game Materials, whether on a stand alone basis or packaged in combination with the New Game Materials created by others, through any and all distribution channels, including, without limitation, retail sales and on-line electronic distribution.


and from the FAQ in this forum:

quote:

After communicating about this with them, Activision said their interpretation is that it's okay to distribute the source, as long as you make sure that anyone who has access to it must agree to the EULA first.


and

quote:

Activision's interpretation is that the use of CVS servers and similar tools is allowed, as long as anyone who has access to the code has agreed to the EULA.


So in my eyes this seems to rule out anonymous access. The problem is not that someone who checks out the source anonymously without reading the EULA breaks it but that *I* seem to break it in that case.

But I may see it too strict here... I could do this:

- create a page with the license with an "I agree" button that redirects to the anonymous source browser
- create a page with the license with an "I agree" button that tells the user how to check out the source with SubVersion
- link both of these pages on the ctp2.darkdust.net site

Do think this is enough ?

Martin Gühmann
Call to Power II Democracy GameCall to Power Democracy GameCTP2 Source Code Project
Moderator
Berlin, Germany
Mar 2001
time: 10:25
27-02-2006 21:16 | www
edit | quote
#4 | report |
Re: Re: Re: New SubVersion server Put an end to popups!


quote:
Originally posted by DarkDust
But I may see it too strict here... I could do this:

- create a page with the license with an "I agree" button that redirects to the anonymous source browser
- create a page with the license with an "I agree" button that tells the user how to check out the source with SubVersion
- link both of these pages on the ctp2.darkdust.net site

Do think this is enough ?


I think that this is enough, at least this is how it was handled by Apolyton. In fact you can now download everything related to the source code without reading and agreeing to the EULA. But they did it so that you had to agree to the EULA even if you wanted to download an attached file in this forum.

So the only problem I see is that you need to make sure that there is no chance that there is a direct link that might bypass your construct but well even if I don't know how but there is a way to achieve this.

-Martin

DarkDust
Settler
Feb 2006
time: 09:25
27-02-2006 22:23
edit | quote
#5 | report |
Re: Re: Re: Re: New SubVersion server Support Apolyton or Terrorists Win


quote:
Originally posted by Martin Gühmann
I think that this is enough, at least this is how it was handled by Apolyton. In fact you can now download everything related to the source code without reading and agreeing to the EULA. But they did it so that you had to agree to the EULA even if you wanted to download an attached file in this forum.

So the only problem I see is that you need to make sure that there is no chance that there is a direct link that might bypass your construct but well even if I don't know how but there is a way to achieve this.

-Martin


I think I can achieve this with an htaccess file that only allows links to the source browser if the referer is ctp2.darkdust.net. Thanks for the hint :-)

DarkDust
Settler
Feb 2006
time: 09:25
27-02-2006 23:45
edit | quote
#6 | report |
Support Apolyton buy from Amazon


Okay, I've added anonymous source access. See the instructions on my CTP2 site. Basically, my server just lets you browse the source or see the instructions on how to check out the source anonymously if you're coming through my site. This should be close enough to the EULA because all links on my site to the source is requesting you to agree to the EULA :-)

Normally you won't notice any restrictions except that if you try to access the anonymous repository with a browser by directly entering its URL or following a link from an external site you'll get redirected to the page with the "I agree" links.

E
Call to Power II Democracy GameCTP2 Source Code Project
Emperor
Proud member of the CTP2AE coding team :)
May 1999
time: 01:25
28-02-2006 20:52 | www
edit | quote
#7 | report |
Support Apolyton, buy GURPS/ Alpha Centauri


DarkDust,

my request is in (as ekmek). I checkout the site. pretty sweet. its nice to access it from anywhere now! Hopefully it will bring more coders...

Martin Gühmann
Call to Power II Democracy GameCall to Power Democracy GameCTP2 Source Code Project
Moderator
Berlin, Germany
Mar 2001
time: 10:25
04-03-2006 00:10 | www
edit | quote
#8 | report |
Re: New SubVersion server Support Apolyton buy from Amazon


quote:
Originally posted by DarkDust
Because I don't have Windows I can't tell you how to do this relocating with TortoiseSVN.


That's simple just use the relocate... menu option from the TortoiseSVN context menu. The URL is given and you just have to enter the URL.

quote:
Originally posted by DarkDust
There's also a second mailing list, [ctp2-dev [the odd a] darkdust.net]. I personally like mailing lists more than forums when it comes to discussing coding issues, but that's just my personal taste. Please tell me if you think a mailing list is a good idea or whether you'd like to stick to the forum.


I prefer forum threads, with some 30 posts on the same page, so that I can read it whenever I want and so that I can reread the posts with one glance.

And that is my problem with your revision comment log, it shows just revision number, author, but not its content, at least the first line would be helpful if it should be more useful than that I get with TortoiseSVN. At least I would like to have an option that allows me to have it like a thread with let's say the last 30 revisions on a glance.

-Martin

DarkDust
Settler
Feb 2006
time: 09:25
04-03-2006 12:06
edit | quote
#9 | report |
Re: Re: New SubVersion server Full PM-box? Change here!


quote:
Originally posted by Martin Gühmann
That's simple just use the relocate... menu option from the TortoiseSVN context menu. The URL is given and you just have to enter the URL.


Could you describe that a bit more ? I've never seen TortoiseSVN, I only know it's an extension for Explorer. So I assume you to navigate to the directory, then right-click on the directory name and a context menu appears ? Is the "Relocate..." option in the top level of the menu or is there a sub-entry "SubVersion" or something like that ? Does the "Relocate..." dialog have any options ?

quote:

I prefer forum threads, with some 30 posts on the same page, so that I can read it whenever I want and so that I can reread the posts with one glance.


No problem, after all it was just a suggestion.

quote:

And that is my problem with your revision comment log, it shows just revision number, author, but not its content, at least the first line would be helpful if it should be more useful than that I get with TortoiseSVN. At least I would like to have an option that allows me to have it like a thread with let's say the last 30 revisions on a glance.

-Martin


What do you mean with "content" ? Do you like to see the diff's ? Could describe a bit more in detail what you'd like to have so I can see whether I can implement it ?

Martin Gühmann
Call to Power II Democracy GameCall to Power Democracy GameCTP2 Source Code Project
Moderator
Berlin, Germany
Mar 2001
time: 10:25
04-03-2006 22:27 | www
edit | quote
#10 | report |
Re: Re: Re: New SubVersion server Increase Your PM Length


quote:
Originally posted by DarkDust
Could you describe that a bit more ? I've never seen TortoiseSVN, I only know it's an extension for Explorer. So I assume you to navigate to the directory, then right-click on the directory name and a context menu appears ? Is the "Relocate..." option in the top level of the menu or is there a sub-entry "SubVersion" or something like that ? Does the "Relocate..." dialog have any options ?


It's simple right click on the folder in Windows-Explorer that is under version control, the context menu pops up. There is an menu option TortoiseSVN that opens a submenu. This submenu contains the Relocate... option. This opens a little dialog window that displays the old URL, an option to enter the new URL, a browse button, for browsing in the directory structure at the new URL and three more buttons: An OK button, a Cancel button and a Help button. No other options are there. So you only have to enter the new URL and press OK.

quote:
Originally posted by DarkDust
What do you mean with "content" ? Do you like to see the diff's ? Could describe a bit more in detail what you'd like to have so I can see whether I can implement it ?


Actually I was about something like a thread: As you can see it there.

Basicly we just copied and pasted the revision reports we submitted to the resporitory so that everyone can read them. so basicly I just want something like this: A thread of revision reports. Your current system just lists the revisions, but I have no idea about their content, until I click on them so that I am directed to their revision reports.

Basically something a threadlike would be very good. On the left and you have revision number, author, date and maybe branch, and on the right side you have the report and maybe also the altered files.

Another thing to ask is whether you can host a bug tracking system, currently we only have the playtest thread where bugs are reported. The problem with this is that the bugs reports are buried deep within the thread. So sooner or later they get out of focus espeacilly if you have to take a break because of real live issures.

-Martin

DarkDust
Settler
Feb 2006
time: 09:25
05-03-2006 08:39
edit | quote
#11 | report |
Re: Re: Re: Re: New SubVersion server Increase the size of your Attachments


quote:
Originally posted by Martin Gühmann


It's simple right click on the folder in Windows-Explorer that is under version control, the context menu pops up. There is an menu option TortoiseSVN that opens a submenu. This submenu contains the Relocate... option. This opens a little dialog window that displays the old URL, an option to enter the new URL, a browse button, for browsing in the directory structure at the new URL and three more buttons: An OK button, a Cancel button and a Help button. No other options are there. So you only have to enter the new URL and press OK.


Okay, thanks. I'll add this description to my page.

quote:

Actually I was about something like a thread: As you can see it there.

Basicly we just copied and pasted the revision reports we submitted to the resporitory so that everyone can read them. so basicly I just want something like this: A thread of revision reports. Your current system just lists the revisions, but I have no idea about their content, until I click on them so that I am directed to their revision reports.

Basically something a threadlike would be very good. On the left and you have revision number, author, date and maybe branch, and on the right side you have the report and maybe also the altered files.


Hmmm, I see the benefit, but unfortunately that means I have to code it as I'm not aware of anything that does something like automagically.

I'm currently hunting the "cursor looks weird on Linux" bug. After I've got this one I'll implement your request (so don't expect it in the next days, it will take me some more time to find and fix it )

quote:

Another thing to ask is whether you can host a bug tracking system, currently we only have the playtest thread where bugs are reported. The problem with this is that the bugs reports are buried deep within the thread. So sooner or later they get out of focus espeacilly if you have to take a break because of real live issures.

-Martin


No problem, I'd suggest Trac:


  • it's not as bloated as Bugzilla but has everything you normally need (we use it in the company I work for)
  • it has SubVersion support: you can reference files/revisions/files at certain revisions in the repository, has a source browser and changeset viewer (shows side-by-side diffs)
  • roadmap support (you assign a number of issues to a milestone, as soon as all issues are you closed the milestone is reached; you can easily see the issues to a milestone)
  • has a small Wiki system
  • we can assign permissions very flexible: you can assign permissions to users and groups of users, e.g. you assign a set of permissions to anonymous user, to logged in users and give individual users extra permissions/revoke some

E
Call to Power II Democracy GameCTP2 Source Code Project
Emperor
Proud member of the CTP2AE coding team :)
May 1999
time: 01:25
05-03-2006 19:16 | www
edit | quote
#12 | report |
Support Apolyton, buy Galactic Civilizations


By the wat, thanks Darkdust. I've done two commits with tortoiseSVN and everything went great. thanks for help with this!

DarkDust
Settler
Feb 2006
time: 09:25
05-03-2006 20:24
edit | quote
#13 | report |
Re: Re: Re: Re: New SubVersion server Support Apolyton, buy Alpha Centauri


Okay folks, after a long fight I finally managed to install Trac... I have no idea why it was so hard this time, at work it was set within half an hour.

Anyways, please have a look at http://ctp2.darkdust.net/trac/

If you have a SubVersion account you can log in to Trac with it.

Anonymous (not logged in) users may only view stuff and create tickets but not modify anything else. Logged in users have full access (I granted every logged in user "Trac administrator" privileges as I don't see a reason to limit you). Oh, and anonymous user may currently not use the Trac SubVersion interface, because of the EULA issue. As soon as I know how to fix this I'll let anonymous user use it as well.

Martin, please have a look at the SubVersion log viewer, it might exactly be what you like:

Login -> Browse Source -> Revision Log (small link in the upper right), then enter a number in the "and back to" field, check "Show full log message" and click "Update"

Oh, and click on one of those "Changeset" links for colored diffs :-)

Martin Gühmann
Call to Power II Democracy GameCall to Power Democracy GameCTP2 Source Code Project
Moderator
Berlin, Germany
Mar 2001
time: 10:25
06-03-2006 23:08 | www
edit | quote
#14 | report |
Re: Re: Re: Re: Re: New SubVersion server Support Apolyton buy from Amazon


quote:
Originally posted by DarkDust
Martin, please have a look at the SubVersion log viewer, it might exactly be what you like:


Well, that's very close, however I would prefer that such info like author etc are ordered in a list instead of columns and the revision report should have automatic line wrapping and I think empty lines are removed from the reprts.

However since this is so close and we have more important things to do this issure has a very low priority.

In the meantime I tested this ticket system. I added the six remaining issures that we still want to reimplement from Activision's patch. I used this list. And I converted the priority like this: low = trival, medium = minor, high = major. I didn't use critical and blocker, because I felt those issures weren't blocking us to realse anything and critical aren't they either, because we lived so long without fixing them.

-Martin

Martin Gühmann
Call to Power II Democracy GameCall to Power Democracy GameCTP2 Source Code Project
Moderator
Berlin, Germany
Mar 2001
time: 10:25
08-03-2006 00:38 | www
edit | quote
#15 | report |
Full PM-box? Change here!


OK, I added one more ticket and I see that the component field, could be filled with something that makes more sense than just component1 or component2. Unfortunately I haven't figured out how I can modify this, if I can modify this at all.

However components we have so far in are:

Slic
GUI
Network

Other components are:

AI
Database


-Martin

E
Call to Power II Democracy GameCTP2 Source Code Project
Emperor
Proud member of the CTP2AE coding team :)
May 1999
time: 01:25
10-03-2006 20:39 | www
edit | quote
#16 | report |
Avatar Enlargement: We've got the solution


DarkDust,
do we have an idea how many people registered with the new server? just a curiosity

E
Call to Power II Democracy GameCTP2 Source Code Project
Emperor
Proud member of the CTP2AE coding team :)
May 1999
time: 01:25
20-03-2006 03:06 | www
edit | quote
#17 | report |
Enter the AD-FREE zone


I'm getting a commit failed:
cant open file '/srv/svn/ctp2/db/transactions/553-6.txn/node.0.0': Permission denied

no popup to login

Martin Gühmann
Call to Power II Democracy GameCall to Power Democracy GameCTP2 Source Code Project
Moderator
Berlin, Germany
Mar 2001
time: 10:25
21-03-2006 20:53 | www
edit | quote
#18 | report |
Support Apolyton, buy Civilization III: Complete


Well at least I was able to update my working copy. But actually this doesn't mean anything.

-Martin

E
Call to Power II Democracy GameCTP2 Source Code Project
Emperor
Proud member of the CTP2AE coding team :)
May 1999
time: 01:25
22-03-2006 17:36 | www
edit | quote
#19 | report |
Get a bigger avatar today!


commit worked last night, so its up again

E
Call to Power II Democracy GameCTP2 Source Code Project
Emperor
Proud member of the CTP2AE coding team :)
May 1999
time: 01:25
03-05-2006 22:14 | www
edit | quote
#20 | report |
Lose 30 kilos (of popups)


darkDust,

the commit page doesn't show my 570 revision did the webpage go down?

E
Call to Power II Democracy GameCTP2 Source Code Project
Emperor
Proud member of the CTP2AE coding team :)
May 1999
time: 01:25
16-05-2006 03:57 | www
edit | quote
#21 | report |
Support Apolyton buy from Amazon


Hi DarkDust,

I just tried to commit rev574 but the server is down.

thanks,

Martin Gühmann
Call to Power II Democracy GameCall to Power Democracy GameCTP2 Source Code Project
Moderator
Berlin, Germany
Mar 2001
time: 10:25
11-06-2006 14:25 | www
edit | quote
#22 | report |
Suffering from ads?


quote:
Originally posted by Martin Gühmann
OK, I added one more ticket and I see that the component field, could be filled with something that makes more sense than just component1 or component2. Unfortunately I haven't figured out how I can modify this, if I can modify this at all.

However components we have so far in are:

Slic
GUI
Network

Other components are:

AI
Database


Seeing you posting here again DarkDust, maybe this thread needs a little bumb so that you can easily see my questions.

-Martin

DarkDust
Settler
Feb 2006
time: 09:25
11-06-2006 14:39
edit | quote
#23 | report |
Avatar Enlargement: We've got the solution


quote:
Originally posted by Martin Gühmann


Seeing you posting here again DarkDust, maybe this thread needs a little bumb so that you can easily see my questions.

-Martin


If you've got problems with the server please contact me directly: marc@darkdust.net

I think everything should work quite okay currently, what questions do you still have ? :-)

Martin Gühmann
Call to Power II Democracy GameCall to Power Democracy GameCTP2 Source Code Project
Moderator
Berlin, Germany
Mar 2001
time: 10:25
11-06-2006 15:11 | www
edit | quote
#24 | report |
Support Apolyton, buy Civilization 2


quote:
Originally posted by DarkDust
I think everything should work quite okay currently, what questions do you still have ? :-)


For some reason I quoted my own post. However the form to add a ticket just allows me to select for component Component1 and Component2, in the post of me I quoted I suggested some component names that do more sense.

Of course I would add these components myself if I knew how to do it.

And by the way I am sure that also other people are interesting in knowing how to do it. Therefore this thread is the right place to ask and answer this question.

-Martin

DarkDust
Settler
Feb 2006
time: 09:25
12-06-2006 06:29
edit | quote
#25 | report |
Tired of ads?


quote:
Originally posted by Martin Gühmann


For some reason I quoted my own post. However the form to add a ticket just allows me to select for component Component1 and Component2, in the post of me I quoted I suggested some component names that do more sense.

Of course I would add these components myself if I knew how to do it.

And by the way I am sure that also other people are interesting in knowing how to do it. Therefore this thread is the right place to ask and answer thi