kallithea Changeset - dacbd7f15ba2

Changeset - dacbd7f15ba2

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 11 years ago 2014-08-12 13:08:23
madski@unity3d.com

pull requests: clarify message about unrelated changes that can't be used for updating PR

1 file changed with 4 insertions and 2 deletions:

kallithea/controllers/pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -241,8 +241,10 @@ class PullrequestsController(BaseRepoCon @@
                 else:
                     c.update_msg = _('No changesets found for updating this pull request.')
             if org_scm_instance._repo.revs('head() & not (%s::) & branch(%s)', revs[0], c.org_branch_name):
                 c.update_msg_other = _('Note: Branch %s also contains unrelated changes.') % c.org_branch_name
             revs = org_scm_instance._repo.revs('head() & not (%s::) & branch(%s) & !closed()', revs[0], c.org_branch_name)
             if revs:
                 c.update_msg_other = _('Note: Branch %s also contains unrelated changes, such as %s.') % (c.org_branch_name,
                     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.org_branch_name

0 comments (0 inline, 0 general)