# Copyright (C) 2008-2009 Gianluca Montecchi # W. Trevor King # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import copy import os import libbe import libbe.command import libbe.command.util class Merge (libbe.command.Command): """Merge duplicate bugs >>> import sys >>> import libbe.bugdir >>> import libbe.comment >>> bd = libbe.bugdir.SimpleBugDir(memory=False) >>> cmd = Merge() >>> cmd._storage = bd.storage >>> cmd._setup_io = lambda i_enc,o_enc : None >>> cmd.stdout = sys.stdout >>> a = bd.bug_from_uuid('a') >>> a.comment_root.time = 0 >>> dummy = a.new_comment('Testing') >>> dummy.time = 1 >>> dummy = dummy.new_reply('Testing...') >>> dummy.time = 2 >>> b = bd.bug_from_uuid('b') >>> b.status = 'open' >>> b.comment_root.time = 0 >>> dummy = b.new_comment('1 2') >>> dummy.time = 1 >>> dummy = dummy.new_reply('1 2 3 4') >>> dummy.time = 2 >>> ret = cmd.run(args=['/a', '/b']) Merged bugs #abc/a# and #abc/b# >>> bd.flush_reload() >>> a = bd.bug_from_uuid('a') >>> a.load_comments() >>> a_comments = sorted([c for c in a.comments()], ... cmp=libbe.comment.cmp_time) >>> mergeA = a_comments[0] >>> mergeA.time = 3 >>> print a.string(show_comments=True) # doctest: +ELLIPSIS ID : a Short name : abc/a Severity : minor Status : open Assigned : Reporter : Creator : John Doe Created : ... Bug A --------- Comment --------- Name: abc/a/... From: ... Date: ... Testing --------- Comment --------- Name: abc/a/... From: ... Date: ... Testing... --------- Comment --------- Name: abc/a/... From: ... Date: ... Merged from bug #abc/b# --------- Comment --------- Name: abc/a/... From: ... Date: ... 1 2 --------- Comment --------- Name: abc/a/... From: ... Date: ... 1 2 3 4 >>> b = bd.bug_from_uuid('b') >>> b.load_comments() >>> b_comments = sorted([c for c in b.comments()], ... libbe.comment.cmp_time) >>> mergeB = b_comments[0] >>> mergeB.time = 3 >>> print b.string(show_comments=True) # doctest: +ELLIPSIS ID : b Short name : abc/b Severity : minor Status : closed Assigned : Reporter : Creator : Jane Doe Created : ... Bug B --------- Comment --------- Name: abc/b/... From: ... Date: ... 1 2 --------- Comment --------- Name: abc/b/... From: ... Date: ... 1 2 3 4 --------- Comment --------- Name: abc/b/... From: ... Date: ... Merged into bug #abc/a# >>> print b.status closed >>> bd.cleanup() """ name = 'merge' def __init__(self, *args, **kwargs): libbe.command.Command.__init__(self, *args, **kwargs) self.args.extend([ libbe.command.Argument( name='bug-id', metavar='BUG-ID', default=None, completion_callback=libbe.command.util.complete_bug_id), libbe.command.Argument( name='bug-id-to-merge', metavar='BUG-ID', default=None, completion_callback=libbe.command.util.complete_bug_id), ]) def _run(self, **params): bugdir = self._get_bugdir() bugA,dummy_comment = \ libbe.command.util.bug_comment_from_user_id( bugdir, params['bug-id']) bugA.load_comments() bugB,dummy_comment = \ libbe.command.util.bug_comment_from_user_id( bugdir, params['bug-id-to-merge']) bugB.load_comments() mergeA = bugA.new_comment('Merged from bug #%s#' % bugB.id.long_user()) newCommTree = copy.deepcopy(bugB.comment_root) for comment in newCommTree.traverse(): # all descendant comments comment.bug = bugA # uuids must be unique in storage if comment.alt_id == None: comment.storage = None comment.alt_id = comment.uuid comment.storage = bugdir.storage comment.uuid = libbe.util.id.uuid_gen() comment.save() # force onto disk under bugA for comment in newCommTree: # just the child comments mergeA.add_reply(comment, allow_time_inversion=True) bugB.new_comment('Merged into bug #%s#' % bugA.id.long_user()) bugB.status = 'closed' print >> self.stdout, 'Merged bugs #%s# and #%s#' \ % (bugA.id.user(), bugB.id.user()) return 0 def _long_help(self): return """ The second bug (B) is merged into the first (A). This adds merge comments to both bugs, closes B, and appends B's comment tree to A's merge comment. """