Mercurial > kallithea
changeset 4106:4e429252f3ee
Don't use -p flag together with -s in git calls. Latest
git version changes behaviour of such call changing the output.
In all the calls where -p -s was used we're only interested in
list of changesets and not the diff.
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 02 Sep 2013 16:57:30 +0200 |
| parents | 99b98a08f722 |
| children | fc64cd9bb856 |
| files | rhodecode/controllers/compare.py rhodecode/lib/vcs/backends/git/changeset.py |
| diffstat | 2 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/compare.py Mon Sep 02 16:44:49 2013 +0200 +++ b/rhodecode/controllers/compare.py Mon Sep 02 16:57:30 2013 +0200 @@ -142,7 +142,7 @@ 'allowed. Got %s != %s' % (org_repo, other_repo)) so, se = org_repo.run_git_command( - 'log --reverse --pretty="format: %%H" -s -p %s..%s' + 'log --reverse --pretty="format: %%H" -s %s..%s' % (org_rev, other_rev) ) changesets = [org_repo.get_changeset(cs)
--- a/rhodecode/lib/vcs/backends/git/changeset.py Mon Sep 02 16:44:49 2013 +0200 +++ b/rhodecode/lib/vcs/backends/git/changeset.py Mon Sep 02 16:57:30 2013 +0200 @@ -294,17 +294,15 @@ f_path = safe_str(path) if limit: - cmd = 'log -n %s --pretty="format: %%H" -s -p %s -- "%s"' % ( - safe_int(limit, 0), cs_id, f_path - ) + cmd = 'log -n %s --pretty="format: %%H" -s %s -- "%s"' % ( + safe_int(limit, 0), cs_id, f_path) else: - cmd = 'log --pretty="format: %%H" -s -p %s -- "%s"' % ( - cs_id, f_path - ) + cmd = 'log --pretty="format: %%H" -s %s -- "%s"' % ( + cs_id, f_path) so, se = self.repository.run_git_command(cmd) ids = re.findall(r'[0-9a-fA-F]{40}', so) - return [self.repository.get_changeset(id) for id in ids] + return [self.repository.get_changeset(sha) for sha in ids] def get_file_history_2(self, path): """