kallithea Changeset - 7117a83b4b3a

Changeset - 7117a83b4b3a

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 4 0

Mads Kiilerich - 11 years ago 2015-05-07 16:24:29
madski@unity3d.com

Merge stable

4 files changed with 11 insertions and 5 deletions:

kallithea/lib/utils.py

kallithea/model/pull_request.py

kallithea/templates/changeset/changeset.html

kallithea/templates/files/files.html

0 comments (0 inline, 0 general)

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -244,13 +244,13 @@ def get_filesystem_repos(path, recursive @@
                 yield scm_info[1].split(path, 1)[-1].lstrip(os.sep), scm_info
             except VCSError:
                 if not recursive:
                     continue
                 #check if this dir containts other repos for recursive scan
                 rec_path = os.path.join(p, dirpath)
                 if os.path.isdir(rec_path):
+                if not os.path.islink(rec_path) and os.path.isdir(rec_path):
                     for inner_scm in _get_repos(rec_path):
                         yield inner_scm
     return _get_repos(path)

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -122,14 +122,15 @@ class PullRequestModel(BaseModel): @@
         revision_data = [(x.raw_id, x.message)
                          for x in map(pr.org_repo.get_changeset, pr.revisions)]
         #notification to reviewers
         pr_url = pr.url(canonical=True)
         threading = [h.canonical_url('pullrequest_show', repo_name=pr.other_repo.repo_name,
                                      pull_request_id=pr.pull_request_id)]
         threading = ['%s-pr-%s@%s' % (pr.other_repo.repo_name,
                                       pr.pull_request_id,
                                       h.canonical_hostname())]
         subject = safe_unicode(
             h.link_to(
               _('%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s') % \
                 {'user': pr.author.username,
                  'pr_title': pr.title,
                  'pr_nice_id': pr.nice_id()},

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -280,13 +280,18 @@ ${self.repo_context_bar('changelog', c.c @@
                           $('#parent_link').html(_html);
+                      }
+                    }
                   });
               e.preventDefault();
+              }
           })
           });
           // hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload
           if (window.location.hash != "") {
               window.location.href = window.location.href;
+          }
       })
     </script>
     </div>
 </%def>

kallithea/templates/files/files.html

➞

Show inline comments

@@ @@ -237,13 +237,13 @@ $(document).ready(function(){ @@
         });
     $("#branch_selector").change(function(e){
         var selected = e.currentTarget.options[e.currentTarget.selectedIndex].value;
         if(selected && selected != "${c.changeset.raw_id}"){
             window.location = pyroutes.url('files_home', {'repo_name': "${h.safe_unicode(c.repo_name)}", 'revision': selected, 'f_path': "${h.safe_unicode(c.file.path)}"});
             $("#browserblock").hide();
+            $("#body.browserblock").hide();
         } else {
             $("#branch_selector").val("${c.changeset.raw_id}");
+        }
     });
 });

0 comments (0 inline, 0 general)