kallithea Changeset - ebc4cc82cce2

Changeset - ebc4cc82cce2

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 8 0

Mads Kiilerich - 10 years ago 2015-11-07 13:24:44
madski@unity3d.com

Merge stable

6 files changed with 7 insertions and 7 deletions:

kallithea/lib/auth_modules/auth_pam.py

kallithea/lib/paster_commands/update_repoinfo.py

kallithea/lib/vcs/backends/git/changeset.py

kallithea/lib/vcs/backends/hg/changeset.py

kallithea/model/repo.py

kallithea/public/js/base.js

0 comments (0 inline, 0 general)

kallithea/lib/auth_modules/auth_pam.py

➞

Show inline comments

@@ @@ -123,9 +123,9 @@ class KallitheaAuthPlugin(auth_modules.K @@
+        }
         try:
-            user_data = pwd.getpwnam(username)
+            user_pw_data = pwd.getpwnam(username)
             regex = settings["gecos"]
-            match = re.search(regex, user_data.pw_gecos)
+            match = re.search(regex, user_pw_data.pw_gecos)
             if match:
                 user_data["firstname"] = match.group('first_name')
                 user_data["lastname"] = match.group('last_name')

kallithea/lib/paster_commands/update_repoinfo.py

➞

Show inline comments

@@ @@ -63,7 +63,7 @@ class Command(BasePasterCommand): @@
                                self.options.repo_update_list.split(',')) \
                                if self.options.repo_update_list else None
         if repo_update_list:
+        if repo_update_list is not None:
             repo_list = list(Repository.query()\
                 .filter(Repository.repo_name.in_(repo_update_list)))
         else:

kallithea/lib/vcs/backends/git/changeset.py

➞

Show inline comments

@@ @@ -287,7 +287,7 @@ class GitChangeset(BaseChangeset): @@
         cs_id = safe_str(self.id)
         f_path = safe_str(path)
         if limit:
+        if limit is not None:
             cmd = ['log', '-n', str(safe_int(limit, 0)),
                    '--pretty=format:%H', '-s', cs_id, '--', f_path]

kallithea/lib/vcs/backends/hg/changeset.py

➞

Show inline comments

@@ @@ -256,7 +256,7 @@ class MercurialChangeset(BaseChangeset): @@
         for cs in reversed([x for x in fctx.filelog()]):
             cnt += 1
             hist.append(hex(fctx.filectx(cs).node()))
             if limit and cnt == limit:
+            if limit is not None and cnt == limit:
                 break
         return [self.repository.get_changeset(node) for node in hist]

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -175,7 +175,7 @@ class RepoModel(BaseModel): @@
     @classmethod
     def update_repoinfo(cls, repositories=None):
-        if not repositories:
+        if repositories is None:
             repositories = Repository.getAll()
         for repo in repositories:
             repo.update_changeset_cache()

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -977,7 +977,7 @@ var getSelectionLink = function(e) { @@
                 $('body').prepend($hl_div);
+            }
-            $hl_div.append($('<a>').html(_TM['Selection link']).prop('href', location.href.substring(0, location.href.indexOf('#')) + '#L' + ranges[0] + '-'+ranges[1]));
+            $hl_div.append($('<a>').html(_TM['Selection Link']).prop('href', location.href.substring(0, location.href.indexOf('#')) + '#L' + ranges[0] + '-'+ranges[1]));
             var xy = $(till).offset();
             $hl_div.css('top', (xy.top + yoffset) + 'px').css('left', xy.left + 'px');
             $hl_div.show();

0 comments (0 inline, 0 general)