kallithea Changeset - ccda18435e42

Changeset - ccda18435e42

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 11 years ago 2014-08-21 23:46:55
madski@unity3d.com

pull requests: tweak update messages - shorten descriptions to 80 chars

1 file changed with 4 insertions and 4 deletions:

kallithea/controllers/pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -503,35 +503,35 @@ class PullrequestsController(BaseRepoCon @@
         if lost:
             infos.append(_('Missing changesets since the previous version:'))
             for r in old_pull_request.revisions:
                 if r in lost:
                     desc = org_repo.get_changeset(r).message.split('\n')[0]
                     infos.append('  %s "%s"' % (h.short_id(r), desc))
         if new_revisions:
             infos.append(_('New changesets on %s %s since the previous version:') % (org_ref_type, org_ref_name))
             for r in reversed(revisions):
                 if r in new_revisions:
                     desc = org_repo.get_changeset(r).message.split('\n')[0]
-                    infos.append('  %s "%s"' % (h.short_id(r), desc))
+                    infos.append('  %s %s' % (h.short_id(r), h.shorter(desc, 80)))
             if ancestor_rev == other_rev:
                 infos.append(_("Ancestor didn't change - show diff since previous version: %s .") %
                              h.canonical_url('compare_url',
                 infos.append(_("Ancestor didn't change - show diff since previous version:"))
                 infos.append(h.canonical_url('compare_url',
                                  repo_name=org_repo.repo_name, # other_repo is always same as repo_name
                                  org_ref_type='rev', org_ref_name=h.short_id(org_rev), # use old org_rev as base
                                  other_ref_type='rev', other_ref_name=h.short_id(new_org_rev),
                                  )) # note: linear diff, merge or not doesn't matter
             else:
-                infos.append(_('This pull request uses another merge ancestor than the previous version and they are not directly comparable.'))
+                infos.append(_('This pull request is based on another %s revision and there is no simple diff.') % other_ref_name)
         else:
            infos.append(_('No changes found on %s %s since previous version.') % (org_ref_type, org_ref_name))
            # TODO: fail?
         # hack: ancestor_rev is not an other_ref but we want to show the
         # requested destination and have the exact ancestor
         new_other_ref = '%s:%s:%s' % (other_ref_type, other_ref_name, ancestor_rev)
         new_org_ref = '%s:%s:%s' % (org_ref_type, org_ref_name, new_org_rev)
         reviewers = [r.user_id for r in old_pull_request.reviewers]
         try:
             old_title, old_v = re.match(r'(.*)\(v(\d+)\)\s*$', old_pull_request.title).groups()

0 comments (0 inline, 0 general)