[Svnmerge] [PATCH] Indented log patch modified v2

[Raman Gupta]

Attached is a modified version of Alan Barrett's patch for indented log
entries for the commit log message. It takes into account some feedback
from Giovanni related to performance, and also fixes the problem brought
up by Alan himself regarding extra lines.

Note that I have removed the logic for making the log separator longer
depending on the longest previous separator. I find this is unnecessary
when indenting is used.

Here is a candidate commit log message:

Indent the merged revisions' log messages when creating the commit log
message after executing svn merge. Removed the previous functionality of
creating a log separator that is longer than the longest previous
separator. Indenting the log message is clear on its own because each
nested merge will be indented one additional level.

Patch by: Alan Barrett <apb at cequrux.com>
Reviewed by: Giovanni Bajo <rasky at develer.com>
Tweaked by: Raman Gupta <rocketraman at fastmail.fm>

* contrib/client-side/svnmerge.py
  (prefix_lines):
    New method to take a string and prepend each line of the string
      with a specified string. The lines are delimited by newlines
      characters.
  (construct_merged_log_message):
    Removed old mechanism of making the log separator longer for
    nested merge log messages. Added indentation for each commit
    log message. Added check for empty log messages, which should
    never happen but doesn't hurt.

Cheers,
Raman Gupta

-------------- next part --------------
A non-text attachment was scrubbed...
Name: log-indent-v2.patch
Type: text/x-patch
Size: 2076 bytes
Desc: not available
Url : /pipermail/svnmerge/attachments/20060228/b47acb1e/attachment.bin