I'm doing an eval of Deltawalker and while it seems to be a great tool, there isn't an obvious way to get it to integrate with mercurial so that I can do;
hg extdiff -r some_rev -r some_other_rev
Anyone know how to configure .hgrc to do that?
As suggested in this Meta answer, I'm moving the OP’s answer posted as an update into a real community wiki answer. —Helgi
See below, the nice folks at DeltaWalker answered via email. Before anyone asks, I have no connection with DeltaWalker, I'm just looking for a good Merge tool for MacOS. Until now I've been using Meld (also on Linux) but a recent update to macports broke it badly.
In the upcoming DeltaWalker release
we've made integration with Mercurial
a whole lot easier. As easy as a
single click, actually. Please grab
the following download:
http://www.deltopia.com/downloads/deltawalker-31-oct-2010-1-macosx-cocoa.dmg
And after installation simply go to
DeltaWalker > Preferences > General >
SCM Integration, then select the
checkbox next to the SCM you want to
integrate DeltaWalker with. It should
do all the work for you. Please let us
know if you encounter any issues.
Then Help has also been updated to
reflect the new functionality; if you
need to consult it, just bring it up
and search for 'SCM' for example.
Related
Searching the web for a graphic tool to represent function and method call dependencies, it seems that Pyan3 is a good one, if not the only one.
I have not found the installation instructions in this Github link: https://github.com/davidfraser/pyan
Could someone help?
Pyan3 maintainer here. As of today, pyan3 is on PyPI, so it can be installed via pip install pyan3. It installs a pyan3 script to easily call it from the terminal.
The current situation is that my repo gets the latest developments and fixes for Pyan3 as long as I'm maintaining it, and changes are occasionally (but not very often) pushed to davidfraser's repo via a PR, when we both feel like dealing with one. Additionally, he's keeping the final version of Pyan2 archived with the tag pre-python3.
I think there are currently some bugfixes in my repo which have not yet been pushed, particularly with regard to compatibility with Python 3.6 and later.
If you run into problems with Pyan3, please open an issue here.
Just clone the repo to install.
There is a 'visualize_pyan_architecture.sh' script you can look at for an example of how to run it. Within this, change the path to .py relative from where the script is located to try different .py files, you can have more than one and it will relate them in the graph produced. Beware trying *.py - I have found it can fail.
A little experimentation got me the results I wanted.
I found it best to export as .yed and use it's auto layout to make it readable. Then other layouts like orthogonal and radial really can give insight into complex projects.
If you use dot you may need to do something like:
sudo apt-get install graphviz
To get the dependencies.
my company is using mercurial and the client is using TFS. we need a 2 way sync process??
if there are some changes in TFS these should be reflected in mercurial and vice versa
need some solution
like if v made some batch process etc
thnx in advance
I have not seen anything about an hg-tfs process, but there is one for git (git-tfs)... Kinda hokey, but may provide an option in conjunction with hg-git.
You'd still have to write up some scripts and such to automate the communication between the servers.
Alternatively, maybe the git-tfs project could be a good starting place for a new hg-tfs project :)
We had to do a one-time conversion of a TFS repo into Mercurial, and didn't find any good way to do it. Initially we wanted to use [tfs2svn], and then hg convert the SVN repo.
Alas, tfs2svn isn't stable when it comes to complex renames and branching. I managed to convert a small repo that way, but had to write a custom tfs2hg utility to convert another repo, with 2 years worth of history.
If you find a solution, please post an answer.
Does anybody have any advice about using Mercurial as a front end for Perforce? What I would like to do is to use Mercurial to handle really granular changes and then, once I'm done something, push it back up to the Perforce server.
I found this article http://www.dehora.net/journal/2008/01/05/using-mercurial-with-perforce/ but it doesn't suggest any tooling to help out with the integrations. Does any exist? I suppose I am looking for it pull any new changes from Perforce, integrate them into my local Mercurial then roll up all the Mercurial commits I've made since last integration and push them up to Perforce. Similar to git-p4.
I got an error when I followed the link you gave. But I suggest you look into the perfarce extension (I love the name!). I have not used it myself, but it's my understanding that this is what people use to bridge the gap between Mercurial and Perforce.
See also the wiki page on Perforce concepts. It seems to have a lot of good info.
As Martin says, Perfarce is what you want. I've used it at a previous job, and in general it works pretty well if you're just working with a single perforce branch into a single mercurial clone. If you start cloning multiple times from your original Mercurial clone, then things start getting complex. Not impossible, just complex.
In general it works by bundling all changes since you last pulled from Perforce. Creating a single perforce changelist from them. Tagging that changelist's comment with the hash of the Mercurial version and committing it to perforce. It then re-imports that change from Perforce and merges it into your Mercurial tree, and because they're both the same there's no merge.
Basically it works quite well for pull/edit/commit/update workflows. Unfortunately it's not any help when it comes to integrations (unless I missed something) as perforce branches aren't converted to Mercurial ones. It wouldn't know what to merge.
I've got a fork of some Codeplex project. I wish to update my fork with the latest code in the official code (is that the trunk?).
How can I do this?
I'm also using TortoiseHG on Win7 x64.
Thanks :)
The commands are pull (to fetch the remote changes), and update to update your working directory to the most recent changeset.
Since you don't seem very familiar with the way Mercurial works, it would be a very good idea to read some introductory material like:
http://mercurial.aragost.com/kick-start/
http://hginit.com/
https://www.mercurial-scm.org/quickstart
http://hgbook.red-bean.com/read/a-tour-of-mercurial-the-basics.html
I am new to the dvcs world. My company uses perforce and I'm not a fan so I thought I'd try to use mercurial as a front end. I set it up on a windows machine with TortiseHG, enabled the Perfarce extension, did a small checkout (limiting the target revision) and pulled for the rest. This seemed to be more robust than clone alone.
This seems to be working fairly well as I've been able to get up to change 8700 or so.
My problem is with an error in the perforce repo. During the hg pull command it hits an error abort: file path/to/file.pl missing in p4 workspace and rolls back the transaction.
Is there anyway to bypass or skip that file and force it to continue since this is not a file I care about.
Update:
According to the admin, the file in question was a symlink. Would that cause this kind of problem? If so, how do I/admin fix or bypass it?
Is it possible to check out just a part of a perforce repo rather than the whole thing?
The issue is with symlinks that are not supported out on Windows.
This is fixed in the current version of Perfarce, which should appear in TortoiseHG soon.
I suggest that you have someone check that the Perforce repository is actually in a sane state. There might be something broken which you triggered and the data of your company might be at stake, so someone should definitely look what is causing the problem.