Show More
@@ -1599,8 +1599,7 b' class BaseInMemoryCommit(object):' | |||||
1599 | pass |
|
1599 | pass | |
1600 | if self.changed and missing: |
|
1600 | if self.changed and missing: | |
1601 | raise NodeDoesNotExistError( |
|
1601 | raise NodeDoesNotExistError( | |
1602 |
"Node ` |
|
1602 | f"Node `{node.path}` marked as modified but missing in parents: {parents}") | |
1603 | % (node.path, parents)) |
|
|||
1604 |
|
1603 | |||
1605 | if self.changed and not_changed: |
|
1604 | if self.changed and not_changed: | |
1606 | raise NodeNotChangedError( |
|
1605 | raise NodeNotChangedError( |
@@ -1153,10 +1153,8 b' class PullRequestModel(BaseModel):' | |||||
1153 |
|
1153 | |||
1154 | pull_request.common_ancestor_id = ancestor_commit_id |
|
1154 | pull_request.common_ancestor_id = ancestor_commit_id | |
1155 |
|
1155 | |||
1156 | pull_request.source_ref = '%s:%s:%s' % ( |
|
1156 | pull_request.source_ref = f'{source_ref_type}:{source_ref_name}:{source_commit.raw_id}' | |
1157 | source_ref_type, source_ref_name, source_commit.raw_id) |
|
1157 | pull_request.target_ref = f'{target_ref_type}:{target_ref_name}:{ancestor_commit_id}' | |
1158 | pull_request.target_ref = '%s:%s:%s' % ( |
|
|||
1159 | target_ref_type, target_ref_name, ancestor_commit_id) |
|
|||
1160 |
|
1158 | |||
1161 | pull_request.revisions = [ |
|
1159 | pull_request.revisions = [ | |
1162 | commit.raw_id for commit in reversed(commit_ranges)] |
|
1160 | commit.raw_id for commit in reversed(commit_ranges)] |
@@ -57,8 +57,8 b' class TestBranches(BackendTestMixin):' | |||||
57 | FileNode(b'docs/index.txt', content=b'Documentation\n') |
|
57 | FileNode(b'docs/index.txt', content=b'Documentation\n') | |
58 | ) |
|
58 | ) | |
59 | foobar_tip = self.imc.commit( |
|
59 | foobar_tip = self.imc.commit( | |
60 |
message= |
|
60 | message='New branch: foobar', | |
61 |
author= |
|
61 | author='joe <joe@rhodecode.com>', | |
62 | branch='foobar', |
|
62 | branch='foobar', | |
63 | ) |
|
63 | ) | |
64 | assert 'foobar' in self.repo.branches |
|
64 | assert 'foobar' in self.repo.branches | |
@@ -72,8 +72,8 b' class TestBranches(BackendTestMixin):' | |||||
72 | content=b'Documentation\n') |
|
72 | content=b'Documentation\n') | |
73 | ) |
|
73 | ) | |
74 | foobar_tip = self.imc.commit( |
|
74 | foobar_tip = self.imc.commit( | |
75 |
message= |
|
75 | message='New branch: foobar', | |
76 |
author= |
|
76 | author='joe <joe@rhodecode.com>', | |
77 | branch='foobar', |
|
77 | branch='foobar', | |
78 | parents=[tip], |
|
78 | parents=[tip], | |
79 | ) |
|
79 | ) |
General Comments 0
You need to be logged in to leave comments.
Login now