Merge lp:~jelmer/bzr-builddeb/move-tag-upstream-version into lp:bzr-builddeb
- move-tag-upstream-version
- Merge into trunk
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Approved by: | James Westby |
| Approved revision: | 654 |
| Merged at revision: | 655 |
| Proposed branch: | lp:~jelmer/bzr-builddeb/move-tag-upstream-version |
| Merge into: | lp:bzr-builddeb |
| Diff against target: |
273 lines (+54/-54) 2 files modified
import_dsc.py (+0/-21) tests/test_import_dsc.py (+54/-33) |
| To merge this branch: | bzr merge lp:~jelmer/bzr-builddeb/move-tag-upstream-version |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bzr-builddeb-hackers | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
DistributionBra
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'import_dsc.py' | |||
| 2 | --- import_dsc.py 2011-11-29 14:34:28 +0000 | |||
| 3 | +++ import_dsc.py 2011-12-02 11:56:28 +0000 | |||
| 4 | @@ -444,27 +444,6 @@ | |||
| 5 | 444 | self.branch.tags.set_tag(tag_name, revid) | 444 | self.branch.tags.set_tag(tag_name, revid) |
| 6 | 445 | return tag_name | 445 | return tag_name |
| 7 | 446 | 446 | ||
| 8 | 447 | def tag_upstream_version(self, version, revid=None): | ||
| 9 | 448 | """Tags the upstream branch's last revision with an upstream version. | ||
| 10 | 449 | |||
| 11 | 450 | Sets a tag on the last revision of the upstream branch and on the main | ||
| 12 | 451 | branch with a tag that refers to the upstream part of the version | ||
| 13 | 452 | provided. | ||
| 14 | 453 | |||
| 15 | 454 | :param version: the upstream part of the version number to derive the | ||
| 16 | 455 | tag name from. | ||
| 17 | 456 | :param revid: the revid to associate the tag with, or None for the | ||
| 18 | 457 | tip of self.pristine_upstream_branch. | ||
| 19 | 458 | :return The tag name, revid of the added tag. | ||
| 20 | 459 | """ | ||
| 21 | 460 | assert isinstance(version, str) | ||
| 22 | 461 | tag_name = self.pristine_upstream_source.tag_name(version) | ||
| 23 | 462 | if revid is None: | ||
| 24 | 463 | revid = self.pristine_upstream_branch.last_revision() | ||
| 25 | 464 | self.pristine_upstream_source.tag_version(version, revid) | ||
| 26 | 465 | self.branch.fetch(self.pristine_upstream_branch) | ||
| 27 | 466 | self.branch.tags.set_tag(tag_name, revid) | ||
| 28 | 467 | return tag_name, revid | ||
| 29 | 468 | 447 | ||
| 30 | 469 | def _default_config_for_tree(self, tree): | 448 | def _default_config_for_tree(self, tree): |
| 31 | 470 | # FIXME: shouldn't go to configobj directly | 449 | # FIXME: shouldn't go to configobj directly |
| 32 | 471 | 450 | ||
| 33 | === modified file 'tests/test_import_dsc.py' | |||
| 34 | --- tests/test_import_dsc.py 2011-11-29 15:12:11 +0000 | |||
| 35 | +++ tests/test_import_dsc.py 2011-12-02 11:56:28 +0000 | |||
| 36 | @@ -146,6 +146,27 @@ | |||
| 37 | 146 | def do_commit_with_md5(self, tree, message, md5): | 146 | def do_commit_with_md5(self, tree, message, md5): |
| 38 | 147 | return tree.commit(message, revprops={"deb-md5":md5}) | 147 | return tree.commit(message, revprops={"deb-md5":md5}) |
| 39 | 148 | 148 | ||
| 40 | 149 | def tag_upstream_version(self, db, version): | ||
| 41 | 150 | """Tags the upstream branch's last revision with an upstream version. | ||
| 42 | 151 | |||
| 43 | 152 | Sets a tag on the last revision of the upstream branch and on the main | ||
| 44 | 153 | branch with a tag that refers to the upstream part of the version | ||
| 45 | 154 | provided. | ||
| 46 | 155 | |||
| 47 | 156 | :param version: the upstream part of the version number to derive the | ||
| 48 | 157 | tag name from. | ||
| 49 | 158 | :param revid: the revid to associate the tag with, or None for the | ||
| 50 | 159 | tip of self.pristine_upstream_branch. | ||
| 51 | 160 | :return The tag name, revid of the added tag. | ||
| 52 | 161 | """ | ||
| 53 | 162 | assert isinstance(version, str) | ||
| 54 | 163 | tag_name = db.pristine_upstream_source.tag_name(version) | ||
| 55 | 164 | revid = db.pristine_upstream_branch.last_revision() | ||
| 56 | 165 | db.pristine_upstream_source.tag_version(version, revid) | ||
| 57 | 166 | db.branch.fetch(db.pristine_upstream_branch) | ||
| 58 | 167 | db.branch.tags.set_tag(tag_name, revid) | ||
| 59 | 168 | return tag_name, revid | ||
| 60 | 169 | |||
| 61 | 149 | def test_create(self): | 170 | def test_create(self): |
| 62 | 150 | db = self.db1 | 171 | db = self.db1 |
| 63 | 151 | self.assertNotEqual(db, None) | 172 | self.assertNotEqual(db, None) |
| 64 | @@ -174,7 +195,7 @@ | |||
| 65 | 174 | tree = self.up_tree1 | 195 | tree = self.up_tree1 |
| 66 | 175 | version = "0.1" | 196 | version = "0.1" |
| 67 | 176 | revid = tree.commit("one") | 197 | revid = tree.commit("one") |
| 69 | 177 | db.tag_upstream_version(version) | 198 | self.tag_upstream_version(db, version) |
| 70 | 178 | tag_name = db.pristine_upstream_source.tag_name(version) | 199 | tag_name = db.pristine_upstream_source.tag_name(version) |
| 71 | 179 | self.assertEqual(tree.branch.tags.lookup_tag(tag_name), revid) | 200 | self.assertEqual(tree.branch.tags.lookup_tag(tag_name), revid) |
| 72 | 180 | 201 | ||
| 73 | @@ -200,7 +221,7 @@ | |||
| 74 | 200 | self.assertFalse(db.pristine_upstream_source.has_version("package", version, | 221 | self.assertFalse(db.pristine_upstream_source.has_version("package", version, |
| 75 | 201 | [("foo.tar.gz", None, self.fake_md5_1)])) | 222 | [("foo.tar.gz", None, self.fake_md5_1)])) |
| 76 | 202 | self.do_commit_with_md5(self.up_tree1, "one", self.fake_md5_1) | 223 | self.do_commit_with_md5(self.up_tree1, "one", self.fake_md5_1) |
| 78 | 203 | db.tag_upstream_version(version) | 224 | self.tag_upstream_version(db, version) |
| 79 | 204 | self.assertTrue(db.pristine_upstream_source.has_version("package", version)) | 225 | self.assertTrue(db.pristine_upstream_source.has_version("package", version)) |
| 80 | 205 | self.assertTrue(db.pristine_upstream_source.has_version("package", | 226 | self.assertTrue(db.pristine_upstream_source.has_version("package", |
| 81 | 206 | version, [("foo.tar.gz", None, self.fake_md5_1)])) | 227 | version, [("foo.tar.gz", None, self.fake_md5_1)])) |
| 82 | @@ -232,7 +253,7 @@ | |||
| 83 | 232 | tree = self.up_tree1 | 253 | tree = self.up_tree1 |
| 84 | 233 | version = "0.1" | 254 | version = "0.1" |
| 85 | 234 | revid = tree.commit("one") | 255 | revid = tree.commit("one") |
| 87 | 235 | db.tag_upstream_version(version) | 256 | self.tag_upstream_version(db, version) |
| 88 | 236 | self.assertEqual( | 257 | self.assertEqual( |
| 89 | 237 | db.pristine_upstream_source.version_as_revisions("package", version), | 258 | db.pristine_upstream_source.version_as_revisions("package", version), |
| 90 | 238 | { None: revid }) | 259 | { None: revid }) |
| 91 | @@ -424,13 +445,13 @@ | |||
| 92 | 424 | db = self.db1 | 445 | db = self.db1 |
| 93 | 425 | version1 = Version("0.1-1") | 446 | version1 = Version("0.1-1") |
| 94 | 426 | up_revid = self.up_tree1.commit("one") | 447 | up_revid = self.up_tree1.commit("one") |
| 96 | 427 | db.tag_upstream_version(version1.upstream_version) | 448 | self.tag_upstream_version(db, version1.upstream_version) |
| 97 | 428 | self.assertEqual( | 449 | self.assertEqual( |
| 98 | 429 | db.get_parents_with_upstream("package", version1, [version1], None), | 450 | db.get_parents_with_upstream("package", version1, [version1], None), |
| 99 | 430 | [up_revid]) | 451 | [up_revid]) |
| 100 | 431 | db = self.db2 | 452 | db = self.db2 |
| 101 | 432 | self.up_tree2.pull(self.up_tree1.branch) | 453 | self.up_tree2.pull(self.up_tree1.branch) |
| 103 | 433 | db.tag_upstream_version(version1.upstream_version) | 454 | self.tag_upstream_version(db, version1.upstream_version) |
| 104 | 434 | self.assertEqual( | 455 | self.assertEqual( |
| 105 | 435 | db.get_parents_with_upstream("package", version1, [version1], None), | 456 | db.get_parents_with_upstream("package", version1, [version1], None), |
| 106 | 436 | [up_revid]) | 457 | [up_revid]) |
| 107 | @@ -442,7 +463,7 @@ | |||
| 108 | 442 | revid1 = self.tree1.commit("one") | 463 | revid1 = self.tree1.commit("one") |
| 109 | 443 | db.tag_version(version1) | 464 | db.tag_version(version1) |
| 110 | 444 | up_revid = self.up_tree1.commit("upstream one") | 465 | up_revid = self.up_tree1.commit("upstream one") |
| 112 | 445 | db.tag_upstream_version(version1.upstream_version) | 466 | self.tag_upstream_version(db, version1.upstream_version) |
| 113 | 446 | # No upstream parent | 467 | # No upstream parent |
| 114 | 447 | self.assertEqual(db.get_parents_with_upstream( | 468 | self.assertEqual(db.get_parents_with_upstream( |
| 115 | 448 | "package", version2, [version2, version1], None), [revid1]) | 469 | "package", version2, [version2, version1], None), [revid1]) |
| 116 | @@ -457,8 +478,8 @@ | |||
| 117 | 457 | self.db2.tag_version(version2) | 478 | self.db2.tag_version(version2) |
| 118 | 458 | up_revid1 = self.up_tree1.commit("upstream one") | 479 | up_revid1 = self.up_tree1.commit("upstream one") |
| 119 | 459 | self.up_tree2.pull(self.up_tree1.branch) | 480 | self.up_tree2.pull(self.up_tree1.branch) |
| 122 | 460 | self.db1.tag_upstream_version(version1.upstream_version) | 481 | self.tag_upstream_version(self.db1, version1.upstream_version) |
| 123 | 461 | self.db2.tag_upstream_version(version2.upstream_version) | 482 | self.tag_upstream_version(self.db2, version2.upstream_version) |
| 124 | 462 | versions = [version3, version1, version2] | 483 | versions = [version3, version1, version2] |
| 125 | 463 | # No upstream parent | 484 | # No upstream parent |
| 126 | 464 | self.assertEqual(self.db2.get_parents_with_upstream( | 485 | self.assertEqual(self.db2.get_parents_with_upstream( |
| 127 | @@ -474,8 +495,8 @@ | |||
| 128 | 474 | self.db2.tag_version(version2) | 495 | self.db2.tag_version(version2) |
| 129 | 475 | up_revid1 = self.up_tree1.commit("upstream one") | 496 | up_revid1 = self.up_tree1.commit("upstream one") |
| 130 | 476 | self.up_tree2.pull(self.up_tree1.branch) | 497 | self.up_tree2.pull(self.up_tree1.branch) |
| 133 | 477 | self.db1.tag_upstream_version(version1.upstream_version) | 498 | self.tag_upstream_version(self.db1, version1.upstream_version) |
| 134 | 478 | self.db2.tag_upstream_version(version2.upstream_version) | 499 | self.tag_upstream_version(self.db2, version2.upstream_version) |
| 135 | 479 | versions = [version3, version2, version1] | 500 | versions = [version3, version2, version1] |
| 136 | 480 | # No upstream parent | 501 | # No upstream parent |
| 137 | 481 | self.assertEqual(self.db1.get_parents_with_upstream( | 502 | self.assertEqual(self.db1.get_parents_with_upstream( |
| 138 | @@ -490,8 +511,8 @@ | |||
| 139 | 490 | self.db2.tag_version(version1) | 511 | self.db2.tag_version(version1) |
| 140 | 491 | up_revid1 = self.up_tree1.commit("upstream one") | 512 | up_revid1 = self.up_tree1.commit("upstream one") |
| 141 | 492 | up_revid2 = self.up_tree2.commit("upstream two") | 513 | up_revid2 = self.up_tree2.commit("upstream two") |
| 144 | 493 | self.db1.tag_upstream_version(version1.upstream_version) | 514 | self.tag_upstream_version(self.db1, version1.upstream_version) |
| 145 | 494 | self.db2.tag_upstream_version(version2.upstream_version) | 515 | self.tag_upstream_version(self.db2, version2.upstream_version) |
| 146 | 495 | versions = [version2, version1] | 516 | versions = [version2, version1] |
| 147 | 496 | # Upstream parent as it is new upstream version | 517 | # Upstream parent as it is new upstream version |
| 148 | 497 | self.assertEqual(self.db2.get_parents_with_upstream( | 518 | self.assertEqual(self.db2.get_parents_with_upstream( |
| 149 | @@ -509,13 +530,13 @@ | |||
| 150 | 509 | revid3 = self.tree1.commit("three") | 530 | revid3 = self.tree1.commit("three") |
| 151 | 510 | self.db1.tag_version(version3) | 531 | self.db1.tag_version(version3) |
| 152 | 511 | up_revid1 = self.up_tree1.commit("upstream one") | 532 | up_revid1 = self.up_tree1.commit("upstream one") |
| 154 | 512 | self.db1.tag_upstream_version(version1.upstream_version) | 533 | self.tag_upstream_version(self.db1, version1.upstream_version) |
| 155 | 513 | self.up_tree2.pull(self.up_tree1.branch) | 534 | self.up_tree2.pull(self.up_tree1.branch) |
| 157 | 514 | self.db2.tag_upstream_version(version2.upstream_version) | 535 | self.tag_upstream_version(self.db2, version2.upstream_version) |
| 158 | 515 | up_revid2 = self.up_tree1.commit("upstream two") | 536 | up_revid2 = self.up_tree1.commit("upstream two") |
| 160 | 516 | self.db1.tag_upstream_version(version3.upstream_version) | 537 | self.tag_upstream_version(self.db1, version3.upstream_version) |
| 161 | 517 | self.up_tree2.pull(self.up_tree1.branch) | 538 | self.up_tree2.pull(self.up_tree1.branch) |
| 163 | 518 | self.db2.tag_upstream_version(version4.upstream_version) | 539 | self.tag_upstream_version(self.db2, version4.upstream_version) |
| 164 | 519 | versions = [version4, version3, version2, version1] | 540 | versions = [version4, version3, version2, version1] |
| 165 | 520 | # no upstream parent as the lesser branch has already merged it | 541 | # no upstream parent as the lesser branch has already merged it |
| 166 | 521 | self.assertEqual(self.db2.get_parents_with_upstream( | 542 | self.assertEqual(self.db2.get_parents_with_upstream( |
| 167 | @@ -527,9 +548,9 @@ | |||
| 168 | 527 | revid1 = self.tree1.commit("one") | 548 | revid1 = self.tree1.commit("one") |
| 169 | 528 | self.db1.tag_version(version1) | 549 | self.db1.tag_version(version1) |
| 170 | 529 | up_revid1 = self.up_tree1.commit("upstream one") | 550 | up_revid1 = self.up_tree1.commit("upstream one") |
| 172 | 530 | self.db1.tag_upstream_version(version1.upstream_version) | 551 | self.tag_upstream_version(self.db1, version1.upstream_version) |
| 173 | 531 | up_revid2 = self.up_tree2.commit("different upstream one") | 552 | up_revid2 = self.up_tree2.commit("different upstream one") |
| 175 | 532 | self.db2.tag_upstream_version(version2.upstream_version) | 553 | self.tag_upstream_version(self.db2, version2.upstream_version) |
| 176 | 533 | versions = [version2, version1] | 554 | versions = [version2, version1] |
| 177 | 534 | # a previous test checked that this wouldn't give an | 555 | # a previous test checked that this wouldn't give an |
| 178 | 535 | # upstream parent, but we are requiring one. | 556 | # upstream parent, but we are requiring one. |
| 179 | @@ -548,9 +569,9 @@ | |||
| 180 | 548 | self.db2.tag_version(version2) | 569 | self.db2.tag_version(version2) |
| 181 | 549 | self.db1.tag_version(version3) | 570 | self.db1.tag_version(version3) |
| 182 | 550 | up_revid1 = self.up_tree1.commit("upstream one") | 571 | up_revid1 = self.up_tree1.commit("upstream one") |
| 184 | 551 | self.db1.tag_upstream_version(version1.upstream_version) | 572 | self.tag_upstream_version(self.db1, version1.upstream_version) |
| 185 | 552 | self.up_tree2.pull(self.up_tree1.branch) | 573 | self.up_tree2.pull(self.up_tree1.branch) |
| 187 | 553 | self.db2.tag_upstream_version(version2.upstream_version) | 574 | self.tag_upstream_version(self.db2, version2.upstream_version) |
| 188 | 554 | versions = [version3, version2, version1] | 575 | versions = [version3, version2, version1] |
| 189 | 555 | # This is a sync but we are diverged so we should get two | 576 | # This is a sync but we are diverged so we should get two |
| 190 | 556 | # parents | 577 | # parents |
| 191 | @@ -568,11 +589,11 @@ | |||
| 192 | 568 | self.db2.tag_version(version2) | 589 | self.db2.tag_version(version2) |
| 193 | 569 | self.db1.tag_version(version3) | 590 | self.db1.tag_version(version3) |
| 194 | 570 | up_revid1 = self.up_tree1.commit("upstream one") | 591 | up_revid1 = self.up_tree1.commit("upstream one") |
| 196 | 571 | self.db1.tag_upstream_version(version1.upstream_version) | 592 | self.tag_upstream_version(self.db1, version1.upstream_version) |
| 197 | 572 | self.up_tree2.pull(self.up_tree1.branch) | 593 | self.up_tree2.pull(self.up_tree1.branch) |
| 199 | 573 | self.db2.tag_upstream_version(version2.upstream_version) | 594 | self.tag_upstream_version(self.db2, version2.upstream_version) |
| 200 | 574 | up_revid2 = self.up_tree1.commit("upstream two") | 595 | up_revid2 = self.up_tree1.commit("upstream two") |
| 202 | 575 | self.db1.tag_upstream_version(version3.upstream_version) | 596 | self.tag_upstream_version(self.db1, version3.upstream_version) |
| 203 | 576 | versions = [version3, version2, version1] | 597 | versions = [version3, version2, version1] |
| 204 | 577 | # This a sync, but we are diverged, so we should get two | 598 | # This a sync, but we are diverged, so we should get two |
| 205 | 578 | # parents. There should be no upstream as the synced | 599 | # parents. There should be no upstream as the synced |
| 206 | @@ -591,14 +612,14 @@ | |||
| 207 | 591 | self.db2.tag_version(version2) | 612 | self.db2.tag_version(version2) |
| 208 | 592 | self.db1.tag_version(version3) | 613 | self.db1.tag_version(version3) |
| 209 | 593 | up_revid1 = self.up_tree1.commit("upstream one") | 614 | up_revid1 = self.up_tree1.commit("upstream one") |
| 211 | 594 | self.db1.tag_upstream_version(version1.upstream_version) | 615 | self.tag_upstream_version(self.db1, version1.upstream_version) |
| 212 | 595 | self.up_tree2.pull(self.up_tree1.branch) | 616 | self.up_tree2.pull(self.up_tree1.branch) |
| 214 | 596 | self.db2.tag_upstream_version(version2.upstream_version) | 617 | self.tag_upstream_version(self.db2, version2.upstream_version) |
| 215 | 597 | up_revid2 = self.up_tree1.commit("upstream two") | 618 | up_revid2 = self.up_tree1.commit("upstream two") |
| 217 | 598 | self.db1.tag_upstream_version(version3.upstream_version) | 619 | self.tag_upstream_version(self.db1, version3.upstream_version) |
| 218 | 599 | versions = [version3, version2, version1] | 620 | versions = [version3, version2, version1] |
| 219 | 600 | up_revid3 = self.up_tree2.commit("different upstream two") | 621 | up_revid3 = self.up_tree2.commit("different upstream two") |
| 221 | 601 | self.db2.tag_upstream_version(version3.upstream_version) | 622 | self.tag_upstream_version(self.db2, version3.upstream_version) |
| 222 | 602 | versions = [version3, version2, version1] | 623 | versions = [version3, version2, version1] |
| 223 | 603 | # test_get_parents_with_upstream_sync_new_upstream | 624 | # test_get_parents_with_upstream_sync_new_upstream |
| 224 | 604 | # checks that there is not normally an upstream parent | 625 | # checks that there is not normally an upstream parent |
| 225 | @@ -675,7 +696,7 @@ | |||
| 226 | 675 | version1.upstream_version, [("foo.tar.gz", None, self.fake_md5_1)]) | 696 | version1.upstream_version, [("foo.tar.gz", None, self.fake_md5_1)]) |
| 227 | 676 | self.assertEqual(branch, None) | 697 | self.assertEqual(branch, None) |
| 228 | 677 | self.do_commit_with_md5(self.up_tree1, "one", self.fake_md5_1) | 698 | self.do_commit_with_md5(self.up_tree1, "one", self.fake_md5_1) |
| 230 | 678 | self.db1.tag_upstream_version(version1.upstream_version) | 699 | self.tag_upstream_version(self.db1, version1.upstream_version) |
| 231 | 679 | # Version and md5 available, so we get the correct branch. | 700 | # Version and md5 available, so we get the correct branch. |
| 232 | 680 | branch = self.db2.branch_to_pull_upstream_from("package", | 701 | branch = self.db2.branch_to_pull_upstream_from("package", |
| 233 | 681 | version1.upstream_version, [("foo.tar.gz", None, self.fake_md5_1)]) | 702 | version1.upstream_version, [("foo.tar.gz", None, self.fake_md5_1)]) |
| 234 | @@ -698,7 +719,7 @@ | |||
| 235 | 698 | version1.upstream_version, [("foo.tar.gz", None, self.fake_md5_1)]) | 719 | version1.upstream_version, [("foo.tar.gz", None, self.fake_md5_1)]) |
| 236 | 699 | self.assertEqual(branch, None) | 720 | self.assertEqual(branch, None) |
| 237 | 700 | self.up_tree2.pull(self.up_tree1.branch) | 721 | self.up_tree2.pull(self.up_tree1.branch) |
| 239 | 701 | self.db2.tag_upstream_version(version1.upstream_version) | 722 | self.tag_upstream_version(self.db2, version1.upstream_version) |
| 240 | 702 | # And we get the greatest branch when two lesser branches | 723 | # And we get the greatest branch when two lesser branches |
| 241 | 703 | # have what we are looking for. | 724 | # have what we are looking for. |
| 242 | 704 | branch = self.db3.branch_to_pull_upstream_from("package", | 725 | branch = self.db3.branch_to_pull_upstream_from("package", |
| 243 | @@ -714,10 +735,10 @@ | |||
| 244 | 714 | version = Version("0.1-1") | 735 | version = Version("0.1-1") |
| 245 | 715 | self.do_commit_with_md5(self.up_tree1, "upstream one", | 736 | self.do_commit_with_md5(self.up_tree1, "upstream one", |
| 246 | 716 | self.fake_md5_1) | 737 | self.fake_md5_1) |
| 248 | 717 | self.db1.tag_upstream_version(version.upstream_version) | 738 | self.tag_upstream_version(self.db1, version.upstream_version) |
| 249 | 718 | up_revid = self.do_commit_with_md5(self.up_tree2, "upstream two", | 739 | up_revid = self.do_commit_with_md5(self.up_tree2, "upstream two", |
| 250 | 719 | self.fake_md5_1) | 740 | self.fake_md5_1) |
| 252 | 720 | self.db2.tag_upstream_version(version.upstream_version) | 741 | self.tag_upstream_version(self.db2, version.upstream_version) |
| 253 | 721 | revid = self.do_commit_with_md5(self.tree1, "one", self.fake_md5_2) | 742 | revid = self.do_commit_with_md5(self.tree1, "one", self.fake_md5_2) |
| 254 | 722 | self.db1.tag_version(version) | 743 | self.db1.tag_version(version) |
| 255 | 723 | self.assertNotEqual(self.tree2.branch.last_revision(), revid) | 744 | self.assertNotEqual(self.tree2.branch.last_revision(), revid) |
| 256 | @@ -732,7 +753,7 @@ | |||
| 257 | 732 | version = Version("0.1-1") | 753 | version = Version("0.1-1") |
| 258 | 733 | up_revid = self.do_commit_with_md5(self.up_tree1, "upstream one", | 754 | up_revid = self.do_commit_with_md5(self.up_tree1, "upstream one", |
| 259 | 734 | self.fake_md5_1) | 755 | self.fake_md5_1) |
| 261 | 735 | self.db1.tag_upstream_version(version.upstream_version) | 756 | self.tag_upstream_version(self.db1, version.upstream_version) |
| 262 | 736 | revid = self.do_commit_with_md5(self.tree1, "one", self.fake_md5_2) | 757 | revid = self.do_commit_with_md5(self.tree1, "one", self.fake_md5_2) |
| 263 | 737 | self.db1.tag_version(version) | 758 | self.db1.tag_version(version) |
| 264 | 738 | self.assertNotEqual(self.tree2.branch.last_revision(), revid) | 759 | self.assertNotEqual(self.tree2.branch.last_revision(), revid) |
| 265 | @@ -748,7 +769,7 @@ | |||
| 266 | 748 | version = "0.1" | 769 | version = "0.1" |
| 267 | 749 | up_revid = self.do_commit_with_md5(self.up_tree1, "upstream one", | 770 | up_revid = self.do_commit_with_md5(self.up_tree1, "upstream one", |
| 268 | 750 | self.fake_md5_1) | 771 | self.fake_md5_1) |
| 270 | 751 | self.db1.tag_upstream_version(version) | 772 | self.tag_upstream_version(self.db1, version) |
| 271 | 752 | self.assertNotEqual(self.up_tree2.branch.last_revision(), up_revid) | 773 | self.assertNotEqual(self.up_tree2.branch.last_revision(), up_revid) |
| 272 | 753 | self.db2.pull_upstream_from_branch(self.db1, "package", version) | 774 | self.db2.pull_upstream_from_branch(self.db1, "package", version) |
| 273 | 754 | self.assertEqual(self.up_tree2.branch.last_revision(), up_revid) | 775 | self.assertEqual(self.up_tree2.branch.last_revision(), up_revid) |
