[QUOTE=Tamschi;52593820]Alternatively [URL="https://tortoisehg.bitbucket.io/"]Hg[/URL].
vs. Git:
pros:
- easier to use
- harder to break
cons:
- unsupported on GitHub (which is pretty major)[/QUOTE]
What can you break with Git? I've used it for a few years, but haven't broken anything yet :v:
[QUOTE=Tamschi;52593992]Right, but the community really isn't there.
Saying GitHub is like Facebook for programmers is unfortunately not an understatement.[/QUOTE]
I can link people to my bitbucket just as nicely. I think it's a personal choice because I hate the way git works.
[QUOTE=gokiyono;52594189]What can you break with Git? I've used it for a few years, but haven't broken anything yet :v:[/QUOTE]
The detached head issue aside, I somehow manage to put it into invalid states all the time.
It's really annoying and I'm not sure what causes it. Maybe my way of doing feature branches and using subrepos doesn't mesh well with it or something.
Hg has been extremely robust so far. I broke a repository once (invalid state), but the system has both undo and recovery functions so I had it fixed very quickly.
[QUOTE=Adelle Zhu;52594248]I can link people to my bitbucket just as nicely. I think it's a personal choice because I hate the way git works.[/QUOTE]
Bitbucket uses git too though
[QUOTE=gokiyono;52594308]Bitbucket uses git too though[/QUOTE]
It supports both, not at the same time for one repository though.
I'd recommend tortoisegit. People always frown on gui tools because the year is 1991 and the terminal is rocks, but it makes it 100x easier to use git, you don't have to remember detailed command arguments, it's borderline impossible to put git into a state where you don't understand how you got there, and all the functionality of git is listed to you so you are never discovering new features you didn't know about
No typos and no mistakes!
[QUOTE=Icedshot;52595376]I'd recommend tortoisegit. People always frown on gui tools because the year is 1991 and the terminal is rocks, but it makes it 100x easier to use git, you don't have to remember detailed command arguments, it's borderline impossible to put git into a state where you don't understand how you got there, and all the functionality of git is listed to you so you are never discovering new features you didn't know about
No typos and no mistakes![/QUOTE]
Bah, GUI tools - real programmers write their own git frontend!
/s
[QUOTE=Adelle Zhu;52589061]So I ditched Apache altogether and went with Nginx and Gunicorn. This is the closest I've gotten to getting this shit to work.
As of right now, the app launches properly in the background using Supervisor. My current issue is Nginx not passing any connections (http or https; I have SSL.) to Gunicorn. I'm simply stuck with the "Welcome to Nginx" page even though I've deleted the default conf from /etc/nginx/sites-available and sites-enabled.
This is what my app's conf looks like:
[code]
upstream simon_server {
server unix:/var/www/Simon/simon.sock fail_timeout=0;
}
server {
listen 443 ssl;
server_name glencoverx.com;
client_max_body_size 4G;
access_log /var/www/Simon/logs/nginx-access.log;
error_log /var/www/Simon/logs/nginx-error.log;
location /static/ {
alias /var/www/Simon/static/;
}
location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $http_host;
proxy_redirect off;
}
ssl_certificate /etc/letsencrypt/live/glencoverx.com/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/glencoverx.com/privkey.pem; # managed by Certbot
include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
if ($scheme != "https") {
return 301 https://$host$request_uri;
}
}
[/code]
The sock is present in that directory and is created by Gunicorn upon start. It's just that Nginx won't touch it.[/QUOTE]
Not sure if it's been addressed already, but your upstream block doesn't look like it's being used anywhere?
You'll probably need to configure your / location block as follows (notice the new proxy_pass):
[cpp]location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_pass http:// simon_server;
}[/cpp]
Remove the space after the http:// (FP formatting is getting in my way)
[QUOTE=Icedshot;52595376]I'd recommend tortoisegit. People always frown on gui tools because the year is 1991 and the terminal is rocks, but it makes it 100x easier to use git, you don't have to remember detailed command arguments, it's borderline impossible to put git into a state where you don't understand how you got there, and all the functionality of git is listed to you so you are never discovering new features you didn't know about
No typos and no mistakes![/QUOTE]
There was something I read a while ago where people were arguing using git through CLI vs GUI. At the end of the day you use whatever works best for you. For me I'm a GUI person, and there's some great GUI tools out there for git
[QUOTE=djjkxbox;52597303]There was something I read a while ago where people were arguing using git through CLI vs GUI. At the end of the day you use whatever works best for you. For me I'm a GUI person, and there's some great GUI tools out there for git[/QUOTE]
I like using git through my editor. [URL="https://scotch.io/tutorials/using-git-inside-of-sublime-text-to-improve-workflow"]Like this[/URL]
[QUOTE=Protocol7;52597093]Not sure if it's been addressed already, but your upstream block doesn't look like it's being used anywhere?
You'll probably need to configure your / location block as follows (notice the new proxy_pass):
[cpp]location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_pass http:// simon_server;
}[/cpp]
Remove the space after the http:// (FP formatting is getting in my way)[/QUOTE]
Forgot to mention I fixed this already. I was missing the directive that passed the proxy into the socket. Now I'm struggling with getting gunicorn to reload my fucking code. It won't use the changes I've made.
[QUOTE=gokiyono;52597603]I like using git through my editor. [URL="https://scotch.io/tutorials/using-git-inside-of-sublime-text-to-improve-workflow"]Like this[/URL][/QUOTE]
Same actually, I've got it through VS Code, and Atom has integration too
What GUI is the bee's knees for git nowadays? Source-tree is slow as hell for me, so currently using the terminal. Would it even be worth switching over to a GUI once you know the terminal?
[QUOTE=war_man333;52599496]What GUI is the bee's knees for git nowadays? Source-tree is slow as hell for me, so currently using the terminal. Would it even be worth switching over to a GUI once you know the terminal?[/QUOTE]
I've always used tortoisegit if you want something context integrated, I've never had any perf issues with it
Personally I much prefer GUI because it simply provides way more information and accessibility than git does in the terminal, you get all this just immediately in front of you
[IMG]https://i.imgur.com/4Swtqsh.png[/IMG]
[IMG]https://i.imgur.com/3pzwRXV.png[/IMG]
[QUOTE=war_man333;52599496]What GUI is the bee's knees for git nowadays? Source-tree is slow as hell for me, so currently using the terminal. Would it even be worth switching over to a GUI once you know the terminal?[/QUOTE]
I personally find GUIs a lot nicer, easy to see all the different tools or "commands" available at once, easier to see things like what files are involved and able to right click files to view them in Explorer, nicer visualization of things like comparing differences of files.
[QUOTE=war_man333;52599496]What GUI is the bee's knees for git nowadays? Source-tree is slow as hell for me, so currently using the terminal. Would it even be worth switching over to a GUI once you know the terminal?[/QUOTE]
If you use Github then they have their own app for their service, which is quite nice
[QUOTE=war_man333;52599496]What GUI is the bee's knees for git nowadays? Source-tree is slow as hell for me, so currently using the terminal. Would it even be worth switching over to a GUI once you know the terminal?[/QUOTE]
Personally I like GitKraken for complicated merges, although I tend towards CLI for everyday use.
[QUOTE=gokiyono;52594189]What can you break with Git? I've used it for a few years, but haven't broken anything yet :v:[/QUOTE]
I accidentally typed git commit --amend during a rebase the other day - I was surprised it let me do that even. It looked broken but it wasn't problematic to get out of it once I figured out what I'd done.
I didn't like how "modern" gitkraken looked, it started to obsfucate functionality. TortoiseGit just triggers me because it makes me think of how we still fucking use TortoiseSVN at work (git soon, though).
SourceTree is my favorite. Simple but not fugly GUI, good feature set, easy to use.
[editline]23rd August 2017[/editline]
github app is p. bad tbh
I need help in being pointed in the right direction.
At my work we use LotusNotes 8.5.3 to manage our intranet website (upload documents, delete documents, change page layout etc.). I need to find a C++ API or a way to get a list of all currently uploaded documents, either by accessing the respective .nsf database file directly or through the LotusNotes client.
I had a look but the only C++ API (official one from IBM) doesn't seem to have functions to read files from .nsf's? I may not have dug hard enough into it so I may have missed it. Do you guys have any idea what I could use for this instance?
I'm working on raycasting. Currently my maps are 2D arrays of blocks. I want to use vertices and line segments. How can I get the intersection of a ray and a line segment without iterating along every single line segment on the map?
[QUOTE=paindoc;52604512][...]
SourceTree is my favorite. Simple but not fugly GUI, good feature set, easy to use.
[...][/QUOTE]
It's still an inferior TortoiseHg clone though :smug:
Completely unrelated question: Has anyone here made an Android app and would be willing to give me a few pointers while I figure things out?
I can't seem to find good not-outdated resources on this online, so I keep hitting points where I don't know where to look something up.
Not done Android dev in a long time, but you can filter Google search results by date if you go to the tools section, which should bring up updated resources
I have the below C++ example code:
[code]std::list<Record> out;
//insert some records into out via other methods
bool nomatch = false;
for (auto& dest_it : out)
{
// do some processing
if (dest_it == out.end())
nomatch = true;
}[/code]
When I compile, it says that there's no match for operator== for comparing dest_it with out.end(), as one is a Record object while the other is an iterator. How can I interpret the dest_it item as an iterator?
[QUOTE=war_man333;52599496]What GUI is the bee's knees for git nowadays? Source-tree is slow as hell for me, so currently using the terminal. Would it even be worth switching over to a GUI once you know the terminal?[/QUOTE]
In my opinion, no. Although I'm biased to using the terminal - I use git daily. If you are actually familiar with git concepts then using the terminal will be just fine and see no benefit to switching over. I think it will damper productivity because of the time to switch windows every time you need to do a git task.
I use vim for all my coding and if you get a good workflow with git, then you won't end up with complicated diff's . I look at my status and diff constantly. For me, it would take up so much time if I had to actually press buttons and move the mouse around to find the gui screen and do whatever I need to do is. The terminal is nice because you don't have to take your hands off the keyboard.
If you use vim then it probably makes sense that you prefer using the terminal, isn't vim all keyboard controlled too? As I mentioned above I use VS Code, which actually eliminates the "switching windows" issue since the git UI is in the same window as where I'm coding, but depending what war_man333 is using, a git extension might not be available.
[QUOTE=supervoltage;52607773]I have the below C++ example code:
[code]std::list<Record> out;
//insert some records into out via other methods
bool nomatch = false;
for (auto& dest_it : out)
{
// do some processing
if (dest_it == out.end())
nomatch = true;
}[/code]
When I compile, it says that there's no match for operator== for comparing dest_it with out.end(), as one is a Record object while the other is an iterator. How can I interpret the dest_it item as an iterator?[/QUOTE]
When using the range-based for loops, its going to default to a reference to the object proper instead of iterators. To get the last element, use "out.back()". I'm not sure what you're trying to achieve here, though: won't dest_it always eventually equal the last element, at the end of the for loop?
I also have a hunch that something from <algorithm> could help you here, too.
[QUOTE=paindoc;52608977]When using the range-based for loops, its going to default to a reference to the object proper instead of iterators. To get the last element, use "out.back()". I'm not sure what you're trying to achieve here, though: won't dest_it always eventually equal the last element, at the end of the for loop?
I also have a hunch that something from <algorithm> could help you here, too.[/QUOTE]
Wish I could rate my own post a box.
Thanks for the advice, I will adapt my code as required.
[QUOTE=supervoltage;52609500]Wish I could rate my own post a box.
Thanks for the advice, I will adapt my code as required.[/QUOTE]
There's nothing dumb about asking questions, I'm guessing you're new at C++? If so, give C++ Primer a read (libgen.io is your friend) and try some of the exercises it has to get polished up a bit.
[QUOTE=paindoc;52609549]There's nothing dumb about asking questions, I'm guessing you're new at C++? If so, give C++ Primer a read (libgen.io is your friend) and try some of the exercises it has to get polished up a bit.[/QUOTE]
Yeah I'm pretty new to the practical side of C++. I followed the entirety of [url]www.learncpp.com[/url] as a quick-start way of gaining knowledge of what you can do (I liked the pace it explained C++ concepts very much - not too slow, not too fast) and am now trying my hand at building some software for my job to make my and my colleagues' lives easier. The only problem I have now is applying all the bits and bobs I know of C++; to build a foundation of practical knowledge, which understandably comes with time and practice.
This is the first endeavor in actually making something useful out of my new skill. Hopefully, one day, I will become the software developer I always wanted to be and escape this monotonous 1st line support job. One day...
Sorry, you need to Log In to post a reply to this thread.