kallithea Changeset - d2f71ee1c738

Changeset - d2f71ee1c738

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 11 years ago 2014-08-19 21:10:09
dominikruf@gmail.com

pull requests: allow git pull requests

2 files changed with 4 insertions and 2 deletions:

kallithea/controllers/pullrequests.py

kallithea/templates/base/base.html

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -573,6 +573,8 @@ class PullrequestsController(BaseRepoCon @@
         c.available = []
         c.cs_branch_name = c.cs_ref_name
         other_scm_instance = c.a_repo.scm_instance
         c.update_msg = ""
         c.update_msg_other = ""
         if org_scm_instance.alias == 'hg' and c.a_ref_name != 'ancestor':
             if c.cs_ref_type != 'branch':
                 c.cs_branch_name = org_scm_instance.get_changeset(c.cs_ref_name).branch # use ref_type ?
@@ @@ -602,6 +604,8 @@ class PullrequestsController(BaseRepoCon @@
                     h.short_id(org_scm_instance.get_changeset((max(revs))).raw_id))
             else:
                 c.update_msg_other = _('Branch %s does not contain other changes.') % c.cs_branch_name
         elif org_scm_instance.alias == 'git':
             c.update_msg = _("Git pull requests don't support updates yet.")
         raw_ids = [x.raw_id for x in c.cs_ranges]
         c.cs_comments = c.cs_repo.get_comments(raw_ids)

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -193,9 +193,7 @@ @@
                   </a>
                   </li>
                   <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-code-fork"></i> ${_('Fork')}</a></li>
                   %if h.is_hg(c.db_repo_scm_instance):
                   <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-code-fork"></i> ${_('Create Pull Request')}</a></li>
                   %endif
               %endif
              </ul>
         </li>

0 comments (0 inline, 0 general)