Hacker News Board Hacker News, browsed like a classic message board
Live data from Hacker News

Python now uses Mercurial

hg.python.org

Post reply on HN
Print view View original

51–60 of 114 posts

Re: Python now uses Mercurial

#51

Post by jrockway »

bluesnowmonkey wrote: post #43
burgerbrain wrote: post #10

Earlier quoted context omitted.

PHP + ...SVN? Gotta say, they deserve each other.

You know, comments like that disparage by implication anyone who finds value in PHP or SVN. That's a big chunk of the development community. It tears people apart rather than bringing them together. Maybe you should redirect your energy from snark and criticism toward something more constructive.

You know, comments like that disparage by implication anyone who finds value in PHP or SVN.

Maybe if we disparage them enough they'll switch to a real programming language and version control tool.

Re: Python now uses Mercurial

#52

Post by calloc »

mckoss wrote: post #47
int3 wrote: post #40

Earlier quoted context omitted.

As someone who hasn't used Hg before, I'm curious -- what are some examples of Git commands that are better executed in Hg?

I use both git and hg - and like both of them (though I have more experience with hg). Github is far and away the best hosted distributed version control service, with a constant stream of innovative features for open-source developers over the last 2 years. Git has had two main drawbacks in my mind. 1) Much of it is implemented as script commands, and I think it still requires you run an emulated shell in Windows to…

The differences on commit both have good arguments. hg is going for ease of use and is very much like the non-dvcs's that came before it, like CVS and Subversion where a commit commits all changed files.

git add just adds the file to the index and stages it for commit, this means you can group files logically depending on what has changed, you can even using git add -p have only certain parts of a files modifications be committed and the rest be staged for the next commit. This can be very powerful.

For example, if I did a full refactoring of a class, and fixed a quick bug rather than committing them both at the same time in the patch I can just keep the bug fix and then later commit the re-factored code even if it is in the same file.

Re: Python now uses Mercurial

#53

Post by jrockway »

js2 wrote: post #44
tghw wrote: post #33

Earlier quoted context omitted.

I find the way your phrase that question interesting. Git and Mercurial are nearly identical in terms of functionality, to the point that converting back and forth between them is pretty trivial. (Example: here's Git's repository in Mercurial https://mirrors.kilnhg.com/Repo/Mirrors/From-Git/Git ) The only real difference between the two are the ecosystems. Mercurial, being written is Python, is very portable and easi…

octopus merges are rare in the git.git repo: $ git rev-list --merges --parents --tags | awk '{print (NF-1)}' | sort | uniq -c 4409 2 22 3 5 4 3 5 1 6 So there's been a total of 31 octopus merges compared to 4409 typical two-parent merges.

How many Octocat merges have there been?

Re: Python now uses Mercurial

#54

Post by burgerbrain »

js2 wrote: post #44
tghw wrote: post #33

Earlier quoted context omitted.

I find the way your phrase that question interesting. Git and Mercurial are nearly identical in terms of functionality, to the point that converting back and forth between them is pretty trivial. (Example: here's Git's repository in Mercurial https://mirrors.kilnhg.com/Repo/Mirrors/From-Git/Git ) The only real difference between the two are the ecosystems. Mercurial, being written is Python, is very portable and easi…

octopus merges are rare in the git.git repo: $ git rev-list --merges --parents --tags | awk '{print (NF-1)}' | sort | uniq -c 4409 2 22 3 5 4 3 5 1 6 So there's been a total of 31 octopus merges compared to 4409 typical two-parent merges.

On the other hand, roughly an entire 2% of merges on linus's linux tree have been octopus merges. Hardly something to scoff at.

      5 10
      6 11
      5 12
      3 13
      2 14
      1 18
  14592 2
      1 20
      1 21
      1 24
    129 3
      1 30
     50 4
     25 5
     21 6
     13 7
     18 8
      7 9

Re: Python now uses Mercurial

#55

Post by john2x »

mckoss wrote: post #48
pestaa wrote: post #11

Earlier quoted context omitted.

In all fairness, I'd like to point out it's quite possible to make Git work on Windows. If one can adjust the path, it is also reachable through the same command line Windows folks are used to.

The last time I looked, Git on Windows required you use a different shell than the native Windows command shell (not that I'm a fan of the crappy Windows shell, but it does make it more awkward and feels less "native").

I think it's called Git Bash. It isn't so bad though, you get some working Unix commands with it. Come to think of it, I think it's better than CMD, to an extent.

Re: Python now uses Mercurial

#56

Post by bluesnowmonkey »

burgerbrain wrote: post #46
bluesnowmonkey wrote: post #43

Earlier quoted context omitted.

You know, comments like that disparage by implication anyone who finds value in PHP or SVN. That's a big chunk of the development community. It tears people apart rather than bringing them together. Maybe you should redirect your energy from snark and criticism toward something more constructive.

You can simultaneously find value in something, and have a sense of humour about that something's shortcomings. Learning to laugh at ourselves is probably the greatest thing humanity could do to further peace and happiness.

That's a fair point, when it applies. But I perceive this joke as coming more often from a sense of superiority and an emotionally ill-conceived attempt to improve others by insulting them.

Re: Python now uses Mercurial

#57

Post by burgerbrain »

bluesnowmonkey wrote: post #56
burgerbrain wrote: post #46

Earlier quoted context omitted.

You can simultaneously find value in something, and have a sense of humour about that something's shortcomings. Learning to laugh at ourselves is probably the greatest thing humanity could do to further peace and happiness.

That's a fair point, when it applies. But I perceive this joke as coming more often from a sense of superiority and an emotionally ill-conceived attempt to improve others by insulting them.

Or perhaps it comes out of pent up frustration at having to use them myself in work environments ;)

Re: Python now uses Mercurial

#58

Post by sigzero »

dchest wrote: post #15
jarin wrote: post #8

It's interesting that each major web language seems to have paired off with a different VCS: - Python + Hg - Ruby + Git - PHP + ...SVN?

- Tcl + Fossil http://code.activestate.com/lists/tcl-core/10108/ :-)

That is an excellent choice for them. Dr. Hipp (author of SQLite) is the author of Fossil and a big Tcl fan. Tcl is maintained by a small core team of developers. Just an overall good fit for them.

Re: Python now uses Mercurial

#59

Post by Peaker »

masklinn wrote: post #41
Peaker wrote: post #37

Earlier quoted context omitted.

git rebase -i, git reset --hard, git checkout

hg histedit, hg revert, hg update -r{any revspec}

I meant "git reset --hard" as a prefix for useful .

Can hg set the current branch to point anywhere in time?

Does histedit do exactly what "rebase" does? Does it also work with "--onto" and other rebase features?

Post reply on HN