I'm using Mercurial with TortoiseHG for version control, but I've recently installed SourceTree to have a look at it. There I've known about the Flow extension and looks quite interesting.
So I'm wondering if there's any more-or-less-official extension to add support for hgflow in TortoiseHG. I've come across thgflow, but I don't know if it works, if the project is still active, if there are other alternatives...
Any insight?
SourceTree's GUI for hgflow provides only 50% of the extension's features. Try the command line if you can. The extension is very nice and easy to use.
Related
Some years ago, Mercurial | TortoiseHG could exchange data bidirectionally easy with at least 2 Big Brothers:
Subversion, using HGSubversion
Git, using HG-Git
Current (6.0 versions of family) state - the ordinary users have none:
hg-subversion is broken (extension can't be loaded), bundled with THG (Mercurial ???) extension not updated since 2019 hgsubversion: 6a6ce9d9da35 2019-04-19 (extraction from my TortoiseHg\extension-versions.txt), external SVN-bindings exist only for Python 2.7 (while py3-movement inside Mercurial is live and active)
hg-git got some big troubles, starting from THG 4.9 (manual patching of library.zip was required), on 6 version the situation has gotten better (no patching), but still unsatisfactory for the common user - installing Python 2.7 (for single-user) and using pip isn't The Right Way (tm)
Are there any comments, additions, clarifications, recommendations on how to do it (if what I am doing is wrong)?
Addition after some testing: special verson tortoisehg-6.0hggit-x64.msi from Matt Harbison at least allow using hg-git with ssh-transport (not http yet) and can be recommended for every-day usage by ordinary user.
So, as a current maintainer of hg-git and former contributor to hgsubversion, I think I can provide some context here.
Regarding hgsubversion, the short answer that it is either dead or — at best — extremely dormant. Personally, I have not interacted with a Subversion repository in years, and that's a common experience. No-one has been sufficiently motivated to fix bugs, keep it working, and — last, but not least — make it work with Python 3.
For hg-git, a period of semi-dormant state meant that the TortoiseHg maintainers stopped bundling it. We now keep up with Mercurial releases, and I've requested that they reverse that decision. I believe they bundle Dulwich, but as I don't use Windows, I can't say for sure. That said, it's quite reasonable to want to use hg-git with TortoiseHg, and if you run into any specific issues, I'd suggest you file a bug with them — or perhaps add a comment to the bug I linked earlier.
Generally speaking, you should be able to use 0.10.x version of hg-git with most versions of TortoiseHg, as I believe they bundle Dulwich. In that case, enabling the extension should be as simple as:
hg clone -u 0.10.x http://foss.heptapod.net/mercurial/hg-git /path/to/repo
And then adding the following to your .hgrc:
[extensions]
hggit = /path/to/repo/hggit
Once TortoiseHg moves to Python 3.x, the default branch of hg-git will work with it again.
EDIT: I was wrong; they don't bundle Dulwich, it seems. On the bug for this, one of the maintainers posted a link to a packaged installer that includes hg-git & Dulwich. The next release, 6.1, should fix this. Please consider testing the installer, and report to the TortoiseHg maintainers whether it works as expected.
EDIT²: Please note that only SSH works with that installer, as they ran into some issues bundling urllib3, which is necessary for HTTP support.
TortoiseHG 6.2
Bundled hg-git works (at least with GitHub), but for now only for https:// repos:
old worked ssh-access failed with complaining about my keys
With the new keypair (still RSA) and PageAnt-x64 (for THG-x64) I got both access-methods in game
I am a bit new to hg and while I am familiar with the python-based repo tool (used in project like the Android Open Source Project) I am not aware of one for Mercurial. Is there such a tool for hg?
I'm not very familiar with repo, but my understanding was that it allowed them to construct a project out of lots of smaller repositories.
If that's the case then it's just built in. Subrepositories.
Edlund was kind enough to open-source their repoman tool, which was directly inspired by the Android project's repo tool as I understand the history.
Is there such a thing as a web-based equivalent of the repository explorer /manager for Mercurial?
I know there's hgserve and I've seen SCM Manager but as far as I can see, these will only let you browse and push.
What I'm looking for is a web client with support for update and commit (and maybe also pull) commands.
BTW I'm not looking for the 'update on push' hook.
You should give Kallithea a try! It is a full-featured source code management system with support for both Mercurial and Git. It has a ton of features and allows you to edit files directly in the browser.
I followed the answer from this posting:
How to use Mercurial, Maven and Eclipse together?
But the "Check out Maven Projects from SCM" still does not allow me to use Mercurial SCM.
The only option I get is "svn" in the dropdown, and even if I ignore the drop down and enter in "scm:hg:http://myMercurialRepoURL"
I'm using:
Eclipse 3.6.1
m2eclipse 0.12 from http://m2eclipse.sonatype.org/sites/m2e
"Maven SCM handler for Subclipse" 0.12.0 from m2eclipse extra's site (sorry, I would give the URL, but my new account doesn't have enough rep)
MercurialEclipse 1.8.1 from http://cbes.javaforge.com/update
And I've uninstalled, and reinstall those plugins in that order.
I'm able to use Maven in projects, and use Mercurial separately in Eclipse - it's just this one Wizard that seems to be broken, which leads me to believe that if I try to Materialize an Artifact from a Mercurial repo that it will also fail.
Has anyone had any luck with this Wizard? Perhaps on earlier versions? Is this a new bug?
Thanks
As far my search went, I didn't get to find a suitable connector for mercurial and m2eclipse (in terms of only using IDE). However, I did an experiment wherein I cloned a copy of the source from outside the IDE. (via TortoiseHg specifically)
Afterwards, assuming you have already m2e installed in Eclipse:
Go to File > import > maven > existing maven projects, then select the folder where you've originally pulled/cloned your source code.
I believe by doing so, you'll see the m2e commands in the project's context menu (via run as), and effective use mercurial commands. (via team context menu)
At least for now, this is better not using m2e and mercurial at the same time.
If anyone has a more streamlined approach, I'm also curious. :D
Recently my IT guy decided to move over from SVN to mercurial, now I need a good GUI tool that will do the remote clone and so on. I tried murky and macMerial, I can't figure out how to get them either to work. I've been using "versions" for svn.
Thanks
And so, what's wrong with Murky? You just have to download the latest zip, launch the application and either clone the repository (if you didn't do it already) or drag it into Murky's window. After that, just double click on the projet and voila!
I found the Sourcetree app quite nice, which became available for free recently.
TortoiseHg seems to have some MacOS support.
I'll bet the issue here is not that the GUI isn't good. It's that the underlying concepts of how SVN and Mercurial work are too different for things to translate well.
Learn Mercurial, and then use a GUI for convenience (although personally I don't bother using a GUI in anything except Perforce, and I'm not saying that because I think the perforce GUI is good)
Start here