New extension: fixrenames

Martin Geisler mg at aragost.com
Fri Aug 19 07:02:43 UTC 2011


Stanimir Stamenkov <s7an10 at netscape.net> writes:

> Thu, 18 Aug 2011 09:27:08 +0200, /Martin Geisler/:
>
>> Please avoid private mails -- I do most of my Mercurial stuff at work
>> these days and a private mail goes in the back of the queue.
>>
>> But I just tried with the repo you talk about and the extension no
>> longer crashes for me. So I think the crash bug is solved?
>
> Yes, the crash bug is solved.  Sorry for not making it clear.

No problem, I was just a little confused :)

>> Stanimir Stamenkov writes:
>>
>> I don't have time to look into this right now, but I've uploaded the
>> repositories in question to Bitbucket. Here is the one you sent me:
>>
>>    https://bitbucket.org/mg/rename-test/
>>
>> and there is the result of running "hg fixrenames -s 50 --strip 4":
>>
>>    https://bitbucket.org/mg/rename-test-fixed-4/
>>
>>> So my problem appears to be not with bad renames, but with bad
>>> merges (caused by deficiencies in the SVN->Hg conversion I've
>>> pointed previously) involving renamed files - the renames are not
>>> accounted for in the merged revision. Could the 'fixrenames'
>>> extension also handle re-merge with similarity detection of such
>>> merge revisions?
>>
>> Yeah, it could do something more intelligent for merges. Right now it
>> always detects renames between ctx and ctx.p1().
>>
>> I'll be happy to merge in changes if you can come up with something
>> nice here.
>
> Thanks for responding and confirming merges could be handled in a
> better way. Unfortunately I have never programmed in Python and I have
> no knowledge of Mercurial code internals.

Well, you wont be the first to learn Python just to contribute to an
extension or to Mercurial itself :-) Python is easy to pick up, and we
have a friendly IRC channel to help you out: #mercurial on Freenode:

  http://webchat.freenode.net/?channels=mercurial

> I was mainly providing a feedback and I was checking if my specific
> case could be easily handled. I won't bother you further if you have
> no interest in it. Sorry for the private email - I was not sure if the
> list would accept a binary attachment (the zipped repo).

Okay, no problem. I do have an interest in making the extension better,
I just have little time to do it... that's always the problem with open
source software. Right now I'm doing full-time Mercurial consulting at
work, so if you like you can buy a chunk of my time if you like.
However, unless this is critical for you, I would probably hope someone
else finds the extension interesting and fixes the bug.

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://mercurial.aragost.com/kick-start/



More information about the Mercurial mailing list