News for hackers. Stuff that matters.
Re:Gitless – An experimental version control system built on... by e12e on Wednesday March 04, 2015 @02:46PM (#9146828)
> I'd love to see something that makes git easier to use.

I'm not really aware of any problems with mercurial's git-support[1]. It might not really be "working with git", but does support working with (as in pushing and pulling) git repos. And while I think there'll never be a consensus on mercurial versus git -- I find that the interface is much cleaner in mercurial, than with git.

So if by "easier" you mean "easier command line use", I think mercurial is worth a look. If not, perhaps look at various guis -- but I've not got any experience with them.

    hg help git
    Working with Git Repositories
    """""""""""""""""""""""""""""

    Basic Use
    ---------

    You can clone a Git repository from Hg by running "hg
    clone <url> [dest]".
    For example, if you were to run:

      $ hg clone git://github.com/schacon/hg-git.git

    Hg-Git would clone the repository and convert it to an
    Hg repository for you.

    (...)

    If you are starting from an existing Hg repository,
    you have to set up a Git repository somewhere that
    you have push access to, add a path entry
    for it in your .hg/hgrc file, and then run "hg push 
    [name]" from within your repository. For example:

      $ cd hg-git # (an Hg repository)
      $ # edit .hg/hgrc and add the target Git URL in
        # the paths section
      $ hg push
[1] http://hg-git.github.io/
Re:Gitless – An experimental version control system built on... by david-given on Wednesday March 04, 2015 @04:57PM (#9147641)
Unfortunately, it's not quite that easy --- to be able to push, you need git+ssh, and I've never made that work with github (it just hangs saying something about git-upload-pack), and it doesn't seem to help you with some of the more horrible git interactions, such as doing a pull from upstream to your forked github repository.

(And I suspect that if I could do that reliably I would have internalised enough git to use that natively.)

Re:Gitless – An experimental version control system built on... by e12e on Wednesday March 04, 2015 @11:00PM (#9149165)
Hm... you're right about needing to use ssh+git -- at least with github[1] (I don't have anything on github yet, I just host my own mercurial repos across a couple of machines for whatever I'm working on).

However, after forking a repo on github, everything seems to work fine for me:

    hg clone git+ssh://[email protected]:e12e/QuickTun.git qt.hg
    cd qt.hg
    echo "Mercurial hg-git test." > test
    hg add test
    hg ci -m "Just a test of hg-git push/pull to github."
    hg push
    # outputs:
    pushing to git+ssh://[email protected]:e12e/QuickTun.git
    Warning: Permanently added the RSA host key for IP
    address '192.30.252.131' to the list of known hosts.
    searching for changes
    adding objects
    added 1 commits with 1 trees and 1 blobs
    updating reference refs/heads/master
I can see how the need for using ssh could be a problem on windows, where you need to (AFAIK) get plink/putty working. A quick search seems to indicate that there's no support for using paramiko (python native ssh client/server) for the mercurial client.

> it doesn't seem to help you with some of the more horrible git interactions, such as doing a pull from upstream to your forked github repository.

Continuing from above, nothing stops you from:

    hg pull git+ssh://[email protected]:UCIS/QuickTun.git
Although working with multiple remotes in mercurial is generally done by adding them to .hg/hgrc.

Eg adding:

    upstream = git+ssh://[email protected]:UCIS/QuickTun.git
Allows you to do:

    hg pull upstream
and

   hg push upstream
And you can get a sense of what's going on:

    hg tags
    tip                               59:b6067e2362b5
    default/master                    59:b6067e2362b5
    upstream/master                   58:e5d10c76fcad
Not sure if that helps vis-a-vis using git, but as I said, I find the mercurial commands more intuitive, consistent and friendly -- to the point that I find it makes quite a difference for me, personally.

That said, if you want to/have to work with github-based repositories, you might be better off just sticking with git.

[1] https://github.com/schacon/hg-git/issues/152

Re:Gitless – An experimental version control system built on... by david-given on Thursday March 05, 2015 @05:44PM (#9154407)
Hmm. I never thought it was so simple. I'll have more of a play and see if I can make it work. I'd _much_ rather use hg than git. Thanks.