[Geany-devel] Geany Plugins SVN Commit URLs

[Jiří Techet]

On Thu, Nov 3, 2011 at 03:18, Matthew Brush <mbrush at codebrainz.ca> wrote:
> On 11/02/2011 08:17 AM, Jiří Techet wrote:
>>
>> On Tue, Nov 1, 2011 at 15:43, Matthew Brush<mbrush at codebrainz.ca>  wrote:
>>>
>>> On 11-11-01 06:11 AM, Jiří Techet wrote:
>>>>
>>>> On Sun, Oct 30, 2011 at 23:25, Matthew Brush<mbrush at codebrainz.ca>
>>>>  wrote:
>>>>>
>>>>> On 11-10-30 03:03 PM, Frank Lanitz wrote:
>>>>>>
>>>>>> On Sun, 30 Oct 2011 02:15:33 -0700
>>>>>> Matthew Brush<mbrush at codebrainz.ca>      wrote:
>>>>>>
>>>>>>> Hi,
>>>>>>>
>>>>>>> I haven't heard too much about the Git conversion of Geany Plugins,
>>>>>>> but I wanted to offer a suggestion that might improve the commit
>>>>>>> messages compared to Geany's.  In the Geany's Git repository there's
>>>>>>> links back to the SVN repository in the commit messages (the links
>>>>>>> are broken BTW). I was wondering if it would be better to have these
>>>>>>> links point to a place we have more control over, for example using a
>>>>>>> Geany commit, instead of this in the commit message:
>>>>>>>
>>>>>>> git-svn-id:
>>>>>>> https://geany.svn.sourceforge.net/svnroot/geany/trunk@5970
>>>>>>> ea778897-0a13-0410-b9d1-a72fbfd435f5
>>>>>>>
>>>>>>> We could have something like this:
>>>>>>>
>>>>>>> git-svn-id:
>>>>>>> [ea778897-0a13-0410-b9d1-a72fbfd435f5]
>>>>>>> (http://svn.geany.org/svnroot/geany/trunk?rev=5970)
>>>>>>>
>>>>>>> That way we could make the links work and be able to move the old SVN
>>>>>>> repository without breaking all the links in the commit message. I
>>>>>>> guess we'd need a little redirect script or something on geany.org.
>>>>>>> Note also the use of Markdown link syntax, which might render better
>>>>>>> on Github (not sure).
>>>>>>
>>>>>> I'm afraid I don't get what is needed here? Did I got you right to
>>>>>> setup complete mirror of ancient svn on geany.org?
>>>>>>
>>>>>
>>>>> Or easier, just make some URL forwarders/rewrites on geany.org so we
>>>>> don't
>>>>> have to depend on SourceForge.net to always store the SVN repo and
>>>>> never
>>>>> change URLs.  The SVN URLs in the Git commit messages will never be
>>>>> able
>>>>> to
>>>>> change ever in the future, so if we point it to a location we control,
>>>>> then
>>>>> we can ensure they remain valid.
>>>>>
>>>>>  From Jiri's other message though, it sounds like the SVN URLs in the
>>>>> Git
>>>>> commit messages are all going to be broken like the one's in Geany's
>>>>> Git
>>>>> repository, since it's not an option of the conversion script to change
>>>>> them.  I don't feel like hacking the conversion script to change the
>>>>> URL
>>>>> that goes in the commit message, and anyway, as long as it contains the
>>>>> SVN
>>>>> revision, it's still useful.
>>>>
>>>> Another option would be to use
>>>>
>>>> git filter-branch --msg-filter command
>>>>
>>>> where command would be some sed expression which would substitute the
>>>> current format with the required format. Maybe a bit easier, still
>>>> something I don't want to spend my time on ;-). The only reason I
>>>> included the SVN metadata was the commit ID which is useful to have
>>>> because some commits refer to it in their comments and this
>>>> information would be lost otherwise.
>>>>
>>>
>>> What about something as simple as:
>>>
>>> sed |git-svn-id:
>>>
>>> https://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-plugins|SVN:|
>>>
>>> To at least remove the invalid URL, or better yet:
>>>
>>> sed |geany-plugins@|geany-plugins?revision=|
>>>
>>> Or similar, so that the URL is not broken?
>>>
>>> If it's easy enough, I'd say it's worthwhile.
>>
>> Hi Matthew,
>>
>> could you test if it does the right thing with git filter-branch? (I'm
>> quite busy these days.)
>>
>
> All on one line:
>
> git filter-branch --msg-filter "sed -e
> 's|svnroot/geany-plugins/trunk/geany-plugins@|viewvc/geany-plugins\?view=revision\&revision=|'"
> HEAD
>
> Works fine at least looking at quite a few of the commits in gitk and has
> the advantage of linking to the better ViewVC code browser that SourceForge
> offers.
>

OK, thanks. So is there any "official" conclusion which format should
be used? (I don't have any strong preference here.)

Also when should the final conversion be done? I fight with time a bit
these days but the conversion of geany-plugins requires much less
manual changes than the conversion of Geany's repository so I can
reserve the hour or two for it (almost) any time. Just tell the date.

Cheers,
Jiri