# HG changeset patch # User Marcin Kuzminski # Date 2012-05-04 00:42:02 # Node ID b6adef467e237377d24513a3651c8599d8f23c90 # Parent ef35dce65557985bdb904a09724c0f3aefd89613 changelog update + whitespace cleanup diff --git a/docs/changelog.rst b/docs/changelog.rst --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -25,6 +25,7 @@ news - #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 @@ fixes - #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**) ---------------------- diff --git a/docs/conf.py b/docs/conf.py --- a/docs/conf.py +++ b/docs/conf.py @@ -27,8 +27,8 @@ sys.path.insert(0, os.path.abspath('..') # 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. diff --git a/rhodecode/lib/vcs/backends/base.py b/rhodecode/lib/vcs/backends/base.py --- a/rhodecode/lib/vcs/backends/base.py +++ b/rhodecode/lib/vcs/backends/base.py @@ -953,4 +953,4 @@ class EmptyChangeset(BaseChangeset): return u'' def get_file_size(self, path): - return 0 \ No newline at end of file + return 0 diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py --- a/rhodecode/lib/vcs/backends/git/repository.py +++ b/rhodecode/lib/vcs/backends/git/repository.py @@ -52,7 +52,7 @@ class GitRepository(BaseRepository): 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)