Changeset 2625
- Timestamp:
- Dec 6, 2005, 5:54:57 PM (18 years ago)
- Location:
- branches/0.9-stable/trac/versioncontrol
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.9-stable/trac/versioncontrol/svn_fs.py
r2574 r2625 458 458 pool = Pool(self.pool) 459 459 root = fs.revision_root(self.fs_ptr, self.rev, pool()) 460 if self.rev > 0:461 prev_root = fs.revision_root(self.fs_ptr, self.rev - 1, pool())462 460 editor = repos.RevisionChangeCollector(self.fs_ptr, self.rev, pool()) 463 461 e_ptr, e_baton = delta.make_editor(editor, pool()) … … 467 465 copies, deletions = {}, {} 468 466 changes = [] 467 revroots = {} 469 468 for path, change in editor.changes.items(): 470 469 if not self.authz.has_permission(path): … … 485 484 else: 486 485 action = Changeset.EDIT 487 change.base_rev = fs.node_created_rev(prev_root, 488 change.base_path, pool()) 489 change.base_path = fs.node_created_path(prev_root, 490 change.base_path, pool()) 486 b_path, b_rev = change.base_path, change.base_rev 487 if revroots.has_key(b_rev): 488 b_root = revroots[b_rev] 489 else: 490 b_root = fs.revision_root(self.fs_ptr, b_rev, pool()) 491 revroots[b_rev] = b_root 492 change.base_path = fs.node_created_path(b_root, b_path, pool()) 493 change.base_rev = fs.node_created_rev(b_root, b_path, pool()) 491 494 kind = _kindmap[change.item_kind] 492 495 path = path[len(self.scope) - 1:] -
branches/0.9-stable/trac/versioncontrol/tests/svn_fs.py
r2572 r2625 93 93 94 94 def test_repos_normalize_rev(self): 95 self.assertEqual(1 4, self.repos.normalize_rev('latest'))96 self.assertEqual(1 4, self.repos.normalize_rev('head'))97 self.assertEqual(1 4, self.repos.normalize_rev(''))98 self.assertEqual(1 4, self.repos.normalize_rev(None))95 self.assertEqual(16, self.repos.normalize_rev('latest')) 96 self.assertEqual(16, self.repos.normalize_rev('head')) 97 self.assertEqual(16, self.repos.normalize_rev('')) 98 self.assertEqual(16, self.repos.normalize_rev(None)) 99 99 self.assertEqual(11, self.repos.normalize_rev('11')) 100 100 self.assertEqual(11, self.repos.normalize_rev(11)) … … 104 104 self.assertEqual(None, self.repos.previous_rev(0)) 105 105 self.assertEqual(0, self.repos.previous_rev(1)) 106 self.assertEqual(1 4, self.repos.youngest_rev)106 self.assertEqual(16, self.repos.youngest_rev) 107 107 self.assertEqual(6, self.repos.next_rev(5)) 108 108 self.assertEqual(7, self.repos.next_rev(6)) 109 109 # ... 110 self.assertEqual(None, self.repos.next_rev(1 4))110 self.assertEqual(None, self.repos.next_rev(16)) 111 111 112 112 def test_has_node(self): … … 313 313 changes.next()) 314 314 self.assertRaises(StopIteration, changes.next) 315 315 316 def test_changeset_edit_after_wc2wc_copy__original_deleted(self): 317 chgset = self.repos.get_changeset(16) 318 self.assertEqual(16, chgset.rev) 319 changes = chgset.get_changes() 320 self.assertEqual(('branches/v2', Node.DIRECTORY, Changeset.COPY, 321 'tags/v1.1', 14), 322 changes.next()) 323 self.assertEqual(('branches/v2/README2.txt', Node.FILE, 324 Changeset.EDIT, 'trunk/README2.txt', 6), 325 changes.next()) 326 self.assertRaises(StopIteration, changes.next) 327 316 328 317 329 class ScopedSubversionRepositoryTestCase(unittest.TestCase): -
branches/0.9-stable/trac/versioncontrol/tests/svnrepos.dump
r2572 r2625 467 467 468 468 469 Revision-number: 15 470 Prop-content-length: 162 471 Content-length: 162 472 473 K 7 474 svn:log 475 V 62 476 Removing original file, just before committing the wc->wc copy 477 K 10 478 svn:author 479 V 5 480 cboos 481 K 8 482 svn:date 483 V 27 484 2005-12-06T12:47:36.271020Z 485 PROPS-END 486 487 Node-path: tags/v1.1/README2.txt 488 Node-action: delete 489 490 491 Revision-number: 16 492 Prop-content-length: 138 493 Content-length: 138 494 495 K 7 496 svn:log 497 V 38 498 Committing wc->wc copy + local changes 499 K 10 500 svn:author 501 V 5 502 cboos 503 K 8 504 svn:date 505 V 27 506 2005-12-06T12:47:51.122376Z 507 PROPS-END 508 509 Node-path: branches/v2 510 Node-kind: dir 511 Node-action: add 512 Node-copyfrom-rev: 14 513 Node-copyfrom-path: tags/v1.1 514 515 516 Node-path: branches/v2/README2.txt 517 Node-kind: file 518 Node-action: change 519 Text-content-length: 47 520 Text-content-md5: 9b7bad978c6ad159f939c3db2038cbb1 521 Content-length: 47 522 523 A test + local modifications after wc->wc copy 524 525
Note:
See TracChangeset
for help on using the changeset viewer.