On Mon, 13 Jul 2009 15:12:36 -0400
"Dustin J. Mitchell" <[email protected]>
wrote:
> 2009/7/13 Marcin Zajączkowski <[email protected]>:
> > I you were interested I can prepare and submit patch to use at least
> > internal variable for that purposes.
>
> It's up to you -- if you think the patch would be useful for others
> (and if it's controlled by a command-line switch so that the current
> behavior remains the default), then we'll be happy to have a look.
During making a merge I realized that that information usually isn't
very attractive, because changed files are included in "log -v" on
a branch we merged to.
"log -v" in log file could be only useful when you merge a few commits
together and would like to know in which exactly what files were
changed.
But as I declared I made a patch, but instead of command line switch
there is only internal option, set by default to false.
The code seems to work, but I'm not a Python programmer so let me know
if I made something wrong.
Regards
Marcin
Index: svnmerge.py
===================================================================
--- svnmerge.py (revision 38444)
+++ svnmerge.py (working copy)
@@ -168,6 +168,7 @@
"block-prop": NAME + "-blocked",
"commit-verbose": True,
"verbose": 0,
+ "verbose-commit-log" : False,
}
logs = {}
@@ -1118,7 +1119,12 @@
def get_commit_log(url, revnum):
"""Return the log message for a specific integer revision
number."""
- out = launchsvn("log --incremental -r%d %s" % (revnum, url))
+ cmd = "log "
+ if opts["verbose-commit-log"]:
+ cmd += "-v "
+
+ cmd +="--incremental -r%d %s"
+ out = launchsvn(cmd % (revnum, url))
return recode_stdout_to_file("".join(out[1:]))
def construct_merged_log_message(url, revnums):
_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
