Modify

Opened 8 years ago

Last modified 6 years ago

#4837 new defect

[Patch] MergeInfoEnhancer no such node after branch deletion and branch from branch creation

Reported by: n1l0c2501+trac_hacks@… Owned by: Emmanuel Blot
Priority: high Component: RevtreePlugin
Severity: major Keywords: MergeInfoEnchancer
Cc: Ryan J Ollos, Javier Sanz, william.spinelli@… Trac Release: 0.11

Description

After deleting a concluded branch in my repository revtree refuses to render giving the error:

No node branches/testbranch at revision 8

Note: The revision number is so low because I created a new test repository/trac instance to make sure it wasn't a problem in my development site.

Disabling the MergeInfoEnchancer allows revtree to render the tree again.

From my trac log:

2009-03-26 21:50:12,727 Trac[model] WARNING: Changeset neither a known branch or tag: {'kind': 'dir', 'base_rev': u'-1', 'base_path': None, 'path': u'branches', 'unique': False, 'change': 'add'}
2009-03-26 21:50:12,727 Trac[model] WARNING: Changeset neither a known branch or tag: {'kind': 'file', 'base_rev': u'-1', 'base_path': None, 'path': u'one', 'unique': False, 'change': 'add'}
2009-03-26 21:50:12,729 Trac[api] DEBUG: Enhancers: [<revtree.enhancer.SimpleEnhancerModule object at 0xbaa1a9ac>, <mergeinfoenhancer.enhancer.MergeInfoEnhancerModule object at 0xba67f16c>]
2009-03-26 21:50:12,732 Trac[main] WARNING: 404 No such node (No node branches/testbranch at revision

Attachments (3)

deleted-branches.patch (1.4 KB) - added by Javier Sanz 8 years ago.
branch-from-branch.patch (597 bytes) - added by soto 6 years ago.
getmergeinfo.patch (1.4 KB) - added by AlexK|Ventuz 6 years ago.
Enhanced handling for branch from branch problems which backtracks to a suitable source version instead of just skipping the node.

Download all attachments as: .zip

Change History (13)

comment:1 Changed 8 years ago by n1l0c2501+trac_hacks@…

Priority: normalhigh

I should also point out that I can fix the issue by disabling the 'Show deleted branches' option in the revtree screen, however I think that having a clear view of when branches start and end is helpful in the revision tree.

comment:2 Changed 8 years ago by Ryan J Ollos

Cc: ryano@… added; anonymous removed

comment:3 Changed 8 years ago by anonymous

Cc: Javier Sanz added

Changed 8 years ago by Javier Sanz

Attachment: deleted-branches.patch added

comment:4 Changed 8 years ago by Javier Sanz

I'm sure that there are better ways to fix it but the patch above seems to work for me. Feedback is appreciated.

comment:5 Changed 8 years ago by william.spinelli@…

Cc: william.spinelli@… added

I had a similar problem #5477, and applying this patch fixed it.

Thanks

comment:6 Changed 8 years ago by anonymous

Cc: Ryan J Ollos added; ryano@… removed

comment:8 Changed 7 years ago by Adrian Fritz

Summary: MergeInfoEnhancer no such node after branch deletion[Patch] MergeInfoEnhancer no such node after branch deletion

comment:9 Changed 6 years ago by soto

Summary: [Patch] MergeInfoEnhancer no such node after branch deletion[Patch] MergeInfoEnhancer no such node after branch deletion and branch from branch creation

I had similar problem like this after creating branch from another branch(merged to trunk, but this can not be important).

So i created similar patch which fixed it for me.

Changed 6 years ago by soto

Attachment: branch-from-branch.patch added

Changed 6 years ago by AlexK|Ventuz

Attachment: getmergeinfo.patch added

Enhanced handling for branch from branch problems which backtracks to a suitable source version instead of just skipping the node.

comment:10 Changed 6 years ago by AlexK|Ventuz

I attached my own version of a fix which not just skips the problematic node but backtracks the source of the branch to get to a valid revision. Not very elegant but works. If the node is just skipped, no merge information for the branch is retrieved and a number of incorrect merge arrows are rendered.

comment:11 Changed 6 years ago by william.spinelli@…

I've applied the proposed patch attachment:"getmergeinfo.patch" and it seems to work properly. With the previous two I was able to render a tree only hiding deleted branches, instead now I can render the full revision graph.

I've applied this patch together with the other two (are they still needed?).

Modify Ticket

Action
as new The owner will remain Emmanuel Blot.

Add Comment


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

 
Note: See TracTickets for help on using tickets.