dw_dev_training | Fetching updates on Dreamhack?

I would expect the new instructions on http://wiki.dwscoalition.org/wiki/index.php/Dev_Maintenance to work, but I haven't upgraded my 'hack yet. It may succeed silently?

They didn't work for me: it gave me an error and the files which should have been updated haven't. Maybe I've done something wrong.

Edit: Aren't these are what I'm supposed to do in Git Shell and not the old system? This is very confusing.

Edited 2012-08-23 14:42 (UTC)

You said you were using PuTTY to get a command line on your Dreamhack, correct? The commands should be used there. Is that what you were confused about?

As I said the commands don't work for me. No, the confusing part is that I'm still using the old system and I no longer understand how I'm supposed to make it work and I would switch to the new system if I understood how it worked (and if I hadn't been told to keep on doing this the old way). I thought I was supposed to keep doing things as usual until I was told to switch but, apparently, no. I'm lost.

Okay, I think I understand now. If you haven't switched to the new system, you won't be able to pull in the new changes because they're not being posted in the old repository any more. Mark and Fu stopped mirroring the changes in both places after the last code push.

When you were told you could keep working "the old way," that referred specifically to the patch submission process, not the update process. You are still able to submit patches through Bugzilla instead of having to create a Github pull request. But if you want to work against the very latest code, you will need to download it from the git repository.

I'm sorry if this is upsetting for you! I know it's a lot to take in and there hasn't been a lot of communication because the kinks in the process are still being worked out.

Mark and Fu stopped mirroring the changes in both places after the last code push.

Huh, I totally missed that. I guess I have a lot of work to do before I can actually go back to coding again, then.

Was there an announcement I missed? I'm not seeing anything on

dw_dev

Edited 2012-08-23 16:24 (UTC)

I don't think it was announced. I had to ask them what was up.

Well, I feel less stupid all of a sudden. Thanks again.

Ok I wish I had been explained all this before so thank you very much for telling me. I would love to switch to the new system but none of the instructions seems geared towards my system specifically (except for the Github site itself which is very windows-friendly) so I guess I'll just have to wait and see before I'm able to do any of the patches I want to make. :/

I think if you can use Github's instructions for creating a new development environment on your local machine, and use our wiki instructions for updating your Dreamhack, you should be able to get up and running, but if for any reason you run into anything that isn't clear or gives you trouble, let us know so that we can help you and also hopefully improve our own documentation!

I think if you can use Github's instructions for creating a new development environment on your local machine

This is the easy part.

and use our wiki instructions for updating your Dreamhack, you should be able to get up and running

This is the part that makes no sense to me because 1) instructions are all over the place 2) it's not 100% clear to me what are the parts for hacks and what aren't 3) don't tell me where or how to do this. I feel like I'm back when I got into dev work since there were zero instructions for newbies on windows.

Edited 2012-08-23 16:37 (UTC)

The most recent post in

dw_wiki is where Fey and Fu have been coordinating efforts to update the documentation - maybe that would be a good place to brainstorm how best to address your concerns.

(I hope that doesn't come across as dismissive! I am just crap at documentation and I am happy other people are working on it who are not me.)

I saw that earlier today and I know they plan to update my newbie guide but, well, this doesn't really help. I just wish we had been told some stuff like what you said above instead of leaving us in the dark about them. Not you fault so it's unfair to unload this on you (and you don't come across as dismissive at all). Also I'm very cranky today for other reasons and would have liked to cheer me up with some DW so not being able to makes me extra cranky. My apologies.

Hey 90d--you're totally right about this and I'm sorry. I'm going to make a post to

dw_dev about this so nobody else ends up in the dark. If you want somebody to help walk you through anything in real time, I am happy to do so--I'm working on getting myself up to the level I need to be to write good documentation on this.

Pretty much all of the directions here are for Dreamhack moving over while logged in through PuTTy, but I think what is lacking is what happens AFTER that for trying to develop anything. I will make that my top documentation priority now.

I can't do real time because I'm a bad typist in these circumstances and IM is extremely stressful for me (and believe me I know how stupid that sounds) but if email's or commenting's ok for you I would like that, please. I know this isn't ideal for you guys so I would understand if you said no.

Also thank you very much. I'm sorry I commented on the dw_wiki entry before I saw your comment.

No, no, that is fine! Commenting is fine! We don't want to stress you out. And I think we commented around the same time in our respective places. We love you, we love the work that you do, we've fallen down on how to best manage this transition, and we want to make it right in however you think is best!

Probably the first thing is to transfer over your development environment to Git. Fortunately, it is very forgiving--since you just move the old one out of the way, if it ends up messed up, or you want to go back to the old one for whatever reason, you could just move it back and everything would be okay.

We can work on improving this document as we go along:

http://wiki.dwscoalition.org/wiki/index.php/Moving_your_Dreamwidth_installation_to_use_Github

The first time you run into a question, just comment, and I or

afuna will answer. I'll be tracking all comments to this entry, so you don't even have to make them all into a big thread, just any comment here, I will see it.

Thank you.

So the the first git clone command gives me an error:

fatal: https://github.com/ninetyd/dw-free.git/info/refs not found: did you run git update-server-info on the server?

Also I used my username on github (ninetyd) as my username. Should I have used something else?

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

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.

Edited 2012-08-23 17:33 (UTC)

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!

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

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?

Good point. How do the transition instructions look now?

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.

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

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

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

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.

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)

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.

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.

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

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

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

Ok done.

Fey has already said everything that I want to say -- just seconding that comments are excellent (both for you, and for making it easy for others to see what's going on).

I'll be lurking around in case you run into any issues; I may have to head to bed soon, but fey is around, and I will be checking in first thing in my morning!

Thank you. I don't know if I should say this but... I've always felt it wasn't really ok actually. Not from you, just in general. It's obvious it's not a favoured way of communication in lots of areas so, er, well.

I'm sorry you've gotten that impression. Thinking back on it, I don't think we've made it obvious that discussion in comments is something we encourage, so we'll have to figure out how to push for it more.

It's not your fault. I think it also comes from the fact that some (many?) of you guys knew each other before either via LJ or pre-beta days and there are... traditions I guess. And personal preferences too, of course. So it's like an automatism if that makes sense.

Edit: reread your comment as the page reloaded it and I wanted to clarify something. It's no so much 'encourage' as 'welcome': discussion wherever it takes place is welcome and will get a response, even if it can take some time depending on the mode of communication. Also related, it feels like some info bypasses (edit: not the right word but at least correct grammar) official DW comms entirely, which I've always found odd, and thus preventing comments from happening there because there isn't simply anything to comment on.

Edited 2012-08-23 18:23 (UTC)

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?

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

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.

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

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

Works for me! See you tomorrow. :)

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?

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.

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?

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.

I was only working on one style and this is asking me about many, many layers which are for different styles and look like they exist. I'm tempted to say yes actually because it's going to ask me every time. (and yeah I know it sucks when a layer is delete because you have to go create a new style but...).

That's kind of strange then. I haven't had that happen and I'm a bit confused as to why it is popping up for you. And the files exist for those styles?

oh. took a closer look and it looks like these are all nonfree themes so might it be because they changed location with the new folder structure and it can't find them anymore?

I see it's been fixed! Yay! So I'm all up-to-date now and dwdb no longer gives me any error. I also see you made a new page and I'll go through it today hopefully (doesn't matter really) and bother you with any question I have in a new thread. *bg*

