kallithea Changeset - 494eab6ec837

Changeset - 494eab6ec837

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 12 years ago 2014-07-04 14:12:06
madski@unity3d.com

pull requests: shorten revision numbers in automatic titles

- but it would perhaps be better to use branch names ...

2 files changed with 9 insertions and 6 deletions:

kallithea/controllers/pullrequests.py

kallithea/lib/helpers.py

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -363,13 +363,13 @@ class PullrequestsController(BaseRepoCon @@
             return redirect(url('pullrequest_home', repo_name=repo_name)) ## would rather just go back to form ...
         # heads up: org and other might seem backward here ...
         org_repo_name = _form['org_repo']
         org_ref = _form['org_ref'] # will have merge_rev as rev but symbolic name
         org_repo = RepoModel()._get_repo(org_repo_name)
-        (_org_ref_type,
+        (org_ref_type,
          org_ref_name,
          org_rev) = org_ref.split(':')
         other_repo_name = _form['other_repo']
         other_ref = _form['other_ref'] # will have symbolic name and head revision
         other_repo = RepoModel()._get_repo(other_repo_name)
@@ @@ -389,13 +389,14 @@ class PullrequestsController(BaseRepoCon @@
         other_ref = '%s:%s:%s' % (other_ref_type, other_ref_name, ancestor_rev)
         reviewers = _form['review_members']
         title = _form['pullrequest_title']
         if not title:
             title = '%s#%s to %s#%s' % (org_repo_name, org_ref_name, other_repo_name, other_ref_name)
             title = '%s#%s to %s#%s' % (org_repo_name, h.short_ref(org_ref_type, org_ref_name),
                                         other_repo_name, h.short_ref(other_ref_type, other_ref_name))
         description = _form['pullrequest_desc'].strip() or _('No description')
         try:
             pull_request = PullRequestModel().create(
                 self.authuser.user_id, org_repo_name, org_ref, other_repo_name,
                 other_ref, revisions, reviewers, title, description
+            )

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1376,23 +1376,25 @@ def rst_w_mentions(source): @@
     :param source:
     """
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst_with_mentions(source))
 def short_ref(ref_type, ref_name):
     if ref_type == 'rev':
         return short_id(ref_name)
     return ref_name
 def link_to_ref(repo_name, ref_type, ref_name, rev=None):
     """
     Return full markup for a href to changeset_home for a changeset.
     If ref_type is branch it will link to changelog.
     ref_name is shortened if ref_type is 'rev'.
     if rev is specified show it too, explicitly linking to that revision.
     """
     if ref_type == 'rev':
         txt = short_id(ref_name)
     else:
         txt = ref_name
     txt = short_ref(ref_type, ref_name)
     if ref_type == 'branch':
         u = url('changelog_home', repo_name=repo_name, branch=ref_name)
     else:
         u = url('changeset_home', repo_name=repo_name, revision=ref_name)
     l = link_to(repo_name + '#' + txt, u)
     if rev and ref_type != 'rev':

0 comments (0 inline, 0 general)