Show More
@@ -154,7 +154,6 b' class GitInMemoryChangeset(BaseInMemoryC' | |||||
154 |
|
154 | |||
155 | # Update vcs repository object & recreate dulwich repo |
|
155 | # Update vcs repository object & recreate dulwich repo | |
156 | self.repository.revisions.append(commit.id) |
|
156 | self.repository.revisions.append(commit.id) | |
157 | self.repository._repo = Repo(self.repository.path) |
|
|||
158 | # invalidate parsed refs after commit |
|
157 | # invalidate parsed refs after commit | |
159 | self.repository._parsed_refs = self.repository._get_parsed_refs() |
|
158 | self.repository._parsed_refs = self.repository._get_parsed_refs() | |
160 | tip = self.repository.get_changeset() |
|
159 | tip = self.repository.get_changeset() |
@@ -470,9 +470,11 b' class GitChangesetTest(unittest.TestCase' | |||||
470 | for fname, revision_dict in files.items(): |
|
470 | for fname, revision_dict in files.items(): | |
471 | for rev, data in revision_dict.items(): |
|
471 | for rev, data in revision_dict.items(): | |
472 | cs = self.repo.get_changeset(rev) |
|
472 | cs = self.repo.get_changeset(rev) | |
473 | ann = cs.get_file_annotate(fname) |
|
|||
474 |
|
473 | |||
475 |
l1 = [x[1] |
|
474 | l1_1 = [x[1] for x in cs.get_file_annotate(fname)] | |
|
475 | l1_2 = [x[2]().raw_id for x in cs.get_file_annotate(fname)] | |||
|
476 | self.assertEqual(l1_1, l1_2) | |||
|
477 | l1 = l1_1 | |||
476 | l2 = files[fname][rev]['changesets'] |
|
478 | l2 = files[fname][rev]['changesets'] | |
477 | self.assertTrue(l1 == l2 , "The lists of revision for %s@rev %s" |
|
479 | self.assertTrue(l1 == l2 , "The lists of revision for %s@rev %s" | |
478 | "from annotation list should match each other, " |
|
480 | "from annotation list should match each other, " |
@@ -392,13 +392,13 b' class MercurialChangesetTest(unittest.Te' | |||||
392 | 55: {'lines_no': 3, |
|
392 | 55: {'lines_no': 3, | |
393 | 'changesets': [7, 7, 7]}}} |
|
393 | 'changesets': [7, 7, 7]}}} | |
394 |
|
394 | |||
395 |
|
||||
396 | for fname, revision_dict in files.items(): |
|
395 | for fname, revision_dict in files.items(): | |
397 | for rev, data in revision_dict.items(): |
|
396 | for rev, data in revision_dict.items(): | |
398 | cs = self.repo.get_changeset(rev) |
|
397 | cs = self.repo.get_changeset(rev) | |
399 |
|
|
398 | l1_1 = [x[1] for x in cs.get_file_annotate(fname)] | |
400 |
|
399 | l1_2 = [x[2]().raw_id for x in cs.get_file_annotate(fname)] | ||
401 | l1 = [x[1].revision for x in ann] |
|
400 | self.assertEqual(l1_1, l1_2) | |
|
401 | l1 = l1_2 = [x[2]().revision for x in cs.get_file_annotate(fname)] | |||
402 | l2 = files[fname][rev]['changesets'] |
|
402 | l2 = files[fname][rev]['changesets'] | |
403 | self.assertTrue(l1 == l2 , "The lists of revision for %s@rev%s" |
|
403 | self.assertTrue(l1 == l2 , "The lists of revision for %s@rev%s" | |
404 | "from annotation list should match each other," |
|
404 | "from annotation list should match each other," |
General Comments 0
You need to be logged in to leave comments.
Login now