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

@@ @@ -238,25 +238,25 @@ def get_filesystem_repos(path, recursive @@
             #skip .<somethin> dirs
             if dirpath.startswith('.'):
                 continue
             try:
                 scm_info = get_scm(cur_path)
                 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)
 def is_valid_repo(repo_name, base_path, scm=None):
     """
     Returns True if given path is a valid repository False otherwise.
     If scm param is given also compare if given scm is the same as expected
     from scm parameter

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -116,26 +116,27 @@ class PullRequestModel(BaseModel): @@
     def __add_reviewers(self, pr, reviewers, mention_recipients=None):
         #members
         for member in set(reviewers):
             _usr = self._get_user(member)
             reviewer = PullRequestReviewers(_usr, pr)
             Session().add(reviewer)
         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()},
                 pr_url)
+            )
         body = pr.description
         _org_ref_type, org_ref_name, _org_rev = pr.org_ref.split(':')
         email_kwargs = {
             'pr_title': pr.title,

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -274,19 +274,24 @@ ${self.repo_context_bar('changelog', c.c @@
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[0].raw_id}));
                           _html +='<br/>'
                           _html +='<i style="color:#036185" class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
                                   .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[1].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[1].raw_id}));
                           $('#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

@@ @@ -231,23 +231,23 @@ $(document).ready(function(){ @@
     fileBrowserListeners(_State.url, _State.data.node_list_url, _State.data.url_base);
     // change branch filter
     $("#branch_selector").select2({
         dropdownAutoWidth: true,
         minimumInputLength: 1
         });
     $("#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}");
+        }
     });
 });
 </script>
 </%def>

0 comments (0 inline, 0 general)