I don't know if you can git to remember the password for ever, but you can definitely make it remember it for 15 minutes so that you don't have to type it more than that often.

On a dreamhack, type

git config --global credential.helper=cache

I have suggested that this be made a system-wide default on dreamhacks, along with some stuff like putting some outputs into colour.

Great minds think alike because I believe Fey has added this to http://wiki.dwscoalition.org/wiki/index.php/Git_settings. *g*

Edited (too early for grammar *yawns*) 2012-09-01 09:06 (UTC)

ah - actually, that was me :-)

XD Sorry I didn't look at the history. Thanks a lot. This is really helpful.

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.

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?

So basically, dw-nonfree is a different repository, and updating it is a separate process from dw-free. If you feel it's better, I can work it into the above, but it's awkward because there might be cases where somebody is working for, say, their clone site and then they don't have dw-nonfree, and we've had people making clone sites start using dw-nonfree before which is awkward.

New users still have to move the old hack--I think Sophie has not yet made a new process for setting up. (It's tricky because of all the account stuff that goes on with Github now.)

I'm assuming by other instructions you mean flow stuff like making a branch, committing changes to it, pushing them up to Github and making a pull request, yes? Because we can make them right now!

Maybe make a link? Because as I reread that section I wondered: what about nonfree? I mean, from my POV it's logical to update everything at the same time but I get why you made it separate.

No, I meant all the other instructions on the Moving... page but it was a stupid question because yeah of course.

Let's start coding!

Ok everything went well (and was so much simpler than before!) so I'm at this point:

Making a pull request

Two questions:

a) Should I do that since we're supposed to be upload patches the True and Tried way (Mark's words :)?

b) If I'm not should I simply generate the diff and upload it as my patch on Zilla? Or do something else?

Yes, make a pull request definitely.

I think that Mark was making a joke about the True and Tried way (or maybe saying that we wouldn't be getting rid of that just yet? I don't remember the context in which he said it)

So yup just make a pull request :)

Ok thanks!

One more question: my original branch didn't have a correct name so I tried to rename it using branch -m. Bad move because now what I see in PuTTY and on GH are different now. On PuTTY everything went fine; On GH it just created a new branch with the name I wanted. How do I get rid of the old branch on GH?

Okay try this:

git branch -r -d origin/OLDBRANCHNAME

Note: the origin is part of it and (probably) shouldn't be changed.

If you want to get a list of all your remote branches to be really sure, do this:

git branch -r

Thanks!
Should I do push origin after that? Because it's still there on GH (but not when I do branch -r).

Oops I gave some wrong info. What I gave you will have made your repository forget about that branch that's on github.

What you actually want is:

git push origin --delete branchname

Victory! Thank you! *mwah*

\o/!

<333

Oh one more question: is there a point in keeping dw-old once you've got everything set up?

Nope; only need it if you have patches you haven't transferred over.

Yippee yay! Thank you!

To add on to what Fu said, though: we're not hurting for space, so i'd leave it for at least a month or so to make sure there's nothing you forgot.

Er, too late. XD But I was 100% sure I didn't have anything on it. I always deleted patches from my queue once I'd uploaded them.

Fetching updates on Dreamhack?

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

no subject

NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

no subject

no subject

no subject

no subject

GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

dw-old?

Re: dw-old?

Re: dw-old?

Re: dw-old?

Re: dw-old?