# HG changeset patch # User Marcin Kuzminski # Date 1287952048 -7200 # Node ID fcf599cd340466147810dc0d67ed708289eacbdb # Parent 05528ad948c4bd7999b27942f9df611161ae54cc Move changes for git implementation diff -r 05528ad948c4 -r fcf599cd3404 rhodecode/lib/utils.py --- a/rhodecode/lib/utils.py Sun Oct 24 16:15:40 2010 +0200 +++ b/rhodecode/lib/utils.py Sun Oct 24 22:27:28 2010 +0200 @@ -16,6 +16,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA. +""" +Created on April 18, 2010 +Utilities for RhodeCode +@author: marcink +""" + from UserDict import DictMixin from mercurial import ui, config, hg from mercurial.error import RepoError @@ -33,12 +39,6 @@ import logging import os -""" -Created on April 18, 2010 -Utilities for RhodeCode -@author: marcink -""" - log = logging.getLogger(__name__) @@ -110,8 +110,12 @@ """ from vcs.utils.helpers import get_scm from vcs.exceptions import VCSError - scm = get_scm(path) - if scm: + + try: + scm = get_scm(path) + except: + pass + else: raise Exception('The given path %s should not be a repository got %s', path, scm) diff -r 05528ad948c4 -r fcf599cd3404 rhodecode/model/hg.py --- a/rhodecode/model/hg.py Sun Oct 24 16:15:40 2010 +0200 +++ b/rhodecode/model/hg.py Sun Oct 24 22:27:28 2010 +0200 @@ -33,6 +33,8 @@ from vcs.exceptions import RepositoryError, VCSError import logging import sys +import time + log = logging.getLogger(__name__) try: @@ -155,7 +157,7 @@ tmp_d['description'] = repo.description tmp_d['description_sort'] = tmp_d['description'] tmp_d['last_change'] = last_change - tmp_d['last_change_sort'] = last_change[1] - last_change[0] + tmp_d['last_change_sort'] = time.mktime(last_change.timetuple()) tmp_d['tip'] = tip.short_id tmp_d['tip_sort'] = tip.revision tmp_d['rev'] = tip.revision diff -r 05528ad948c4 -r fcf599cd3404 rhodecode/templates/branches/branches_data.html --- a/rhodecode/templates/branches/branches_data.html Sun Oct 24 16:15:40 2010 +0200 +++ b/rhodecode/templates/branches/branches_data.html Sun Oct 24 22:27:28 2010 +0200 @@ -8,7 +8,7 @@ %for cnt,branch in enumerate(c.repo_branches.items()): - ${h.age(branch[1]._ctx.date())} + ${h.age(branch[1].date)} r${branch[1].revision}:${branch[1].short_id} diff -r 05528ad948c4 -r fcf599cd3404 rhodecode/templates/changeset/raw_changeset.html --- a/rhodecode/templates/changeset/raw_changeset.html Sun Oct 24 16:15:40 2010 +0200 +++ b/rhodecode/templates/changeset/raw_changeset.html Sun Oct 24 22:27:28 2010 +0200 @@ -1,6 +1,6 @@ -# HG changeset patch +# c.scm_type changeset patch # User ${c.changeset.author|n} -# Date ${"%d %d" % c.changeset._ctx.date()} +# Date ${"%d %d" % c.changeset.date} # Node ID ${c.changeset.raw_id} # ${c.parent_tmpl} ${c.changeset.message} diff -r 05528ad948c4 -r fcf599cd3404 rhodecode/templates/files/files_browser.html --- a/rhodecode/templates/files/files_browser.html Sun Oct 24 16:15:40 2010 +0200 +++ b/rhodecode/templates/files/files_browser.html Sun Oct 24 22:27:28 2010 +0200 @@ -30,7 +30,7 @@ - % if c.files_list.parent: + %if c.files_list.parent: ${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.files_list.parent.path),class_="browser-dir")} @@ -40,7 +40,7 @@ - + %endif %for cnt,node in enumerate(c.files_list,1): @@ -65,7 +65,7 @@ %if node.is_file(): - ${h.age(node.last_changeset._ctx.date())} - ${node.last_changeset.date} + ${h.age(node.last_changeset.date)} - ${node.last_changeset.date} %endif diff -r 05528ad948c4 -r fcf599cd3404 rhodecode/templates/index.html --- a/rhodecode/templates/index.html Sun Oct 24 16:15:40 2010 +0200 +++ b/rhodecode/templates/index.html Sun Oct 24 22:27:28 2010 +0200 @@ -45,7 +45,7 @@ ${get_sort(_('Description'))} ${get_sort(_('Last change'))} ${get_sort(_('Tip'))} - ${get_sort(_('Contact'))} + ${get_sort(_('Owner'))} ${_('RSS')} ${_('Atom')} diff -r 05528ad948c4 -r fcf599cd3404 rhodecode/templates/tags/tags_data.html --- a/rhodecode/templates/tags/tags_data.html Sun Oct 24 16:15:40 2010 +0200 +++ b/rhodecode/templates/tags/tags_data.html Sun Oct 24 22:27:28 2010 +0200 @@ -8,7 +8,7 @@ %for cnt,tag in enumerate(c.repo_tags.items()): - ${h.age(tag[1]._ctx.date())} + ${h.age(tag[1].date)} r${tag[1].revision}:${tag[1].short_id}