kallithea Changeset - 9a4d4e623c85

Changeset - 9a4d4e623c85

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 8 0

Mads Kiilerich - 10 years ago 2015-12-25 13:50:18
madski@unity3d.com

Merge stable

8 files changed with 35 insertions and 6 deletions:

kallithea/lib/auth_modules/auth_internal.py

kallithea/lib/auth_modules/auth_pam.py

kallithea/lib/diffs.py

kallithea/lib/indexers/daemon.py

kallithea/model/db.py

kallithea/public/js/base.js

kallithea/tests/fixtures/git_diff_rename_file.diff

kallithea/tests/models/test_diff_parsers.py

0 comments (0 inline, 0 general)

kallithea/lib/auth_modules/auth_internal.py

➞

Show inline comments

@@ @@ -64,12 +64,15 @@ class KallitheaAuthPlugin(auth_modules.K @@
             log.debug('userobj was:%s skipping', userobj)
             return None
         if userobj.extern_type != self.name:
             log.warning("userobj:%s extern_type mismatch got:`%s` expected:`%s`",
                      userobj, userobj.extern_type, self.name)
             return None
         if not username:
             log.debug('Empty username - skipping...')
             return None
         user_data = {
             "username": userobj.username,
             "firstname": userobj.firstname,
             "lastname": userobj.lastname,
             "groups": [],

kallithea/lib/auth_modules/auth_pam.py

➞

Show inline comments

@@ @@ -82,12 +82,15 @@ class KallitheaAuthPlugin(auth_modules.K @@
         return settings
     def use_fake_password(self):
         return True
     def auth(self, userobj, username, password, settings, **kwargs):
         if not username:
             log.debug('Empty username - skipping...')
             return None
         if username not in _auth_cache:
             # Need lock here, as PAM authentication is not thread safe
             _pam_lock.acquire()
             try:
                 auth_result = pam.authenticate(username, password,
                                                settings["service"])

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -157,17 +157,17 @@ class DiffProcessor(object): @@
     _chunk_re = re.compile(r'^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)')
     _newline_marker = re.compile(r'^\\ No newline at end of file')
     _git_header_re = re.compile(r"""
         # has already been split on this:
         # ^diff[ ]--git
             [ ]a/(?P<a_path>.+?)[ ]b/(?P<b_path>.+?)\n
         (?:^old[ ]mode[ ](?P<old_mode>\d+)\n
            ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
         (?:^similarity[ ]index[ ](?P<similarity_index>\d+)%\n
            ^rename[ ]from[ ](?P<rename_from>.+)\n
            ^rename[ ]to[ ](?P<rename_to>.+)(?:\n|$))?
         (?:^old[ ]mode[ ](?P<old_mode>\d+)\n
            ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
         (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
         (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
         (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
             \.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n|$))?
         (?:^(?P<bin_patch>GIT[ ]binary[ ]patch)(?:\n|$))?
         (?:^---[ ](a/(?P<a_file>.+?)|/dev/null)\t?(?:\n|$))?

kallithea/lib/indexers/daemon.py

➞

Show inline comments

@@ @@ -174,14 +174,18 @@ class WhooshIndexingDaemon(object): @@
     def add_doc(self, writer, path, repo, repo_name, index_rev=None):
         """
         Adding doc to writer this function itself fetches data from
         the instance of vcs backend
         """
         try:
             node = self.get_node(repo, path, index_rev)
         except (ChangesetError, NodeDoesNotExistError):
             log.debug("couldn't add doc - %s did not have %r at %s", repo, path, index_rev)
             return 0, 0
         node = self.get_node(repo, path, index_rev)
         indexed = indexed_w_content = 0
         if self.is_indexable_node(node):
             u_content = node.content
             if not isinstance(u_content, unicode):
                 log.warning('  >> %s Could not get this content as unicode '
                             'replacing with empty content' % path)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -2135,13 +2135,19 @@ class CacheInvalidation(Base, BaseModel) @@
         if not inv_obj:
             inv_obj = CacheInvalidation(cache_key, repo_name)
         if inv_obj.cache_active:
             return True
         inv_obj.cache_active = True
         Session().add(inv_obj)
         Session().commit()
         try:
             Session().commit()
         except exc.IntegrityError:
             inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar()
             if not inv_obj:
                 raise
             # TOCTOU - another thread added the key at the same time; no further action required
         return False
     @classmethod
     def get_valid_cache_keys(cls):
         """
         Return opaque object with information of which caches still are valid

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1915,13 +1915,13 @@ var prefixFirstSort = function(results, @@
 // global hooks after DOM is loaded
 $(document).ready(function(){
     $('.diff-collapse-button').click(function(e) {
         var $button = $(e.currentTarget);
-        var $target = $('#' + $button.prop('target'));
+        var $target = $('#' + $button.attr('target'));
         if($target.hasClass('hidden')){
             $target.removeClass('hidden');
             $button.html("&uarr; {0} &uarr;".format(_TM['Collapse Diff']));
+        }
         else if(!$target.hasClass('hidden')){
             $target.addClass('hidden');

kallithea/tests/fixtures/git_diff_rename_file.diff

➞

Show inline comments

 diff --git a/work-horus.xls b/file.xls
 similarity index 100%
 rename from work-horus.xls
 rename to file.xls
 diff --git a/files/var/www/favicon.ico b/files/var/www/favicon.ico/DEFAULT
 old mode 100644
 new mode 100755
 similarity index 100%
 rename from files/var/www/favicon.ico
 rename to files/var/www/favicon.ico/DEFAULT

kallithea/tests/models/test_diff_parsers.py

➞

Show inline comments

@@ @@ -130,13 +130,20 @@ DIFF_FIXTURES = { @@
     ],
     'git_diff_rename_file.diff': [
         ('file.xls', 'R',
          {'added': 0,
           'deleted': 0,
           'binary': True,
           'ops': {RENAMED_FILENODE: 'file renamed from work-horus.xls to file.xls'}})
           'ops': {RENAMED_FILENODE: 'file renamed from work-horus.xls to file.xls'}}),
         ('files/var/www/favicon.ico/DEFAULT',
          'R',
          {'added': 0,
           'binary': True,
           'deleted': 0,
           'ops': {4: 'file renamed from files/var/www/favicon.ico to files/var/www/favicon.ico/DEFAULT',
 : 'modified file chmod 100644 => 100755'}})
     ],
     'git_diff_mod_single_binary_file.diff': [
         ('US Warszawa.jpg', 'M',
          {'added': 0,
           'deleted': 0,
           'binary': True,

0 comments (0 inline, 0 general)