-
I'm doing this topic in the public area, in the hopes that:
(1) my issues may be resolved by more people,
(2) anyone can learn, too, and later be able to contribute to the repo when it's made public.
So... Wedge is now a git repo (yaaaaay...), and leaves SVN behind. (I'm not completely finished with it, as I plan to restore revision numbers through either tags or notes, whatever is best, in the future, when I have a bit more time to devote to that.)
Git is a complicated beast to master, and I'm only getting started.
Notably, what needs to be 'understood' is how communicating between repos is made. Since it's not stored on a central server, no repo is the 'right' repo, so I consider the right repo to be my local repo. For all intent though, it's exactly like the BitBucket private repo I have right now, since my 'origin' ref is set to that one.
There are 4 matters that I wish to solve before I can continue. (Maybe 5, but I can't remember the last one, it'll come back to me.)
1/ When doing a pull from my remote origin, TortoiseGit fails because some files I've edited locally were changed in the meantime on the remote repo. It told me to stash my uncommitted changes, but I can't find a stash command in TortoiseGit. So, I fired up SmartGit, and tried to pull from there. It offered me a choice between merging and rebasing. I chose merging as it's the default Git behavior, but they recommend rebasing. However, I want to keep branches, to make it easier to find areas that were pulled from another branch obviously. Apparently, it was the right choice, because my logs are identical between HEAD and origin/master, so it looks like it copied the history straight from the remote origin, right..? Still, I'm lost, I'm not sure what's best for communication between my repos.
2/ In my current situation, I'm pushing my own changes to the remote origin directly, when I could be doing a repo on my account, and then push it to the team account's repo. However, I don't know how to do these pushes manually or automatically, especially on a remote server, so... A bit stuck. FWIW, I don't know how the current collaborators (Pandos and TE) can merge their own branches with the updates on the official repo. Honestly, it eludes me. I need some frigging documentation on that, I guess.
3/ Bitbucket sucks, somehow. They won't allow me to add a fake e-mail address to my account, so I can't associate nao@wedge with my own account. Sucks. Big time. However, since it will end up at github eventually, it won't be a problem, soon. However, my biggest problem is that Bitbucket uses my 'actual' e-mail address for web-based commits (e.g. pull requests), thus I currently have, in the online (private!) repo, my e-mail address in the clear. I don't want that. Github provides no-spam addresses, so I'm okay with that, but BB doesn't have anything. I'm forced to commit with that e-mail address, no way to conceal it.
I tried 'amending' my latest commit, but it didn't work. I don't know if it's because the latest commit is not technically from my git account that I can't seem to actually amend it, or if it's just how it works (doesn't work). I did 'git commit --amend --reset-author' in a bash window, and it simply launched a Vim page with the commit data. I didn't know what to do, so I just closed the window. TortoiseGit didn't offer to amend. SmartGit offered to do it, but I can't seem to make it work. Finally, Git Gui did the amend as I asked, but it didn't change the author at all (couldn't find an option to --reset-author, which probably didn't help.)
Anyone knows how I can fix that particular commit....?
:edit: Actually-- I just restarted my TortoiseGit log (which I'd only 'refreshed'), and it marked the commit as using my dummy e-mail address. Yoohoo! Well, it's still not cool that I'm going to have to amend all of my future pull request merges, but... Well, it's an extra incentive to hurry up and go public, ah ah...!
4/ Right now I have 36 uncommitted files, with three thematic changesets: privacy rewrite, contact list stuff, and miscellaneous one-bits. Is there a way to split these into several branches, so that I can safely work on them separately, and then commit as needed? Or do I absolutely need to create a branch, then start my stuff? I'm guessing I could always 'stash' the changes, then create a branch, then unstash..? (But then I need to selectively stash for each file, which I don't think is possible, ah ah...)
Okay, that's all for now...
I'm a bit annoyed that I've been spending the better part of the last 3 days working on the git innards, instead of actually committing my private rewrites, but... Whatever. I have to do it. It's the only way Wedge can keep up, at this point. It's so easy to do pull requests, I want to enable anyone to do them. I'm just hoping I can live up to it, see..? What's a fantastic git repo, if the maintainer isn't able to do the basic stuff...? :P
-
Sorry, can't help with SmartGit, Tortoise and such programs.. I'm using Netbeans and I'm quite happy with.. I think it's important to setup and understand the GIT / Github workflow from the beginning.
This is what I did with the openImporter (and other projects):
Setup:
1) created a team account (openimporter) and a repo for the files (named openImoprter, too).
2) Forked the repo with my personal account.
3) Cloned it locally.
4) added the team account repo as upstream
git remote add upstream https://github.com/OpenImporter/openimporter.git
Typically Workflow:
1) create a local branch named "xy"
2) switch to that branch
3) work on a fix / feature and commit to that branch
4) merge in changes from the team repo
git pull --rebase upstream master
6) send a pull request via github (there's a button once you've uploaded a branch)
7) Merge the pull request (team account)
I use Netbeans with gitbash and the only thing to do via git shell is the init setup (git remote add....) and the rebase
git pull --rebase upstream master
related to 4). I've never worked with stash .. What I did in the past: copied the modified files to somewhere else, created a branch and moved the files back to that branch, commited the changes.
-
Keep my local repo up to date is really boring at this time.
So there are a a lot of changes in my local repo and SmartGitcompletely discard my changes to files I've staged before.
So I have to backup my local repo and merge the changed files after updating from master.
Dunno how to solve it.
Using SourceTree. Perhaps I should give Netbeans a try...
-
Using public git hosters is a bit unflexible. Why don't you set up your own git server?
(But great that you're using git now. Better for branch management indeed.)
NetBeans for PHP code? Duh. Use Emacs with Magit and all problems are solved. :-)
(IDEs make smart people stupid.)
-
Using public git hosters is a bit unflexible. Why don't you set up your own git server?
-
I'll get to answer the stuff above (thanks!), but I have a quick question...
Let's say I have branch master, and branch newfeature.
If I switch to newfeature, then do changes, then commit half of them, and leave some changes uncommitted...
When I switch back to master, do these uncommitted changes show up in the same files?
My #1 grudge against Git is that it seems to expect from you that you commit every little change you make at any moment. My workflow involves doing changes, and then launching the commit dialog, and regularly launching diffs of my (uncommitted) files to check out the changes I'm working on, and quickly spot what remains to be done. I'm not sure I want to go through the git show log dialog (for previous commits) to do the same; or is it, really, not that big a deal..?
-
My #1 grudge against Git is that it seems to expect from you that you commit every little change you make at any moment.
-
Using public git hosters is a bit unflexible. Why don't you set up your own git server?
Effectively, the main reason I'm going for git is because everyone's on github.
Also, I severely appreciate the fact that I can keep 'final' control over the codebase, while still allowing for proper crediting in the history. I always hated having to say 'thanks to ...' in the changelog to credit someone. Let's have their name in there! So it can be shown in stats, and things like that!(But great that you're using git now. Better for branch management indeed.)
NetBeans for PHP code? Duh.
I have no idea how TE did his global variable removal through it, though. The various 'code cleanup' plugins don't work, for me.(IDEs make smart people stupid.)
Now, of course, I use the best tools in each category (grepWin for search/replace, Notepad2 for SDI editing, Notepad++ for MDI editing, TortoiseGit for DVCS...), so I guess no IDE will ever satisfy me, because 'it's missing this feature from that tool...'But branch commits still clutter the log...
My goal with my 'temp branches' is mostly to import the changes once I'm entirely done with them, in a single history commit, and delete the branch. I suppose it can be done, which is why I'm starting to do it, but it's still... A bit complicated, overall. Mind you, it's interesting. But I need more work to get into the git state of mind.
One of the latest issues of .net magazine has a tutorial on git. What's funny is that even in that stupid tutorial 'for absolute beginners', the guy CAN'T HELP but use words like 'detached-head state' here and there... Without even realizing that he didn't care to explain what they are in the first place. Seriously, it's like git documentation is only offered to people who don't need it in the first place. I don't know what I would do without stackoverflow, frankly...!
-
Now, of course, I use the best tools in each category (grepWin for search/replace, Notepad2 for SDI editing, Notepad++ for MDI editing, TortoiseGit for DVCS...)
Posted: October 27th, 2013, 11:21 AM
Seriously, it's like git documentation is only offered to people who don't need it in the first place.
-
dnGREP/Emacs, Emacs, Emacs, git shell ... :whistle:
Linus Torvalds was one of the initiators of git - this might be one reason. :ph34r:
-
I have no idea how TE did his global variable removal through it, though. The various 'code cleanup' plugins don't work, for me.
Check the screenshots.. should be self explaing.
-
What are their killer features..? Any 'plus' that none of the others have?
Emacs for SDI editing: No GUI clutter(http://i.imgur.com/1rDTgNv.png), more programming features(https://en.wikipedia.org/wiki/Comparison_of_text_editors#Programming_features).
Emacs for MDI editing: Depends.(https://en.wikipedia.org/wiki/Comparison_of_text_editors#Document_interface)
git shell compared to Tortoise-something: Power at your fingertips, no GUI clicking orgies.
(You could as well use Emacs(http://magit.github.io/magit/magit.html)...)
-
@forumsearch0r> Seriously, Emacs is broken... The UI is a mess, and it doesn't look like something usable by anyone. I did spend 10 funny minutes playing its embedded text adventure game, though... Lol. As for dnGREP, its UI is even worse, there's absolutely no chance I'm ever gonna use something that looks like it was designed by a kid, but hey... To each their own, I suppose. ;)
Also, its file preview isn't very practical. It doesn't jump to the results, for instance.
@TE> Wow, impressive... Thanks for the hint. I had to disable many things, but it seems to work.
I removed all unused globals from the root folder, I thought you'd done them all..? So, it was just a 'first batch', I suppose..?
One of the interesting ones, I suppose, would be these lines in Load.php...
$this_plugindir = $context['plugins_dir'][$plugin_details['id']] = $sane_path . '/' . $plugin;
$this_plugindir is initialized, but never used. I guess I can remove it safely, too. It's even in ManagePlugins.php, too, and once again, not used at all...
-
The UI is a mess, and it doesn't look like something usable by anyone.
As for dnGREP, its UI is even worse
-
The UI is a mess, and it doesn't look like something usable by anyone.
The attention to detail is what separates good from great. And really, it can also make life easier on a daily basis. When you have a wide choice available to you, you tend to choose what makes you more productive. For instance, I already documented the fact that Notepad++ (and NetBeans, for that matter) don't have the main window's vertical scrollbar 'stick' to the right of the screen, meaning I have to voluntarily target the scrollbar thumb with my mouse, instead of just targeting its vertical position, and then moving my mouse to the extreme right of the screen, ensuring it'll respond to my clicks. It doesn't seem like much, but I systematically work like this, moving my mouse to the right, then going up or down until the thumb gets 'highlighted', and then I'll click and drag the thumb. It's important, to me, that software behaves the way I need, or that it can be configured to do so.
The same applies to browsers, BTW. And Opera did it that way. Chrome, too (although these days, until Opera implements vertical tabs, I'm using a Chrome add-on that adds vertical tabs, but also prevents the window from being maximized; it's a shame, but I'm dealing with it until times get better.)I actually like it, but it has a couple of glitches indeed. Well, it's a beta.
-
When you have a wide choice available to you, you tend to choose what makes you more productive.
Again, how is Emacs's GUI related to being productive using the editor?The same applies to browsers, BTW.
-
Precisely. That's why I disabled all toolbars and scrollbars in Emacs. PHP coding is a keyboard-only task. Just define shortcuts for anything you need and you're done. Mouses (well, "mice" are something different) are sooo 1980s.
Reminds me of Sublime Text 2. It's a pretty good editor, but it's very... original, in its own way. Check it out, if you've never heard of it. Not my cup of tea, but I recognize it's nicely done.Browsers are not directly related to being productive, they're plain viewer applications. OTOH, I use Firefox because I can use it faster than the other browsers, but that's not "productive", it's just getting used to it.
-
Hmm, but what if you're in a file with thousands of lines..?
Reminds me of Sublime Text 2. It's a pretty good editor, but it's very... original, in its own way. Check it out, if you've never heard of it.
They're viewers, but when you're a power surfer like me, who likes having 1000+ tabs open at the same time
-
forumsearch0r
If you have anything to do seriously with web design, and coding, you will see how stupid it is to say that "Browsers are not directly related to being productive, they're plain viewer applications."
We coders and designers RELY on browsers in order to BE productive. If not for the use of different browsers, then we'd never get our projects done correctly. We need to use browsers as top listed tools to make sure what we make is usable in all browsers.
So, your saying that Browsers are not directly related to being productive, they're plain viewer applications, is the biggest load of BS I've ever seen come from you. Do not worry, I have seen plenty from you, so I doubt you need to worry about running out.
-
So "BS" is a part of the commonly accepted language here? Well then, good to know that I don't necessarily have to be a friendly pal. I'll come back to that when it's appropriate. - No, I don't work as a web designer. My current job consists of creating the backend for web designs though.
-
Either way, you should know how important of tools browsers are for designers and CODERS...
That comment was just plain stupid and ignorant.
Enough so, that I highly doubt your claims of grandeur in coding.
That, plus earlier discussions tend to make me think you are something, and what you say you are, is not it.
-
I can perfectly live with whatever you with your modding team leadership think I am. In fact, your POV is not relevant for my job. Anyway, I love how comments like "I highly doubt your claims of grandeur in coding" are just plain stupid and ignorant, given that you haven't read one single line of PHP code of mine yet.
Someone's arrogant here, eh?
-
Trust me...
I am the first to admit that my coding is not the greatest.
I also, admit when I don't know jack about something.
However, it does seem that you do not have those abilities.
Also, I did a search on you, and what I found, has done a lot, to confirm suspicions I voiced about you when you first got here and started to attack someone, without knowing the whole story. You, it seems to me, as well as several others that I talk with, are nothing but a troll.
I find it odd that you have gone to just about every fork of SMF, and almost demanding info that they don't care to share. You tell some people you know this, and others that you know that. Yet, when questioned, it seems you either mess up on your end of the discussion, or you disappear for a bit.
So, tell us... Why does it seem that way? What is you real interest in Wedge and ElkArte?
What do you plan on doing? Making a fork and using things from both to make a combo?
Well? If so great at what you do, why not ask to do some coding for them?
-
However, it does seem that you do not have those abilities.
You, it seems to me, as well as several others that I talk with, are nothing but a troll.
I find it odd that you have gone to just about every fork of SMF
What is you real interest in Wedge and ElkArte?
What do you plan on doing?
Making a fork and using things from both to make a combo?
If so great at what you do, why not ask to do some coding for them?
-
September 5th, 08:16 PM Actions…forumsearch0r » O hai! I found here from the SMF forum, looking for a good forum software I can thoroughly test. Now where can I find the current revs? I know web development too, so I might even find weird quirks. :) (…)
Funny... I never once had been able to find you at SMF site. You must have used a different name there, I guess.
Look, I don't know who you are, or what you actually want. However, I stand by what I suspect.
There is just a little too much about how you have handled yourself here, that shows there's more to you than meets the eye.
I may not be staff here, but I know Nao, and I will even call him a friend.
I look out for my friends, and that is all there is to it.
-
I won't answer point by point, as this is getting a bit out of control, and I can feel that you're now argumenting for the sake of argumenting, guys...
I've often been guilty of that, and I'm none the wiser for it.
So... To put things into perspective: forumsearch0r, IIRC, is the one guy who registered here right around the day Pete decided to leave the team. Given his interest in the (newly found) Wedge platform, he was of course interested in seeing it 'work', and thus not happy to see Pete leave; so, he took the antagonist position to BK's defense of Pete (I'm not sure it was BK, but I know it was a non-regular poster), and so, for no special reason, you're now starting it all again, but on a personal level this time.
Guys, I don't think any of you has a 'problem', and there's no point in fighting over little problems like this.
forumsearch0r never made it clear he wanted to help develop Wedge; while he did say he was capable, he also never requested an alpha copy, or SVN read access, or Git read access (although in this case, I'm not even sure the change to a Git server was even mentioned in the public area. Ahum.)
He does strike me as a bit of a 'know-it-all', though, more than a troll. When I want to recommend a product, I'll explain why it's better. So far, FS has only made it clear that he preferred Emacs, but didn't give examples of things it can't do that others can't. I've been guilty, in my fouth, of knowitallite, its curable, but it will disappear by itself once you've have about a hundred flame wars about tech products. (For me, it all started with "the Amiga is better than the Atari ST"... The agony!)
BK, I'm not sure why you'd call yourself a friend of mine since I recently felt you were uncomfortable with me (or at least not trusting of me) during a conversation, but really, I don't mind. Call it whatever you want; even though I was bit many times in the past, it's in my nature to naturally trust people to be good-doers rather than wait until they brought the proof of it. (Because we all see ourselves as good-doers, after all. We just need to learn how one's freedom ends where the next man's freedom begins.)
anyway... It's not even 7am, and I'm already babbling on an Internet forum.
-
But the Amiga is better than Atari ST.
-
Funny... I never once had been able to find you at SMF site.
-
Good morning, Nao! :ph34r:
forumsearch0r never made it clear he wanted to help develop Wedge; while he did say he was capable, he also never requested an alpha copy, or SVN read access, or Git read access (although in this case, I'm not even sure the change to a Git server was even mentioned in the public area. Ahum.)
FS has only made it clear that he preferred Emacs, but didn't give examples of things it can't do that others can't.
But I don't think the software I use is the software everyone should use.
-
That is a very true statement.
It's like the editor in cPanel... Some people hate it with a passion, yet others swear it's better and faster...LOL
Everyone has their own thoughts on a program, as well as anything else...
However, I found it odd how things started with you, FS, and that is why I have been like I am.
If I'm wrong, then I deeply apologize, but if I'm not wrong, then do know, I wont give in. ;)
But then, if you are anything like a normal human being, like the rest of us, you would expect that. ;)
/medoes often wonder if Nao is 100% human... His coding skills seem to point to some microchips installed... :P
-
I'd assume most people to be not "normal".
-
Well, that's finally one thing we can agree on. :P LOL