1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
# Copyright (C) 2008-2012 Chris Ball <cjb@laptop.org>
# Gianluca Montecchi <gian@grys.it>
# W. Trevor King <wking@tremily.us>
#
# This file is part of Bugs Everywhere.
#
# Bugs Everywhere 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.
#
# Bugs Everywhere 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
# Bugs Everywhere. If not, see <http://www.gnu.org/licenses/>.
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)
>>> io = libbe.command.StringInputOutput()
>>> io.stdout = sys.stdout
>>> ui = libbe.command.UserInterface(io=io)
>>> ui.storage_callbacks.set_storage(bd.storage)
>>> cmd = Merge(ui=ui)
>>> 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 = ui.run(cmd, 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, +REPORT_UDIFF
ID : a
Short name : abc/a
Severity : minor
Status : open
Assigned :
Reporter :
Creator : John Doe <jdoe@example.com>
Created : ...
Bug A
--------- Comment ---------
Name: abc/a/...
From: ...
Date: ...
<BLANKLINE>
Testing
--------- Comment ---------
Name: abc/a/...
From: ...
Date: ...
<BLANKLINE>
Testing...
--------- Comment ---------
Name: abc/a/...
From: ...
Date: ...
<BLANKLINE>
Merged from bug #abc/b#
--------- Comment ---------
Name: abc/a/...
From: ...
Date: ...
<BLANKLINE>
1 2
--------- Comment ---------
Name: abc/a/...
From: ...
Date: ...
<BLANKLINE>
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, +REPORT_UDIFF
ID : b
Short name : abc/b
Severity : minor
Status : closed
Assigned :
Reporter :
Creator : Jane Doe <jdoe@example.com>
Created : ...
Bug B
--------- Comment ---------
Name: abc/b/...
From: ...
Date: ...
<BLANKLINE>
1 2
--------- Comment ---------
Name: abc/b/...
From: ...
Date: ...
<BLANKLINE>
1 2 3 4
--------- Comment ---------
Name: abc/b/...
From: ...
Date: ...
<BLANKLINE>
Merged into bug #abc/a#
>>> print b.status
closed
>>> ui.cleanup()
>>> 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):
storage = self._get_storage()
bugdirs = self._get_bugdirs()
bugdirA,bugA,comment = (
libbe.command.util.bugdir_bug_comment_from_user_id(
bugdirs, params['bug-id']))
bugA.load_comments()
bugdirB,bugB,dummy_comment = (
libbe.command.util.bugdir_bug_comment_from_user_id(
bugdirs, 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 = 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.
"""
|
