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]

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 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?

[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.

[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

[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.

[ninetydegrees]

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

[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.

[foxfirefey]

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

[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.

NEW THREAD

[foxfirefey]

Okay, as far as I know now you have a shiny new git-based install that is up to date. And everything is loading and everything.

I am assuming we want to work through what happens when making changes now?

Re: NEW THREAD

[ninetydegrees]

This is where http://wiki.dwscoalition.org/wiki/index.php/Dev_Maintenance comes in?

The git stash thing seems simple enough although I'll have questions about that later so first thing I want to know is how grab updates because that's always the first thing I do so updating dwu I guess? If so can you link the two scripts with && \?

Re: NEW THREAD

[foxfirefey]

Hmm, I would not trust the dwu script that is up there yet, it hasn't taken into account some things I have found. (needing to be on an originating branch, etc). I've never used those scripts myself. So I think doing it by hand and seeing how it happens is ideal for now.

I went through the Dev Maintenance first section and changed things based on my experiences. Basically, since you should be doing your changes on their own branches, you'll need to checkout the main develop branch, and then pull from the Dreamwidth repository, then push it back to your Dreamwidth fork. If you could look at the changes I made and see if they make sense, I would much appreciate it.

Re: NEW THREAD

[ninetydegrees]

<3 Thank you so much! I'll have a look at it tomorrow because it's evening here and I'm too tired to give it the attention it requires.

Re: NEW THREAD

[foxfirefey]

Thank YOU so much. I'll be around at the same times tomorrow for you, okay?

Re: NEW THREAD

[ninetydegrees]

Works for me! See you tomorrow. :)

Re: NEW THREAD

[ninetydegrees]

So I read the section and I have questions:

Is there any difference between git pull dreamwidth and git pull because dwfree says DW but nonfree doesn't?

When I do git push... it asks me for my GH password? Is this normal? Is this going to do that every time?

[foxfirefey]

Okay, I've just finished up some additional revamps of Dev Maintenance. I feel a lot more comfortable with these instructions.

I have also made slight changes to the moving instructions that I hope will improve them for folks new to them.

Re: NEW THREAD

[foxfirefey]

Oh man, we must have passed each other--

I've made some revisions to Dev Maintenance. They basically make this a lot less...dependent on circumstances, in my opinion? Both git pull dreamwidth and git pull had troubles coping with when I was in a different branch and it ended up making things more complicated to make instructions for.

It's normal that it's asking for your password. I'm trying to figure out how to get it to remember the password, since it's kind of annoying.

[ninetydegrees]

The bits I've done seem a lot clearer to me except that I don't understand why dw-nonfree is set apart. Can't tell about the rest yet.
Question: do new users have to move the old hack as well or is it just for people who already had one? And what about the other instructions while I'm at it?

Re: NEW THREAD

[ninetydegrees]

Yeah, we did but I like having it explained anyway.

Other question: when I update my DB it asks me if I want to delete all the S2 layers. Normal too?

Re: NEW THREAD

[foxfirefey]

I think it might be normal if you had styles patches you were working on in the old thing, which I suspect is the case, and now with this new thing those files don't exist anymore, which prompts the update process to be all oh maybe I should delete these and really, never answer yes because I have found out it's far easier to have styles cruft around than to fix it if you had a user using one of those styles that ended up deleted, ha.