Mercurial > kallithea
changeset 2235:b6adef467e23 beta
changelog update + whitespace cleanup
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 04 May 2012 00:42:02 +0200 |
| parents | ef35dce65557 |
| children | 37c143aa8616 |
| files | docs/changelog.rst docs/conf.py rhodecode/lib/vcs/backends/base.py rhodecode/lib/vcs/backends/git/repository.py |
| diffstat | 4 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/changelog.rst Fri May 04 00:26:16 2012 +0200 +++ b/docs/changelog.rst Fri May 04 00:42:02 2012 +0200 @@ -25,6 +25,7 @@ - #374 LDAP config is discarded when LDAP can't be activated - limited push/pull operations are now logged for git in the journal - bumped mercurial to 2.2.X series +- added support for displaying submodules in file-browser fixes +++++ @@ -34,6 +35,8 @@ - #418 cast to unicode fixes in notification objects - #426 fixed mention extracting regex - fixed remote-pulling for git remotes remopositories +- fixed #434: Error when accessing files or changesets of a git repository + with submodules 1.3.4 (**2012-03-28**) ----------------------
--- a/docs/conf.py Fri May 04 00:26:16 2012 +0200 +++ b/docs/conf.py Fri May 04 00:42:02 2012 +0200 @@ -27,8 +27,8 @@ # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', - 'sphinx.ext.intersphinx', 'sphinx.ext.todo', +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', + 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.viewcode'] # Add any paths that contain templates here, relative to this directory.
--- a/rhodecode/lib/vcs/backends/base.py Fri May 04 00:26:16 2012 +0200 +++ b/rhodecode/lib/vcs/backends/base.py Fri May 04 00:42:02 2012 +0200 @@ -953,4 +953,4 @@ return u'' def get_file_size(self, path): - return 0 \ No newline at end of file + return 0
--- a/rhodecode/lib/vcs/backends/git/repository.py Fri May 04 00:26:16 2012 +0200 +++ b/rhodecode/lib/vcs/backends/git/repository.py Fri May 04 00:42:02 2012 +0200 @@ -52,7 +52,7 @@ if baseui is None: from mercurial.ui import ui baseui = ui() - # patch the instance of GitRepo with an "FAKE" ui object to add + # patch the instance of GitRepo with an "FAKE" ui object to add # compatibility layer with Mercurial setattr(self._repo, 'ui', baseui)