Mercurial > kallithea
diff rhodecode/lib/vcs/utils/annotate.py @ 3797:d7488551578e beta
synced vcs with upstream
- moved subprocessio module to VCS
- many small changes to make embedded vcs as similar to to external lib
- use only absolute imports
- patch vcs config during load pylons env
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 27 Apr 2013 11:24:25 +0200 |
parents | 324ac367a4da |
children | 7e5f8c12a3fc |
line wrap: on
line diff
--- a/rhodecode/lib/vcs/utils/annotate.py Sat Apr 27 11:45:27 2013 +0200 +++ b/rhodecode/lib/vcs/utils/annotate.py Sat Apr 27 11:24:25 2013 +0200 @@ -1,9 +1,10 @@ -from rhodecode.lib.vcs.exceptions import VCSError -from rhodecode.lib.vcs.nodes import FileNode +import StringIO + from pygments.formatters import HtmlFormatter from pygments import highlight -import StringIO +from rhodecode.lib.vcs.exceptions import VCSError +from rhodecode.lib.vcs.nodes import FileNode def annotate_highlight(filenode, annotate_from_changeset_func=None,