kallithea Changeset - b58ed6d608cc

Changeset - b58ed6d608cc

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 12 years ago 2013-06-12 01:36:35
madski@unity3d.com

Transplanted from: fa26bff92519

Use space after , in lists

4 files changed with 6 insertions and 6 deletions:

rhodecode/lib/base.py

rhodecode/lib/paster_commands/repo_scan.py

rhodecode/lib/vcs/utils/helpers.py

rhodecode/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -25,25 +25,25 @@ from rhodecode.lib.utils import get_repo @@
 from rhodecode.model import meta
 from rhodecode.model.db import Repository, RhodeCodeUi, User, RhodeCodeSetting
 from rhodecode.model.notification import NotificationModel
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.meta import Session
 log = logging.getLogger(__name__)
 def _filter_proxy(ip):
     """
-    HEADERS can have mutliple ips inside the left-most being the original
+    HEADERS can have multiple ips inside the left-most being the original
     client, and each successive proxy that passed the request adding the IP
     address where it received the request from.
     :param ip:
     """
     if ',' in ip:
         _ips = ip.split(',')
         _first_ip = _ips[0].strip()
         log.debug('Got multiple IPs %s, using %s' % (','.join(_ips), _first_ip))
         return _first_ip
     return ip

rhodecode/lib/paster_commands/repo_scan.py

➞

Show inline comments

@@ @@ -49,22 +49,22 @@ class Command(BasePasterCommand): @@
     group_name = "RhodeCode"
     takes_config_file = -1
     parser = BasePasterCommand.standard_parser(verbose=True)
     summary = "Rescan default location for new repositories"
     def command(self):
         #get SqlAlchemy session
         self._init_session()
         rm_obsolete = self.options.delete_obsolete
         log.info('Now scanning root location for new repos...')
         added, removed = repo2db_mapper(ScmModel().repo_scan(),
                                         remove_obsolete=rm_obsolete)
         added = ','.join(added) or '-'
         removed = ','.join(removed) or '-'
         log.info('Scan completed added:%s removed:%s' % (added, removed))
         added = ', '.join(added) or '-'
         removed = ', '.join(removed) or '-'
         log.info('Scan completed added: %s removed:%s' % (added, removed))
     def update_parser(self):
         self.parser.add_option('--delete-obsolete',
                           action='store_true',
                           help="Use this flag do delete repositories that are "
                           "present in RhodeCode database but not on the filesystem",
+                          )

rhodecode/lib/vcs/utils/helpers.py

➞

Show inline comments

@@ @@ -41,25 +41,25 @@ def get_scm(path, search_up=False, expli @@
     while not found_scms and search_up:
         newpath = abspath(path, '..')
         if newpath == path:
             break
         path = newpath
         found_scms = get_scms(path)
     if len(found_scms) > 1:
         for scm in found_scms:
             if scm[0] == explicit_alias:
                 return scm
         raise VCSError('More than one [%s] scm found at given path %s'
                        % (','.join((x[0] for x in found_scms)), path))
+                       % (', '.join((x[0] for x in found_scms)), path))
     if len(found_scms) is 0:
         raise VCSError('No scm found at given path %s' % path)
     return found_scms[0]
 def get_scms_for_path(path):
     """
     Returns all scm's found at the given path. If no scm is recognized
     - empty list is returned.

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -45,25 +45,25 @@ ${self.context_bar('showpullrequest')} @@
               </div>
               <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
             %endif
             </div>
           </div>
          </div>
          <div class="field">
           <div class="label-summary">
               <label>${_('Still not reviewed by')}:</label>
           </div>
           <div class="input">
             % if len(c.pull_request_pending_reviewers) > 0:
                 <div class="tooltip" title="${h.tooltip(','.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
+                <div class="tooltip" title="${h.tooltip(', '.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
             %else:
                 <div>${_('Pull request was reviewed by all reviewers')}</div>
             %endif
           </div>
          </div>
          <div class="field">
           <div class="label-summary">
               <label>${_('Origin repository')}:</label>
           </div>
           <div class="input">
               <div>
              ##%if h.is_hg(c.pull_request.org_repo):

0 comments (0 inline, 0 general)