You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/02/12 23:21:49 UTC
[7/11] git commit: [#5767] fix mercurial import. Thanks to honyczek
for the patch
[#5767] fix mercurial import. Thanks to honyczek for the patch
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/ce6849ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ce6849ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ce6849ea
Branch: refs/heads/cj/5685
Commit: ce6849ea74f8855961eddab856fac34eb529d6ce
Parents: fd06ece
Author: Dave Brondsema <db...@geek.net>
Authored: Tue Feb 12 21:24:58 2013 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Tue Feb 12 21:24:58 2013 +0000
----------------------------------------------------------------------
Allura/allura/lib/custom_middleware.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ce6849ea/Allura/allura/lib/custom_middleware.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/custom_middleware.py b/Allura/allura/lib/custom_middleware.py
index ef3beb9..2fd7d04 100644
--- a/Allura/allura/lib/custom_middleware.py
+++ b/Allura/allura/lib/custom_middleware.py
@@ -212,7 +212,7 @@ class AlluraTimerMiddleware(TimerMiddleware):
import git
timers.append(Timer('git_lib.{method_name}', git.Repo, 'rev_parse', 'iter_commits', 'commit'))
with pass_on_exc(ImportError):
- import mercurial
+ import mercurial.hg
timers.append(Timer('hg_lib.{method_name}', mercurial.hg.localrepo.localrepository, 'heads',
'branchtags', 'tags'))
return timers