News for hackers. Stuff that matters.
Re:Git 2.0 release notes by anton_gogolev on Wednesday March 12, 2014 @05:16AM (#7384641)
Is it just me or "simple semantics" is not at all simple? Compare with:

    hg push -- pushes everything to "default push location"
    hg push -r . -- pushes currently checked out branch
    hg push -r foo where -- pushes foo to where
Re:Git 2.0 release notes by exDM69 on Wednesday March 12, 2014 @06:49AM (#7384893)
> Is it just me or "simple semantics" is not at all simple?

It's just you.

It's about time we'd put "hg vs. git" to the category of flamebait topics (similar to "emacs vs. vi" etc) that should be avoided. Every time there's a git topic, someone comes and derails the whole discussion with a not-quite-apt comparison with hg.

AFAIK, there are decent two-way conversion tools so you can use hg with a git repo and vice versa. There should be no need to argue because you can pick the one you like and use it.

Re:Git 2.0 release notes by simias on Wednesday March 12, 2014 @07:01AM (#7384918)
So comparing two competing tools is flamebait nowadays?

I think the OP makes a valid and argumented point.

Re:Git 2.0 release notes by exDM69 on Wednesday March 12, 2014 @07:22AM (#7384960)
I would agree with you if there had been an actual comparison and some arguments for or against one or the other. Now there wasn't.

E.g. "git push", similarly to "hg push" - without any extra arguments - do roughly the same thing, "push to the default location".

When was the last time you ever saw anything useful or insightful in comments about git vs. hg? There have been a few enlightening blog posts on the subject but discussion threads like this don't really provide anything of value.

Re:Git 2.0 release notes by anton_gogolev on Wednesday March 12, 2014 @08:12AM (#7385092)
> ...if there had been an actual comparison and some arguments for or against one or the other.

What kind of comparison are you after?

To be more scientific, let's take "git push where" and "hg push where". Now count the number of ifs and buts that you have to keep in mind when using Git (am I pushing to the same remote? is the branch "set to integrate"? does the remote has this branch name?) versus plain "push everything to where you cloned from" in Mercurial.

My point is that Git has accumulated too much cruft and has introduced one too many concepts to be usable.

Re:Git 2.0 release notes by matthewmacleod on Wednesday March 12, 2014 @08:34AM (#7385166)
My point is that Git has accumulated too much cruft and has introduced one too many concepts to be usable.

Your point is totally invalid, since git is self-evidently successful, and regarded by many people as usable.

The "cruft" you've pointed to consists of usable, useful features. So it would be useful to talk more about areas in which git could improve—even if that involves looking at features from Mercurial—rather than engaging in vague and abstract descriptions of "cruft".

Re:Git 2.0 release notes by anton_gogolev on Wednesday March 12, 2014 @08:47AM (#7385222)
As much as you want IT world to be a meritocracy, it is not. Very rarely software gets popular based exclusively on its merits.

With Git, it gained popularity not because it was terribly usable [1] or generally good (it was not even going to be an SCM [2]), but because it was imposed by Linus onto a pretty large number of developers - kernel hackers, not less - and then it spread from there.

[1]: http://marc.info/?l=git&m=111377572329534 [2]: http://marc.info/?l=linux-kernel&m=111288700902396

Re:Git 2.0 release notes by matthewmacleod on Wednesday March 12, 2014 @10:15AM (#7385699)
I'm familiar with the history of git.

I'm also aware that nothing you said actually dealt with the fact that git is not unusable. In fact, it's objectively pretty good—if it weren't, we'd all still be using SVN.

What you seem to be saying is that you prefer the UX of Mercurial. Cool, that's fine - but I'd be keen for people to invest their time in improving the experience of using git, rather than bellyaching about perceived differences which aren't really all that big.

(As an aside, I don't really agree that there's a problem with git's usability. It's a complex tool, if you want it to be. But for day-to-day distributed SCM, you'll rarely have to care about most of that.)

Re:Git 2.0 release notes by anton_gogolev on Wednesday March 12, 2014 @10:28AM (#7385786)
There are no objective criteria to measure usability, so Git cannot possibly be "objectively pretty good", sorry.

Again, popularity has nothing to do with merit. It's a pure happenstance that Git was chosen over Mercurial for kernel development, and it all went from there.

The UX of Git cannot possibly be improved in the foreseeable future as it will be a _massive_ pile of breaking changes with people moaning all over the internet.

Re:Git 2.0 release notes by bronson on Wednesday March 12, 2014 @06:12PM (#7388730)
Git is not as bad as you claim, and Hg is not as good as you claim. Yes, I have used both.

If you're looking to derail this post and do some trolling, then congratulations. You're off to a great start.

Re:Git 2.0 release notes by Skinney on Wednesday March 12, 2014 @08:32AM (#7385162)
What?

Git push by default pushes to where you cloned from. If you want to push to a different remote, you say so: "git push another-remote". If the remote doesn't have that branch, you create it, same as you would with bookmarks in mercurial.

git push == push all branches to origin hg push == push all changesets to origin

Re:Git 2.0 release notes by klibertp on Wednesday March 12, 2014 @09:40AM (#7385486)
It is if there was no new development in the tools and/or the comparison just repeats what has been said thousands of times already.

This (root) comment here is a good example: it isn't in any way related to the new developments in Git, repeats very basic comparison done many times already and fails to account for deeper differences and options (like the fact that you can easily configure git to make git push do exactly what you want).

It would be good for overall discussion quality if posts such as these were kept separate from the interesting stuff.

Re:Git 2.0 release notes by VeejayRampay on Wednesday March 12, 2014 @11:14AM (#7386034)
Also, hasn't git won already? I mean, I'm sure Mercurial is a great tool and all, but git is massive and widespread now, there's no going back and sharing of the pie until a new generation of VCS that completely changes the game emerges I think.
Re:Git 2.0 release notes by krig on Wednesday March 12, 2014 @07:23AM (#7384965)
When you say "the currently checked out branch", do you mean the current branch, bookmark, head, local branch or mutable branch? Or maybe you are referring to the current phase, or a secret changeset?

"Mercurial is so much simpler than git" is only true for one reason: You prefer mercurial and dislike git, and so you look for flaws in git while glossing over flaws in mercurial.

Re:Git 2.0 release notes by egork8n on Wednesday March 12, 2014 @07:56AM (#7385045)
You just need to visualize the tree, and that's it. `hg push -r .` will push checked out changeset and all its ancestors.

Mercurial tracks changesets. Git guys are inventing all kings of weird entities. Local branch? Mutable branch? Do these kind of things have separate sets of semantics in the git world?

In mercurial, branch is just a constant name for a group of changesets. Bookmark is just a temporary pointer to the changeset. Head is a changeset (that have no successors). Phase is information about whether it is safe to modify changeset. Mercurial is indeed a lot simpler.

Re:Git 2.0 release notes by krig on Wednesday March 12, 2014 @10:58AM (#7385945)
I think you misunderstood. These "weird entities" that I mention are all part of mercurial. I feel like many of the people who complain that git is too complicated and hold up mercurial as a bastion of simplicity don't really know either of them.

To quote my other comment:

* Branches (named and unnamed) are part of core mercurial.

* Bookmarks are part of core mercurial.

* Multiple heads are part of core mercurial.

* Phases are part of core mercurial.

* Secret changesets is part of core mercurial.

* mq is distributed with Mercurial.

* Local branches is an extension that isn't part of core mercurial, I'll give you that. However, calling it a "third-party extension" is pedantic. It's listed on the official mercurial web site, and using extensions is much more a part of every day usage of mercurial than using extensions in git, for example.

Re:Git 2.0 release notes by Skinney on Wednesday March 12, 2014 @08:29AM (#7385149)
All branches can change, and are mutable in that regard (altough commits can't change).

Local branch == Bookmark with unpushed changesets

All branches and commits/changesets are treated equal.

Yeah. In mercurial you have Branches and Bookmarks. In git you just have branches. Head is the current checked out commit/changeset. Git doesn't allow you to alter commits, only branches, so every modification in Git is inherently safe.

Re:Git 2.0 release notes by jgraham on Wednesday March 12, 2014 @09:16AM (#7385340)
Also, mercurial has mq, which adds a whole extra layer of complexity. Instead of making safe commits, you continually update ("refresh") a set of patch files. Each time you refresh you lose all the history (as if you exclusively used git commit --amend for work in progress). In order to solve this someone got the idea that the patch queue itself could be versioned by creating a second repository that you would commit each revision of the patches to. Unsurprisingly it turns out that two repos are not better than one and doing "simple" things (moving a patch queue between two clones of the same remote) requires fiddly manual operations.

Mercurial has some neat features, but this idea that it's always easy to use and git is always hard to use simply isn't true.

Re:Git 2.0 release notes by ygra on Wednesday March 12, 2014 @09:19AM (#7385353)
To be fair, mq is needed only for very few specialised needs (apart from strip, maybe). Most hg users can get by just fine with never enabling it at all.
Re:Git 2.0 release notes by acdha on Wednesday March 12, 2014 @09:52AM (#7385548)
For years the Hg community proclaimed it was the answer to git rebase. Might be time for a concerted doc push to get those references updated with pointers to the rebase extension instead.
Re:Git 2.0 release notes by kyrra on Wednesday March 12, 2014 @10:14AM (#7385688)
Because it was the answer originally (it's wiki page appeared in 2005, rebase appeared in 2008). Then rebase became the better answer. What proclaimed answer are you referring to here? On their GitConcepts[0] page, it says "hg rebase" or "hg histedit" should be used to do "git rebase" type operations. The only time they recommend MQ is if you want the index or the "git am" type command.

And as anton_gogolev mentioned, ChangesetEvolution[1] will probably help augment HistEdit and Rebase for a number of operations. It will allow pushable history rewriting.

[0] http://mercurial.selenic.com/wiki/GitConcepts

[1] http://mercurial.selenic.com/wiki/ChangesetEvolution

Re:Git 2.0 release notes by acdha on Wednesday March 12, 2014 @02:14PM (#7387259)
> What proclaimed answer are you referring to here?

You answered that in your first paragraph: for many years, the first time people looked at Mercurial the answer for that class of problems was mq. The problem now is that it's still easy to find stale internal documentation, old blog posts, etc. which haven't been updated with the new recommendations. I thought that it might be worth having a small campaign to encourage people to update old wikis, contact blog authors, etc. when they find those recommendations and suggest a simple “this is no longer recommended – see …” update.

Re:Git 2.0 release notes by anton_gogolev on Wednesday March 12, 2014 @10:13AM (#7385681)
Answer to rebase in particular (and the whole "Git makes it simple to edit history" argument in general) is Changeset Evolution [1].

[1]: https://air.mozilla.org/changesets-evolution-with-mercurial/

Re:Git 2.0 release notes by sampo on Wednesday March 12, 2014 @09:54AM (#7385558)
> In mercurial you have Branches and Bookmarks. In git you just have branches.

I think git branches correspond more to hg bookmarks, than to hg named branches.

Re:Git 2.0 release notes by Skinney on Wednesday March 12, 2014 @12:55PM (#7386773)
Isn't the only real difference that hg branches are constant, while bookmarks are temporary?
Re:Git 2.0 release notes by sampo on Thursday March 13, 2014 @11:02AM (#7392224)
Yeah, in hg named branches the branch name is forever logged as part of the commit. Hg bookmarks and git branches are just pointers to the most recent commit.
Re:Git 2.0 release notes by nnethercote on Wednesday March 12, 2014 @11:01PM (#7389850)
http://jordi.inversethought.com/blog/on-gitology/ is a good explanation of how git is overly complex.
Re:Git 2.0 release notes by anton_gogolev on Wednesday March 12, 2014 @08:14AM (#7385101)
Or maybe it is Git that has introduced all kinds of crazy concepts that you're now struggling to keep in mind? Local branches? Remote tracking branches? Mutable branches? Really?
Re:Git 2.0 release notes by Skinney on Wednesday March 12, 2014 @08:26AM (#7385135)
You don't have mutable branches in Git, I think he refers to commits mercurial don't allow you to alter (public ones).

Local branches in Hg is the same as bookmarks you havent pushed.

Remote tracking branches in Hg would be bookmarks you have pushed.

Re:Git 2.0 release notes by krig on Wednesday March 12, 2014 @08:23AM (#7385123)
Those are all Mercurial concepts.
Re:Git 2.0 release notes by anton_gogolev on Wednesday March 12, 2014 @08:30AM (#7385157)
Well, no. These are _at most_ the names of various third-party extensions, which are not even distributed with Core.

Mercurial itself has just heads, which can be named or not. Bookmarks are orthogonal to the whole thing.

Re:Git 2.0 release notes by krig on Wednesday March 12, 2014 @09:58AM (#7385580)
Mercurial without enabling extensions such as mq is simple only in the same sense that quilt is simple compared to git. Things quickly become more complex as you try to actually use it and need to enable extensions to do what you can do with git out of the box. The big benefit that git has over mercurial is that it has a powerful and expressive (and yes, complex) core concept. Mercurial quickly becomes a mess of, yes, orthogonal concepts layered on top of each other.

Anyway, you are plain wrong.

* Branches (named and unnamed) are part of core mercurial.

* Bookmarks are part of core mercurial.

* Multiple heads are part of core mercurial.

* Phases are part of core mercurial.

* Secret changesets is part of core mercurial.

* mq is distributed with Mercurial.

* Local branches is an extension that isn't part of core mercurial, I'll give you that. However, calling it a "third-party extension" is pedantic. It's listed on the official mercurial web site, and using extensions is much more a part of every day usage of mercurial than using extensions in git, for example.

edit: formatting.

Re:Git 2.0 release notes by giulianob on Wednesday March 12, 2014 @09:02AM (#7385282)
Not all Git concepts exist in Mercurial. See more here: http://mercurial.selenic.com/wiki/GitConcepts
Re:Git 2.0 release notes by Crito on Wednesday March 12, 2014 @12:04PM (#7386415)
He's not saying that they are Git concepts that have analogs in Mercurial. He just listed off Mercurial concepts.
Re:Git 2.0 release notes by davidw on Wednesday March 12, 2014 @05:31AM (#7384707)
There was a thing going around twitter lately:

> If ping was designed by the git people: net-ping host --no=dns,bind --proto=TCP,rfc:492 eth0@ipv4::http://1.0.0.127.IN -ADDR.ARPA --stats -v

Re:Git 2.0 release notes by rbonvall on Wednesday March 12, 2014 @10:08AM (#7385649)
I think it would be

    git checkout --ping
(Checkout already does too much; one more doesn't hurt).
Re:Git 2.0 release notes by beaumartinez on Wednesday March 12, 2014 @06:22AM (#7384835)
Re:Git 2.0 release notes by sanderjd on Wednesday March 12, 2014 @10:27AM (#7385775)
That honestly doesn't have the truth ring of good satire for me... It seems to be making fun of the lack of sane defaults in git (maybe?), but if anything, git seems too focused on mysterious implicit configuration-controlled behavior, over explicit control.

Edit: Ah, hmm, maybe the satire is more along the lines of "a single command does too much stuff", which does ring true for commands like `checkout` and `reset`.

Re:Git 2.0 release notes by jgraham on Wednesday March 12, 2014 @05:42AM (#7384735)
Comparing hg branches to git branches in this context isn't super-useful; the right comparison is to hg bookmarks. In this case the semantics seem to be (based on reading the documentation so I might be wrong):

  hg push [dest] -- Push all local bookmarks that match a remote bookmark
  hg push -B [dest] -- Push a specific local bookmark to a remote
To me those semantics don't seem particularly simple or flexible. In fact it seems quite like the semantics git is moving away from but with the restriction that local names and remote names always have to match, which means that you have to be very careful naming your local bookmarks to avoid clashes.
Re:Git 2.0 release notes by marincounty on Wednesday March 12, 2014 @09:15AM (#7385335)
No it's not you. It's overly complicated. This is what has always irked me about computing--making something seem more difficult than needed. I'm not asking for for an Apple solution, just cut the bull shit--high brow--If you don't know GIT you shouldn't be programming. It's a repository. I shouldn't need a git pocket guide. I want things fast and efficient. I don't like to spend daylight hours figuring out things; life is too short. In reality, I don't even like sitting in front of a computing devise, but society now requires it.
Re:Git 2.0 release notes by bronson on Wednesday March 12, 2014 @06:29PM (#7388845)
Just curious, where is this highbrow "if you don't know GIT you shouldn't be programming" bullshit you speak of?
Re:Git 2.0 release notes by recursive on Wednesday March 12, 2014 @10:17PM (#7389732)
Re:Git 2.0 release notes by trurl42 on Wednesday March 12, 2014 @05:47AM (#7384740)
I guess 'simple' means "don't try to be too smart".

Pushing only the current branch by default is a good thing, I think. If you are using a more centralized setup you can change the configuration of push.default to 'matching'.

Re:Git 2.0 release notes by js2 on Wednesday March 12, 2014 @09:04AM (#7385284)
Perhaps "dwim" would be a better description of simple, but it arose from much feedback and debate on the git mailing list. Its behavior is now what it is believed most git newcomers expect.