Modify

Opened 7 years ago

Closed 6 years ago

Last modified 6 years ago

#1695 closed defect (wontfix)

Not seeing merges with LogEnhancer

Reported by: chris@… Owned by: eblot
Priority: normal Component: RevtreePlugin
Severity: normal Keywords:
Cc: Trac Release: 0.11

Description

Trac 0.10.3 
TracRevTreePlugin 0.4.7.3dev
TracRevtreeEnhancers 0.1.1dev

Components config looks like:

logenhancer.logenhancer.logenhancer = enabled
revtree.* = enabled
revtree.enhancer = disabled
revtree.enhancer.simpleenhancer = disabled

I see fine arrows at branch creation time (creates), and black circles on deleted branches (terminates) - but whatever syntax I use for merge (delivers 3 or delivers [3] or delivers 3:9 or delivers |3]:[9] or delivers 3,9 or delivers [3],[9]) I don't see any merge arrows or rounded blocks.

I note that the admin gui is setting logenhancer.logenhancer.logenhancer.

I have also tried logenhancer.* = enabled.

I see that the wiki talks about the plugin appears as revtree.logenhancer in the plugin list. So I also tried revtree.logenhancer.* = enabled.

Not getting anywhere :/

Any hints as to what I'm doing wrong would be gladly received :) Have I simply misunderstood the log format for this one? My python is just not good enough to be able to follow the code sadly.

Attachments (0)

Change History (5)

comment:1 Changed 6 years ago by anonymous

I have the same problem.
What is st:deliver properties in LogEnhancer python script?

comment:2 Changed 6 years ago by eblot

LogEnhancer is a demo enhancer: you need to write you own SVN hook scripts so that they add the required information to the SVN repository in order to track merges. st:deliver is one of those properties.

Have a look at revtreeplugin/0.11/hooks for example of such scripts. I have unfortunately no time to document these scripts.

I'm currently evaluating SVN 1.5 (RC4) that supports a basic merge tracking feature. In other words, merge can be tracked without the need of custom log messages. The MergeEnhancer plugin will probably updated in a couple of weeks or so to support SVN 1.5 and provide "true" merge info in the generated graph. Stay tuned.

comment:3 Changed 6 years ago by anonymous

I didn't mean use any extra properties in svn repository the same as st:deliver.
I wait tortoise with support svn 1.5 :) and I don't want to use beta version of svnmerge and tortoise.
Thank you for response.

At now I have the following changes in order to logenhancer only works with log messages :

import re

line:72 in logenhancer.py
 for chgset in branch.changesets():
                msg = chgset.changeset.message.lower()
                if msg.startswith('delivers'):
                    if chgset.prop('st:export'):
                        svgchgset = svgbranch.svgchangeset(chgset)
                        svgchgset.set_shape('hexa')
                    """chgset.prop('st:deliver')"""
                    parts = re.findall('\d+', msg)
                    deliver = parts[0] + "," + parts[1]

                    if not deliver:
                        continue
                    try:

Thank you.

comment:4 Changed 6 years ago by eblot

  • Resolution set to wontfix
  • Status changed from new to closed

There's no way to get merge info in Revtree if these properties are not available in the SVN repository, so either:

comment:5 Changed 6 years ago by eblot

  • Trac Release changed from 0.10 to 0.11

Add Comment

Modify Ticket

Action
as closed .
as The resolution will be set. Next status will be 'closed'.
to The owner will be changed from eblot. Next status will be 'closed'.
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.