0

I am working on setup of my hg for django projects on my mac.

I need to do two things :

  • set some mechanism to save my password and use it whenever I use repo again

I've tried to do that by adding keyring extension to my .hg/hgrc file like this :

[extensions]
mercurial_keyring =

but it doesn't work. I am getting such an error :

*** failed to import extension mercurial_keyring: No module named mercurial_keyring

Should I install that extension with pip / easy_install before?

Because on Windows using HgTortoise I modified my hgrd file, added those two lines and it works just fine.

I thought it would do the work on mac os x as well.

  • set some default merge-tool, which would be launched whenever I use hg merge command and there would be some confilicts to resolve

How can I do that?

Here is my current hg files configuration :

~/.hgrc

[ui]
username = johny bravo <johny.bravo@gmail.com>

.../myproject/.hg/hgrc

[paths]
default = https://bitbucket.org/johnybravo/firstdjango

[extensions]
mercurial_keyring =

According to some tutorials and articles about hg I'd read before that should do the work.

But doesn't work in my case.

Btw. Is there any nice external merge tool for hg? Vimdiff is terrible for me...

I also use SourceTree for version control sometimes, but it seems it doesn't contain any merge tool.

Is there any tool that looks similar to SourceTree? ( nice, readable, colorful GUI ).

A perfect merge-tool would be one compatibile both with SourceTree and hg merge from command line so I coulde use them alternately.

4

2 回答 2

0

[路径] 默认 = https://bitbucket.org/johnybravo/firstdjango

添加：“default-push = https://username:password@bitbucket.org/johnybravo/firstdjango ”，不带引号。

使用 ssh 是另一种更复杂的设置方式，无需输入用户名/密码即可推送。

于 2012-09-25T18:14:58.387 回答
0

根据Keyring 扩展 wiki

此扩展不随 Mercurial 分发

因此：如您所见，在没有完整路径或一些初步操作的情况下向 hgrc 添加扩展将不起作用

这个答案展示了 Keyring 的正确完整 pip 类型安装

关于“hg 的不错的外部合并工具？” 我不得不说“口味可能不同”，但任何适用于 Mac 的 diff-merge 工具都可以在 Mercurial 中使用

于 2012-09-23T04:16:28.530 回答