[Svnmerge] [PATCH] Separated log messages

[Blair Zajac]

Hello,

Here's a patch for svnmerge to use the commit log message separator I 
previously proposed.

Since I was offline when I was working on this patch, it does a number 
of things:

1) Uses ........ as the basic separator for inidividual commit messages. 
  If an existing commit contains n*8*'.', then it'll use (n+1)*8*'.' for 
the separator.

2) s/repo/repos/  I don't recall seeing the repo shortcut being used. 
It's all repos in the svn repository.

3) I thought it best that get_commit_log() returns the commit log header 
from the standard svn log command unchanged, as I know that I'll want to 
parse the svnmerge generated commit messages and I don't want two 
different styles of commit log headers.  So now, get_commit_log() just 
takes the log message and trims off the leading 70*'-' line.

4) construct_merged_log_message(): New function that builds a log 
message.  The previous locations where this was done by hand now call 
this function.

5) I found that when you use -v for the avail command,

$ ~/svnmerge/svnmerge-trunk/svnmerge.py -v avail
svnmerge: calculate head path for the branch
svnmerge: head is "file:///Users/blair/svnmerge/repos/editorial/trunk"
svnmerge: skipping phantom revisions: 
86-93,95-100,102,110,120,133,147,166-167
81-85,94,101,103-109,111-119,121-132,134-146,148-165

The problem is that with a long list of revisions, the last message and 
the actual revision result can get merged.  So if -v is used, then it 
looks like this with a line of text separating them:

$ ~/svnmerge/svnmerge-trunk/svnmerge.py -v avail
svnmerge: calculate head path for the branch
svnmerge: head is "file:///Users/blair/svnmerge/repos/editorial/trunk"
svnmerge: skipping phantom revisions: 
86-93,95-100,102,110,120,133,147,166-167
svnmerge: available revisions to be merged are:
81-85,94,101,103-109,111-119,121-132,134-146,148-165

Once this gets in and buy-off from the people on this list, I'd like to 
check it in immediately into svn trunk and submit it for the 1.3 branch. 
  If we find bugs, we can fix them over there.  This will also help get 
more people working with the new version (hopefully) sooner to work out 
any bugs.

Regards,
Blair

-- 
Blair Zajac, Ph.D.
<blair at orcaware.com>
Subversion and Orca training and consulting
http://www.orcaware.com/svn/
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: svnmerge-separated-log-messages-patch.txt
Url: /pipermail/svnmerge/attachments/20051019/5b9ea161/attachment.txt