~zyga/tarmac/git-support

« back to all changes in this revision

Viewing changes to tarmac/bin/commands.py

  • Committer: Tarmac Traffic Controller
  • Author(s): Rodney Dawes
  • Date: 2014-02-20 20:40:35 UTC
  • mfrom: (427.1.1 merge-web-link)
  • Revision ID: tarmac_traffic_controller-20140220204035-4nrox8da9dk7c127
Use proposal.web_link directly instead of a regex.

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
    UnapprovedChanges,
38
38
)
39
39
from tarmac.plugin import load_plugins
40
 
from tarmac.utility import get_review_url
41
40
 
42
41
 
43
42
def _compare_proposals(a, b):
219
218
 
220
219
        if self.config.list_approved:
221
220
            for proposal in proposals:
222
 
                print(get_review_url(proposal))
 
221
                print(proposal.web_link)
223
222
            return
224
223
 
225
224
        try:
316
315
                            'target': proposal.target_branch.web_link})
317
316
                    continue
318
317
 
319
 
                merge_url = get_review_url(proposal)
320
 
                revprops = {'merge_url': merge_url}
 
318
                revprops = {'merge_url': proposal.web_link}
321
319
 
322
320
                commit_message = proposal.commit_message
323
321
                if commit_message is None and self.config.imply_commit_message: