[[[
Internal refactoring of svnmerge.py in preparation for addition of
a 'rollback' command. No functional change.
* contrib/client-side/svnmerge.py
(write_commit_log): New function to write the commit log file.
(action_merge): Modified to use the write_commit_log() function.
]]]
Index: contrib/client-side/svnmerge.py
===================================================================
--- contrib/client-side/svnmerge.py (revision 19600)
+++ contrib/client-side/svnmerge.py (working copy)
@@ -955,6 +955,14 @@
else:
assert False, "unhandled display style: %s" % display_style
+def write_commit_log(commit_file, msg):
+ "Write the commit message into the commit_file provided"
+
+ f = open(opts["commit-file"], "w")
+ print >>f, msg
+ f.close()
+ report('wrote commit message to "%s"' % commit_file)
+
def action_init(branch_dir, branch_props):
"""Initialize a branch for merges."""
# Check branch directory is ready for being modified
@@ -1108,20 +1116,19 @@
# Write out commit message if desired
if opts["commit-file"]:
- f = open(opts["commit-file"], "w")
+ commit_msg = ''
if record_only:
- print >>f, 'Recorded merge of revisions %s via %s from ' % \
- (revs | phantom_revs, NAME)
+ commit_msg = 'Recorded merge of revisions %s via %s from ' % \
+ (revs | phantom_revs, NAME)
else:
- print >>f, 'Merged revisions %s via %s from ' % \
- (revs | phantom_revs, NAME)
- print >>f, '%s' % opts["head-url"]
+ commit_msg = 'Merged revisions %s via %s from ' % \
+ (revs | phantom_revs, NAME)
+ commit_msg += '%s' % opts["head-url"]
if opts["commit-verbose"]:
- print >>f
- print >>f, construct_merged_log_message(opts["head-url"], revs),
+ commit_msg += '\n'
+ commit_msg += construct_merged_log_message(opts["head-url"], revs)
- f.close()
- report('wrote commit message to "%s"' % opts["commit-file"])
+ write_commit_log(opts["commit-file"], commit_msg)
# Update the set of merged revisions.
merged_revs = merged_revs | revs | reflected_revs | phantom_revs
Internal refactoring of svnmerge.py in preparation for addition of
a 'rollback' command. No functional change.
* contrib/client-side/svnmerge.py
(write_commit_log): New function to write the commit log file.
(action_merge): Modified to use the write_commit_log() function.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 10 10:21:53 2006