Fetching updates on Dreamhack?

[ninetydegrees]

How does one update their repos on their hack now? The 'old' script no longer pulls anything for me (what used to be on http://wiki.dwscoalition.org/wiki/index.php/Dev_Maintenance) and I don't understand how I can keep up with changes. :/

(Context: I'm on Windows; I use PuTTY and WinSCP).

Edit: ok, if anybody else wonders, short answer is you can no longer update your hack using old methods. :/

Edit 2: long answer is you can switch to the new system. See comments for detailed instructions. :)

Comments

[foxfirefey]

ninetyd is a great github username.

Okay, when I go to your page here:

https://github.com/ninetyd

I see that you forked dw-free and dw-nonfree a while ago, but when I try to go to the repository they link to, I get a 404:

https://github.com/ninetyd/dw-free

Is this the case for you while you are logged in? It also says that "ninetyd doesn’t have any public repositories yet".

[ninetydegrees]

Oh no I did fork then but then I deleted them because I thought I wasn't supposed to do that since newer instructions didn't seem to mention it. I'll fork them again.

Edit: forgot to say: I'm going to take notes to make sure I remember every step so my apologies if I'm slow to answer.

[foxfirefey]

Sweet, back on the tracks--and don't worry about being slow. I'm sure you'll understand if I get pulled away and have delayed responses from work, too!

[fu]

Hmm, just realized that the instructions weren't explicit wrt forking, so I've added a sentence

[ninetydegrees]

I actually totally missed that sentence. If I may I think it would be better to tell people to do that first then do all the steps on the server. I didn't expect the back and forth thing. See what I mean?

[fu]

Good point. How do the transition instructions look now?

[ninetydegrees]

Much better imo because you know in advance what you're going to do and why. Can I ask what this means?

Contents of $LJHOME will be live when you start the server
Contents of $LJHOME/ext will be used automatically (no syncing)

It looks like it speaks of the same thing but I don't understand what the difference is, if there is one.

[fu]

Ahhh yes, both $LJHOME and $LJHOME/ext are used as-is, as compared to before when the contens of $LJHOME/cvs/* had to be synced over to $LJHOME first.

So the two are the same thing; the differences only relevant if you're comparing against the old way of doing things. Hmm, I'm not quite sure how to explain.

Maybe take out those two points and instead say:

* all code from dw-free ($LJHOME) and the additional repos under $LJHOME/ext are live. There's no need to run any additional syncing steps

[ninetydegrees]

Oh got it! If you add 'automatically' before live and maybe 'when you start your server' after, this last sentence is perfect. ;)

[foxfirefey]

I have taken Fu's suggestion and your tweaks and put them in place on the wiki page!

[foxfirefey]

I think you are right in that they are both the same thing. They are both talking about how you don't have to run bin/cvsreport.pl. I think they end up as two separate things because before, dw-nonfree and dw-free both had to be synced; now dw-free is the base directory and dw-nonfree is in the ext directory, automatically overrides things in dw-free, and neither need syncing.

I'll try to figure out some alternative wording.

[foxfirefey]

Hey--

I was reading over the instructions and realized that they don't have the authenticated versions of the Github URLs, so I have edited them to be like:

git clone https://USERNAME@github.com/USERNAME/dw-free.git $LJHOME

Same with nonfree.

I remember having troubles when it came to actually trying to push anything to my repository without this. I have changed the documentation to reflect the correct things. I'm pretty sure you have already cloned and everything though, but you can change it by being in $LJHOME or $LJHOME/ext/dw-nonfree and going:

git remote set-url origin NEWURL

(you are free to make me explain that some more)

[ninetydegrees]

I went through all the steps and everything worked fine except I didn't need to create /ext because it already existed and running checkconfig gave me an odd message although it looks like this is normal:

Missing optional secret 'invite_img_auth': Auth code for invite code status images

Re: the URLs thing. I don't understand if I'm supposed to do something or not.

[foxfirefey]

Yeah, I'm not really sure that is an important error from checkconfig.

So, if you end up trying to push from your Dreamhack, and you used this URL to clone:

git clone https://github.com/USERNAME/dw-free.git $LJHOME

Instead of one that has an authentication added to it:

git clone https://USERNAME@github.com/USERNAME/dw-free.git $LJHOME

It won't know what to do to authenticate when you try and push changes back--although cloning will have worked just fine! But, you can change the URLs in dw-free and dw-nonfree without having to reclone things by using the remote set-url command:

cd $LJHOME
git remote set-url origin https://ninetyd@github.com/ninetyd/dw-free.git $LJHOME
cd $LJHOME/ext/dw-nonfree
git remote set-url origin https://ninetyd@github.com/ninetyd/dw-nonfree.git $LJHOME

That way, when you go to push something, it will ask you for a password and you can provide it.

[ninetydegrees]

Thanks for the clear explanation. However, the git remote command gave me an error:

fatal: No such URL found: /dreamhack/home/8174-ninetydegrees/dw

[foxfirefey]

My fault, $LJHOME should not be on the end of those, it is confusing it to bits, these are better:

cd $LJHOME
git remote set-url origin https://ninetyd@github.com/ninetyd/dw-free.git
cd $LJHOME/ext/dw-nonfree
git remote set-url origin https://ninetyd@github.com/ninetyd/dw-nonfree.git

[ninetydegrees]

Ok done.