Problems with #openttdcoop Repository

[Twyster]

I'm trying to set up the repository for OpenGFX Mars Xtended (opengfx-mars-ext) and its sub-project OpenGFX Mars Xtended RVs, but I can't figure some stuff out.

First, I can't log into hg.openttdcoop.org to edit the repository, despite having an account on dev.openttdcoop.org (which was activated manually by planetmaker). Second, the mention of "push" worries me; what does it entail, how complicated is it, what does it do for me, and is it required or optional?

Thanks in advance!

[mart3p]

First, I can't log into hg.openttdcoop.org to edit the repository, despite having an account on dev.openttdcoop.org (which was activated manually by planetmaker).

You need to set up SSH.

Second, the mention of "push" worries me; what does it entail, how complicated is it, what does it do for me, and is it required or optional?

Push is used to add changes to the repo. So yes, you will definitely need to use it.

Edit: changed SSH link to point to latest version.

[Eddi]

when you use hg, "commit" saves your changes to your local repository (which is a hidden directory below your working directory) and "push" moves these changes to the public repository. you can scrap and rewrite changes in your local repository before you pushed (like "rebase" and stuff), but never after.

("rebase" is a method to avoid merge commits after you pulled changes made by other people. afair it is an extension that has to be activated)

[Alberth]

The devzone provides a mercurial repository for you. You don't log into the devzone, the account is just for giving mercurial access to the repo (so only you can make changes).

You should clone the repo at the devzone (ie make a copy to your local computer) using hg (the common name for the mercurial program).

Locally, you can add changes to your copy (your clone). When your done, you tell hg to push your changes back to the devzone. The program contacts the devzone, compares what you have added, and copies that to the devzone.

When someone else does such a push to the devzone (if you have other people working in the project), you can download their changes with a "pull".


All of this is very basic version control. If you're not familiar with it, you may want to read and experiment a bit at your local system first. http://mercurial.selenic.com/wiki/ is the official website for mercurial. I see they also have documentation for new users.
Also, you may want to visit the #openttdcoop.devzone IRC channel at oftc.net (or the #openttd channel), where you can get interactive help.

[Transportman]

Take a look at the guides, that should help clear things up.

Once you have done it once, it is easy for the next times, but that very first time is the most difficult.

[Twyster]

Okay, I'm on step 5 of http://dev.openttdcoop.org/projects/home/wiki/SSH but I can't create the .ssh folder which doesn't exist. Now what?

[Eddi]

what do you mean with "can't create one"?

[mart3p]

Okay, I'm on step 5 of http://dev.openttdcoop.org/projects/home/wiki/SSH...

Step 5 is "Provide us with the public key". Just upload your public key to the existing issue (#6818).

[Transportman]

Okay, I'm on step 5 of http://dev.openttdcoop.org/projects/home/wiki/SSH but I can't create the .ssh folder which doesn't exist. Now what?

You can either make the folder yourself or just save the file somewhere else. It doesn't really matter, as you keep that file to yourself. Do not forget to also create the public key-file, as you need to provide that to the Devzone to get access. See here for instructions on how to save the public file as it is not simply pushing "Save public key".

Strange that the saving of the public key is not mentioned in the guide.

[mart3p]

Ah, I see now, it's not step 5 you're stuck on, it's step 2 part 5.

There seems to be an error in the instructions here. Windows doesn't allow you to create folders with a '.' prefix. Just name the new folder 'C:\Users\yourname\ssh' and it will be fine.

[planetmaker]

Ah, I see now, it's not step 5 you're stuck on, it's step 2 part 5.

There seems to be an error in the instructions here. Windows doesn't allow you to create folders with a '.' prefix. Just name the new folder 'C:\Users\yourname\ssh' and it will be fine.

Ah, thanks. Nasty one. Fixed. Also... you now have edit rights to that wiki

[Twyster]

Thank you all for the continued help. Got a problem with Step 6, Part 2 now (this time I checked to make sure it was actually Step 6 and not Step X, Part 6)...

"Right click your myquotefork repository and choose Settings."

I have no idea what "repository" it's talking about. The one on hg.openttdcop.org? Or do I have to create one?

EDIT: I've created a repository and got up to Step 7, but I figured I'd better make sure before I progress. Do I put the files into subfolders of the repository, or the repository folder itself?

[mart3p]

Do I put the files into subfolders of the repository, or the repository folder itself?

Have a look at some other DevZone projects to see how the files and folders are arranged. For example: OpenGFX Mars Colonies.

[Twyster]

Okay, I'm on the last step, but this comes up when I try to push to fork:

[planetmaker]

Okay, I'm on the last step, but this comes up when I try to push to fork:

Yes, of course not - I'd be scared if it worked without the key being installed...
You can try now as I installed it now.

http://dev.openttdcoop.org/issues/6818 is the support ticket and I tend to reply when I handle a ticket or at least change the issue state accordingly.

[Transportman]

It only works if your key is also on the accepted list, which planetmaker did for you.

Also make sure that pageant is running and that your private key is in the list when you push. You have to do that every time you reboot your computer, as pageant does not start on boot and it does not keep your key in memory as far as I know. First few times I had to push through SSH I also got that error message, simply because pageant and my private key were not loaded, so that is also something to keep in mind.

[Twyster]

I f----- up. Shortly after I created the repository to try the step where I got the fatal error, I checked "ogfx-mars-ext-rv.grf" which was in the folder with everything else, and it onlytold me that the .grf file could not be included in the repository after I tried to push just now. I couldn't find a way to remove it in the GUI so I deleted the repository to try and "re-make" the repository. Now I'm getting this error when I try to do Step 6:

[Alberth]

It looks like there is a space before the [, which should not be there?

[Twyster]

Ah, fixed. Thank you.

And it is done!

http://dev.openttdcoop.org/projects/ogf ... repository