Ticket #4837 (new defect)

Opened 4 years ago

Last modified 3 years ago

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

Reported by: n1l0c2501+trac_hacks@gmail.com Assigned to: eblot
Priority: high Component: RevtreePlugin
Severity: major Keywords: MergeInfoEnchancer
Cc: rjollos, jsceballos@gmail.com, william.spinelli@sdfgroup.com 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

deleted-branches.patch (1.4 kB) - added by jsceballos@gmail.com on 05/20/09 13:41:04.
branch-from-branch.patch (0.6 kB) - added by soto on 08/31/10 00:32:08.
getmergeinfo.patch (1.4 kB) - added by AlexK|Ventuz on 09/01/10 12:37:04.
Enhanced handling for branch from branch problems which backtracks to a suitable source version instead of just skipping the node.

Change History

04/02/09 11:53:16 changed by n1l0c2501+trac_hacks@gmail.com

  • priority changed from normal to high.

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.

05/15/09 01:03:19 changed by rjollos

  • cc set to ryano@physiosonics.com.

05/20/09 00:49:07 changed by anonymous

  • cc changed from ryano@physiosonics.com to ryano@physiosonics.com, jsceballos@gmail.com.

05/20/09 13:41:04 changed by jsceballos@gmail.com

  • attachment deleted-branches.patch added.

05/20/09 13:44:17 changed by jsceballos@gmail.com

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

07/13/09 08:16:07 changed by william.spinelli@sdfgroup.com

  • cc changed from ryano@physiosonics.com, jsceballos@gmail.com to ryano@physiosonics.com, jsceballos@gmail.com, william.spinelli@sdfgroup.com.

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

Thanks

07/13/09 09:17:01 changed by anonymous

  • cc changed from ryano@physiosonics.com, jsceballos@gmail.com, william.spinelli@sdfgroup.com to rjollos, jsceballos@gmail.com, william.spinelli@sdfgroup.com.

03/03/10 15:25:55 changed by AdrianFritz

  • summary changed from MergeInfoEnhancer no such node after branch deletion to [Patch] MergeInfoEnhancer no such node after branch deletion.

08/31/10 00:31:17 changed by soto

  • summary changed from [Patch] MergeInfoEnhancer no such node after branch deletion to [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.

08/31/10 00:32:08 changed by soto

  • attachment branch-from-branch.patch added.

09/01/10 12:37:04 changed 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.

09/01/10 12:39:37 changed 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.

11/11/10 12:14:24 changed by william.spinelli@sdfgroup.com

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?).

Add/Change #4837 ([Patch] MergeInfoEnhancer no such node after branch deletion and branch from branch creation)




Change Properties
Action