Mercurial > kallithea
changeset 2047:092080cd96ba beta
Git fixes
- removed remotes from git-branches
- fixed parsing for git node history
- docs updates
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 27 Feb 2012 05:06:59 +0200 |
| parents | 4e1e265af5ca |
| children | 79a95f338fd0 6aa328b903a5 |
| files | docs/changelog.rst rhodecode/lib/vcs/backends/git/changeset.py rhodecode/lib/vcs/backends/git/repository.py |
| diffstat | 3 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/changelog.rst Mon Feb 27 05:05:59 2012 +0200 +++ b/docs/changelog.rst Mon Feb 27 05:06:59 2012 +0200 @@ -4,7 +4,7 @@ ========= -1.3.1 (**2012-XX-XX**) +1.3.2 (**2012-XX-XX**) ---------------------- :status: in-progress @@ -18,6 +18,20 @@ +++++ +1.3.1 (**2012-02-27**) +---------------------- + +news +++++ + + +fixes ++++++ + +- redirection loop occurs when remember-me wasn't checked during login +- fixes issues with git blob history generation +- don't fetch branch for git in file history dropdown. Causes unneeded slowness + 1.3.0 (**2012-02-26**) ----------------------
--- a/rhodecode/lib/vcs/backends/git/changeset.py Mon Feb 27 05:05:59 2012 +0200 +++ b/rhodecode/lib/vcs/backends/git/changeset.py Mon Feb 27 05:06:59 2012 +0200 @@ -246,8 +246,9 @@ which is generally not good. Should be replaced with algorithm iterating commits. """ - cmd = 'log --name-status -p %s -- "%s" | grep "^commit"' \ - % (self.id, path) + cmd = 'log --pretty="format: %%H" --name-status -p %s -- "%s"' % ( + '', path + ) so, se = self.repository.run_git_command(cmd) ids = re.findall(r'\w{40}', so) return [self.repository.get_changeset(id) for id in ids]
--- a/rhodecode/lib/vcs/backends/git/repository.py Mon Feb 27 05:05:59 2012 +0200 +++ b/rhodecode/lib/vcs/backends/git/repository.py Mon Feb 27 05:06:59 2012 +0200 @@ -242,8 +242,7 @@ sortkey = lambda ctx: ctx[0] _branches = [('/'.join(ref.split('/')[2:]), head) for ref, head in refs.items() - if ref.startswith('refs/heads/') or - ref.startswith('refs/remotes/') and not ref.endswith('/HEAD')] + if ref.startswith('refs/heads/') and not ref.endswith('/HEAD')] return OrderedDict(sorted(_branches, key=sortkey, reverse=False)) def _get_tags(self):