kallithea Changeset - 69404d45f6c1

Changeset - 69404d45f6c1

Parent rev.

Child rev.

[Not reviewed]

Merge codereview

0 7 0

Marcin Kuzminski - 14 years ago 2012-05-03 01:05:08
marcin@python-works.com

merged beta into code-review branch

6 files changed with 51 insertions and 18 deletions:

docs/changelog.rst

rhodecode/controllers/admin/settings.py

rhodecode/controllers/changelog.py

rhodecode/templates/admin/settings/settings.html

rhodecode/templates/files/files_source.html

rhodecode/tests/rhodecode_crawler.py

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -20,21 +20,23 @@ news @@
   more compatible with LDAP servers
 - Added HTTP_X_FORWARDED_FOR as another method of extracting
   IP for pull/push logs. - moved all to base controller
 - #415: Adding comment to changeset causes reload.
   Comments are now added via ajax and doesn't reload the page
 - #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
 fixes
 +++++
 - fixed dev-version marker for stable when served from source codes
 - fixed missing permission checks on show forks page
 - #418 cast to unicode fixes in notification objects
 - #426 fixed mention extracting regex
+- fixed remote-pulling for git remotes remopositories
 .3.4 (**2012-03-28**)
 ----------------------
 news
 ++++

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -64,13 +64,14 @@ class SettingsController(BaseController) @@
     @LoginRequired()
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         c.modules = sorted([(p.project_name, p.version)
                             for p in pkg_resources.working_set])
                             for p in pkg_resources.working_set],
                            key=lambda k: k[0].lower())
         c.py_version = platform.python_version()
         c.platform = platform.platform()
         super(SettingsController, self).__before__()
     @HasPermissionAllDecorator('hg.admin')
     def index(self, format='html'):

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -123,13 +123,18 @@ class ChangelogController(BaseRepoContro @@
                 vtx = [0, 1]
                 edges = [[0, 0, 1]]
                 data.append(['', vtx, edges])
         elif repo.alias == 'hg':
             dag = graphmod.dagwalker(repo._repo, revs)
             try:
                 c.dag = graphmod.colored(dag)
             except:
                 #HG 2.2+
             c.dag = graphmod.colored(dag, repo._repo)
             for (id, type, ctx, vtx, edges) in c.dag:
                 if type != graphmod.CHANGESET:
                     continue
                 data.append(['', vtx, edges])
         c.jsdata = json.dumps(data)

rhodecode/templates/admin/settings/settings.html

➞

Show inline comments

@@ @@ -223,13 +223,13 @@ @@
           <colgroup>
               <col style="width:220px">
           </colgroup>
           <tbody>
               %for key, value in c.modules:
                   <tr>
                       <th>${key}</th>
+                      <th style="text-align: right;padding-right:5px;">${key}</th>
                       <td>${value}</td>
                   </tr>
               %endfor
           </tbody>
       </table>
       </div>

rhodecode/templates/files/files_source.html

➞

Show inline comments

@@ @@ -13,13 +13,13 @@ @@
 </dl>
 <div id="body" class="codeblock">
 	<div class="code-header">
         <div class="stats">
             <div class="left img"><img src="${h.url('/images/icons/file.png')}"/></div>
             <div class="left item"><pre>${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</pre></div>
+            <div class="left item"><pre class="tooltip" title="${c.file.changeset.date}">${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</pre></div>
             <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>
             <div class="left item last"><pre>${c.file.mimetype}</pre></div>
             <div class="buttons">
               %if c.annotate:
                 ${h.link_to(_('show source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
               %else:

rhodecode/tests/rhodecode_crawler.py

➞

Show inline comments

@@ @@ -39,14 +39,28 @@ from os.path import dirname as dn @@
 __here__ = os.path.abspath(__file__)
 __root__ = dn(dn(dn(__here__)))
 sys.path.append(__root__)
 from rhodecode.lib import vcs
 from rhodecode.lib.compat import OrderedSet
 from rhodecode.lib.vcs.exceptions import RepositoryError
 BASE_URI = 'http://127.0.0.1:5001/%s'
 PASES = 3
 HOST = 'http://127.0.0.1'
 PORT = 5000
 BASE_URI = '%s:%s/' % (HOST, PORT)
 if len(sys.argv) == 2:
     BASE_URI = sys.argv[1]
 if not BASE_URI.endswith('/'):
     BASE_URI += '/'
 print 'Crawling @ %s' % BASE_URI
 BASE_URI += '%s'
 PROJECT_PATH = jn('/', 'home', 'marcink', 'hg_repos')
 PROJECTS = [
     'linux-magx-pbranch',
     'CPython',
     'rhodecode_tip',
+]
@@ @@ -59,13 +73,26 @@ o.addheaders = [ @@
     ('Accept-Language', 'en - us, en;q = 0.5')
+]
 urllib2.install_opener(o)
 def _get_repo(proj):
     if isinstance(proj, basestring):
         repo = vcs.get_repo(jn(PROJECT_PATH, proj))
         proj = proj
     else:
         repo = proj
         proj = repo.name
     return repo, proj
 def test_changelog_walk(proj, pages=100):
     repo, proj = _get_repo(proj)
     total_time = 0
     for i in range(1, pages):
         page = '/'.join((proj, 'changelog',))
         full_uri = (BASE_URI % page) + '?' + urllib.urlencode({'page':i})
@@ @@ -78,16 +105,17 @@ def test_changelog_walk(proj, pages=100) @@
     print 'total_time', total_time
     print 'average on req', total_time / float(pages)
 def test_changeset_walk(proj, limit=None):
     repo, proj = _get_repo(proj)
     print 'processing', jn(PROJECT_PATH, proj)
     total_time = 0
     repo = vcs.get_repo(jn(PROJECT_PATH, proj))
     cnt = 0
     for i in repo:
         cnt += 1
         raw_cs = '/'.join((proj, 'changeset', i.raw_id))
         if limit and limit == cnt:
             break
@@ @@ -103,20 +131,17 @@ def test_changeset_walk(proj, limit=None @@
     print 'total_time', total_time
     print 'average on req', total_time / float(cnt)
 def test_files_walk(proj, limit=100):
     repo, proj = _get_repo(proj)
     print 'processing', jn(PROJECT_PATH, proj)
     total_time = 0
     repo = vcs.get_repo(jn(PROJECT_PATH, proj))
     from rhodecode.lib.compat import OrderedSet
     from rhodecode.lib.vcs.exceptions import RepositoryError
     paths_ = OrderedSet([''])
     try:
         tip = repo.get_changeset('tip')
         for topnode, dirs, files in tip.walk('/'):
             for dir in dirs:
@@ @@ -147,13 +172,13 @@ def test_files_walk(proj, limit=100): @@
         print '%s visited OK size:%s req:%s ms' % (cnt, size, e)
     print 'total_time', total_time
     print 'average on req', total_time / float(cnt)
 if __name__ == '__main__':
     for p in PROJECTS:
         test_changelog_walk(p, 40)
         time.sleep(2)
         test_changeset_walk(p, limit=100)
         time.sleep(2)
         test_files_walk(p, 100)
     for path in PROJECTS:
         repo = vcs.get_repo(jn(PROJECT_PATH, path))
         for i in range(PASES):
             print 'PASS %s/%s' % (i, PASES)
             test_changelog_walk(repo, pages=80)
             test_changeset_walk(repo, limit=100)
             test_files_walk(repo, limit=100)

0 comments (0 inline, 0 general)