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 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398
|
#!/usr/bin/env nosetests
# -*- coding: utf-8 -*-
#
# This file is part of git-big-picture
#
# Copyright (C) 2010 Sebastian Pipping <sebastian@pipping.org>
# Copyright (C) 2010 Julius Plenz <julius@plenz.com>
# Copyright (C) 2010-12 Valentin Haenel <valentin.haenel@gmx.de>
#
# git-big-picture 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 3 of the License, or
# (at your option) any later version.
#
# git-big-picture 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 git-big-picture. If not, see <http://www.gnu.org/licenses/>.
import os
import tempfile as tf
import shutil as sh
import unittest as ut
import git_big_picture as gbp
import shlex
debug=False
# The only reason these global commands work, is because we change the cwd of
# the test script... ugly.
def dispatch(command_string):
return gbp.get_command_output(shlex.split(command_string))
def tag(sha1, tag_name):
dispatch('git tag %s %s' % (tag_name, sha1))
def get_head_sha():
return dispatch('git rev-parse HEAD').rstrip()
def empty_commit(mess):
dispatch('git commit --allow-empty -m %s' % mess)
return get_head_sha()
def print_dict(dict_):
for (k, v) in dict_.iteritems():
print k, v
class TestGitTools(ut.TestCase):
def setUp(self):
""" Setup testing environment.
Create temporary directory, initialise git repo, and set some options.
"""
self.testing_dir = tf.mkdtemp(prefix='gbp-testing-', dir="/tmp")
if debug:
print self.testing_dir
self.oldpwd = os.getcwd()
os.chdir(self.testing_dir)
dispatch('git init')
dispatch('git config user.name git-big-picture')
dispatch('git config user.email git-big-picture@example.org')
def tearDown(self):
""" Remove testing environment """
if not debug:
sh.rmtree(self.testing_dir)
os.chdir(self.oldpwd)
@property
def graph(self):
return gbp.graph_factory(self.testing_dir)
def test_find_roots(self):
def create_root(branch_name):
dispatch('git read-tree --empty')
new_tree = dispatch('git write-tree').strip()
new_commit = dispatch('git commit-tree %s -m empty' %
new_tree).strip()
dispatch('git branch %s %s' % (branch_name, new_commit))
return new_commit
a = empty_commit('a')
b = empty_commit('b')
graph = self.graph
self.assertEqual(graph.roots, [a])
c = create_root('C')
graph = self.graph
self.assertEqual(set(graph.roots), set([a, c]))
d = create_root('D')
graph = self.graph
self.assertEqual(set(graph.roots), set([a, c, d]))
e = create_root('E')
graph = self.graph
self.assertEqual(set(graph.roots), set([a, c, d, e]))
def filter_roots(self):
a = empty_commit('a')
b = empty_commit('b')
graph = self.graph
filterd_graph = graph.filter(roots=True)
expected_parents = {
a: set(),
b: set((a,)),
}
self.assertEqual(expected_parents, filterd_graph.parents)
def test_find_merges_bifurcations(self):
""" Check that finding merges and bifurcations works.
master other
| |
A---B---D
\ /
--C--
"""
a = empty_commit('a')
b = empty_commit('b')
dispatch('git checkout -b other HEAD^')
c = empty_commit('c')
dispatch('git merge master')
d = get_head_sha()
graph = self.graph
self.assertEqual(set(graph.merges), set([d]))
self.assertEqual(set(graph.bifurcations), set([a]))
def test_get_parent_map(self):
""" Check get_parent_map() works:
master other
| |
A---B---D
\ /
--C--
"""
a = empty_commit('a')
b = empty_commit('b')
dispatch('git checkout -b other HEAD^')
c = empty_commit('c')
dispatch('git merge --no-ff master')
d = get_head_sha()
expected_parents = {
a: set(),
b: set((a,)),
c: set((a,)),
d: set((c, b)),
}
self.assertEqual(gbp.Git(self.testing_dir).get_parent_map(),
expected_parents)
def test_filter_one(self):
""" Remove a single commit from between two commits.
A---B---C
| |
one master
No ref pointing to B, thus it should be removed.
"""
a = empty_commit('A')
dispatch('git branch one')
b = empty_commit('B')
c = empty_commit('C')
graph = self.graph
filterd_graph = graph.filter()
expected_reduced_parents = {
a: set(),
c: set((a,)),
}
self.assertEqual(expected_reduced_parents, filterd_graph.parents)
def test_filter_with_tags(self):
""" Remove three commits and root commit
A---B---C---D---E---F
| |
0.1 master
"""
a = empty_commit('A')
b = empty_commit('B')
dispatch('git tag 0.1')
c = empty_commit('C')
d = empty_commit('D')
e = empty_commit('E')
f = empty_commit('F')
graph = self.graph
# use the defaults
filterd_graph = graph.filter()
expected_reduced_parents = {
a: set(),
b: set((a,)),
f: set((b,)),
}
self.assertEqual(expected_reduced_parents, filterd_graph.parents)
filterd_graph = graph.filter(roots=False)
expected_reduced_parents = {
b: set(),
f: set((b,)),
}
self.assertEqual(expected_reduced_parents, filterd_graph.parents)
filterd_graph = graph.filter(tags=False)
expected_reduced_parents = {
a: set(),
f: set((a,)),
}
self.assertEqual(expected_reduced_parents, filterd_graph.parents)
def test_no_commit_tags(self):
""" Test for tree-tag and a blob-tag.
"""
a = empty_commit('A')
f = open('foo', 'w')
f.writelines('bar')
f.close()
blob_hash = dispatch('git hash-object -w foo').rstrip()
dispatch('git tag -m "blob-tag" blob-tag ' + blob_hash)
os.mkdir('baz')
f = open('baz/foo', 'w')
f.writelines('bar')
f.close()
dispatch('git add baz/foo')
tree_hash = dispatch('git write-tree --prefix=baz').rstrip()
dispatch('git tag -m "tree-tag" tree-tag ' + tree_hash)
dispatch('git reset')
graph = self.graph
filterd_graph = graph.filter()
expected_reduced_parents = {
blob_hash: set(),
tree_hash: set(),
a: set(),
}
self.assertEqual(expected_reduced_parents, filterd_graph.parents)
def test_parent_of_parent_loop(self):
""" Test the case, where an alternative route may lead to a parents
parent.
0.1 0.2 master
| | |
A---B---C---D---E---F
\ /
--G--
0.1 0.2 master
| | |
A---D---F
\ /
------
"""
a = empty_commit('A')
tag(a, '0.1')
b = empty_commit('B')
c = empty_commit('C')
d = empty_commit('D')
tag(d, '0.2')
e = empty_commit('E')
dispatch('git checkout -b topic %s' % c)
g = empty_commit('G')
dispatch('git checkout master')
dispatch('git merge topic')
f = get_head_sha()
dispatch('git branch -d topic')
graph = self.graph
filterd_graph = graph.filter()
expected_reduced_parents = {
d: set((a,)),
a: set(),
f: set((a, d,)),
}
self.assertEqual(expected_reduced_parents, filterd_graph.parents)
def test_expose_multi_parent_bug(self):
""" Test for a peculiar bug that used to exist in pruning the graph.
Before:
A---B---C---D---E---F master
| | \ /
0.0 0.1 N---O---P topic
After:
0.0---0.1---master
\ /
topic
"""
a = empty_commit('A')
tag(a, '0.0')
b = empty_commit('B')
tag(b, '0.1')
c = empty_commit('C')
d = empty_commit('D')
e = empty_commit('E')
dispatch('git checkout -b topic %s' % c)
n = empty_commit('N')
o = empty_commit('O')
p = empty_commit('P')
dispatch('git checkout master')
dispatch('git merge topic')
f = get_head_sha()
graph = self.graph
filterd_graph = graph.filter()
expected_reduced_parents = {
b: set((a,)),
a: set(),
f: set((p, b,)),
p: set((b,)),
}
print "a", a
print "b", b
print "p", p
print "f", f
print dispatch("git log --oneline %s..%s" % (f, p))
print_dict(expected_reduced_parents)
print_dict(graph.parents)
self.assertEqual(expected_reduced_parents, filterd_graph.parents)
def more_realistic(self):
""" Test a slightly larger DAG
input:
0.1.1 0.1.2
| |
0.0 G---H---I---J---K---L---M maint
| /
A---B---C---D---E---F master
| \ /
0.1 N---O---P topic
output:
0.1.1---0.1.2---maint
/
0.0---0.1---master
\ /
topic
"""
a = empty_commit('A')
tag(a, '0.0')
b = empty_commit('B')
tag(b, '0.1')
c = empty_commit('C')
d = empty_commit('D')
e = empty_commit('E')
dispatch('git checkout -b maint %s' % b)
g = empty_commit('G')
h = empty_commit('H')
tag(h, '0.1.1')
i = empty_commit('I')
j = empty_commit('J')
tag(j, '0.1.2')
k = empty_commit('K')
l = empty_commit('L')
m = empty_commit('M')
dispatch('git checkout -b topic %s' % c)
n = empty_commit('N')
o = empty_commit('O')
p = empty_commit('P')
dispatch('git checkout master')
dispatch('git merge topic')
f = get_head_sha()
graph = self.graph
filterd_graph = graph.filter()
expected_reduced_parents = {
m: set((j,)),
j: set((h,)),
h: set((b,)),
b: set((a,)),
a: set(),
f: set((p, b,)),
p: set((b,)),
}
print_dict(expected_reduced_parents)
print_dict(graph.parents)
self.assertEqual(expected_reduced_parents, filterd_graph.parents)
|