Show More
@@ -142,7 +142,7 b' class CompareController(BaseRepoControll' | |||||
142 | 'allowed. Got %s != %s' % (org_repo, other_repo)) |
|
142 | 'allowed. Got %s != %s' % (org_repo, other_repo)) | |
143 |
|
143 | |||
144 | so, se = org_repo.run_git_command( |
|
144 | so, se = org_repo.run_git_command( | |
145 |
'log --reverse --pretty="format: %%H" -s |
|
145 | 'log --reverse --pretty="format: %%H" -s %s..%s' | |
146 | % (org_rev, other_rev) |
|
146 | % (org_rev, other_rev) | |
147 | ) |
|
147 | ) | |
148 | changesets = [org_repo.get_changeset(cs) |
|
148 | changesets = [org_repo.get_changeset(cs) |
@@ -294,17 +294,15 b' class GitChangeset(BaseChangeset):' | |||||
294 | f_path = safe_str(path) |
|
294 | f_path = safe_str(path) | |
295 |
|
295 | |||
296 | if limit: |
|
296 | if limit: | |
297 |
cmd = 'log -n %s --pretty="format: %%H" -s |
|
297 | cmd = 'log -n %s --pretty="format: %%H" -s %s -- "%s"' % ( | |
298 | safe_int(limit, 0), cs_id, f_path |
|
298 | safe_int(limit, 0), cs_id, f_path) | |
299 | ) |
|
|||
300 |
|
299 | |||
301 | else: |
|
300 | else: | |
302 |
cmd = 'log --pretty="format: %%H" -s |
|
301 | cmd = 'log --pretty="format: %%H" -s %s -- "%s"' % ( | |
303 | cs_id, f_path |
|
302 | cs_id, f_path) | |
304 | ) |
|
|||
305 | so, se = self.repository.run_git_command(cmd) |
|
303 | so, se = self.repository.run_git_command(cmd) | |
306 | ids = re.findall(r'[0-9a-fA-F]{40}', so) |
|
304 | ids = re.findall(r'[0-9a-fA-F]{40}', so) | |
307 |
return [self.repository.get_changeset( |
|
305 | return [self.repository.get_changeset(sha) for sha in ids] | |
308 |
|
306 | |||
309 | def get_file_history_2(self, path): |
|
307 | def get_file_history_2(self, path): | |
310 | """ |
|
308 | """ |
General Comments 0
You need to be logged in to leave comments.
Login now