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
|
# Copyright (C) 2005 by Canonical Ltd
# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
from bzrlib.add import smart_add
from bzrlib.branch import Branch
from bzrlib.builtins import merge
from bzrlib.delta import compare_trees
from bzrlib.fetch import greedy_fetch
from bzrlib.merge import merge_inner
from bzrlib.revision import common_ancestor
from bzrlib.tests import TestCaseWithTransport
from bzrlib.workingtree import WorkingTree
class TestFileIdInvolved(TestCaseWithTransport):
def touch(self,filename):
f = file(filename,"a")
f.write("appended line\n")
f.close( )
def merge(self, branch_from, wt_to):
# minimal ui-less merge.
greedy_fetch(to_branch=wt_to.branch, from_branch=branch_from,
revision=branch_from.last_revision())
base_rev = common_ancestor(branch_from.last_revision(),
wt_to.branch.last_revision(),
wt_to.branch.repository)
merge_inner(wt_to.branch, branch_from.working_tree(),
wt_to.branch.repository.revision_tree(base_rev),
this_tree=wt_to)
wt_to.add_pending_merge(branch_from.last_revision())
def setUp(self):
super(TestFileIdInvolved, self).setUp()
# create three branches, and merge it
#
# /-->J ------>K (branch2)
# / \
# A ---> B --->C ---->D->G (main)
# \ / /
# \---> E---/----> F (branch1)
main_wt = self.make_branch_and_tree('main')
main_branch = main_wt.branch
self.build_tree(["main/a","main/b","main/c"])
main_wt.add(['a', 'b', 'c'], ['a-file-id-2006-01-01-abcd',
'b-file-id-2006-01-01-defg',
'c-funky<file-id> quiji%bo'])
main_wt.commit("Commit one", rev_id="rev-A")
#-------- end A -----------
b1 = main_branch.clone("branch1")
self.build_tree(["branch1/d"])
b1.working_tree().add('d')
b1.working_tree().commit("branch1, Commit one", rev_id="rev-E")
#-------- end E -----------
self.touch("main/a")
main_wt.commit("Commit two", rev_id="rev-B")
#-------- end B -----------
branch2_branch = main_branch.clone("branch2")
os.chmod("branch2/b",0770)
branch2_branch.working_tree().commit("branch2, Commit one",
rev_id="rev-J")
#-------- end J -----------
self.merge(b1, main_wt)
main_wt.commit("merge branch1, rev-11", rev_id="rev-C")
#-------- end C -----------
tree = WorkingTree('branch1', b1)
tree.rename_one("d","e")
tree.commit("branch1, commit two", rev_id="rev-F")
#-------- end F -----------
self.touch("branch2/c")
branch2_branch.working_tree().commit("branch2, commit two", rev_id="rev-K")
#-------- end K -----------
self.touch("main/b")
self.merge(b1, main_wt)
# D gets some funky characters to make sure the unescaping works
main_wt.commit("merge branch1, rev-12", rev_id="rev-<D>")
# end D
self.merge(branch2_branch, main_wt)
main_wt.commit("merge branch1, rev-22", rev_id="rev-G")
# end G
self.branch = main_branch
def test_fileid_involved_all_revs(self):
l = self.branch.fileid_involved( )
self.assertEquals( sorted(map( lambda x: x[0], l )), ["a","b","c","d"])
def test_fileid_involved_one_rev(self):
l = self.branch.fileid_involved("rev-B" )
self.assertEquals( sorted(map( lambda x: x[0], l )), ["a","b","c"])
def test_fileid_involved_two_revs(self):
l = self.branch.fileid_involved_between_revs("rev-B","rev-K" )
self.assertEquals( sorted(map( lambda x: x[0], l )), ["b","c"])
l = self.branch.fileid_involved_between_revs("rev-C","rev-<D>" )
self.assertEquals( sorted(map( lambda x: x[0], l )), ["b","d"])
l = self.branch.fileid_involved_between_revs("rev-C","rev-G" )
self.assertEquals( sorted(map( lambda x: x[0], l )), ["b","c","d"])
l = self.branch.fileid_involved_between_revs("rev-E","rev-G" )
self.assertEquals( sorted(map( lambda x: x[0], l )), ["a", "b","c","d"])
def test_fileid_involved_sets(self):
l = self.branch.fileid_involved_by_set(set(["rev-B"]))
self.assertEquals( sorted(map( lambda x: x[0], l )), ["a"])
l = self.branch.fileid_involved_by_set(set(["rev-<D>"]))
self.assertEquals( sorted(map( lambda x: x[0], l )), ["b"])
def test_fileid_involved_compare(self):
l1 = self.branch.fileid_involved_between_revs("rev-E", "rev-<D>")
l2 = self.branch.fileid_involved_by_set(set(["rev-<D>","rev-F","rev-C","rev-B"]))
self.assertEquals( l1, l2 )
l1 = self.branch.fileid_involved_between_revs("rev-C", "rev-G")
l2 = self.branch.fileid_involved_by_set(
set(["rev-G","rev-<D>","rev-F","rev-K","rev-J"]))
self.assertEquals( l1, l2 )
def test_fileid_involved_full_compare(self):
from bzrlib.tsort import topo_sort
pp=[]
history = self.branch.revision_history( )
if len(history) < 2: return
for start in range(0,len(history)-1):
for end in range(start+1,len(history)):
l1 = self.branch.fileid_involved_between_revs(
history[start], history[end])
old_tree = self.branch.repository.revision_tree(history[start])
new_tree = self.branch.repository.revision_tree(history[end])
delta = compare_trees(old_tree, new_tree )
l2 = [id for path, id, kind in delta.added] + \
[id for oldpath, newpath, id, kind, text_modified, \
meta_modified in delta.renamed] + \
[id for path, id, kind, text_modified, meta_modified in \
delta.modified]
self.assertEquals(l1, set(l2))
|