Merged in [8236] from rjsparks@nostrum.com:\n Log what rebuild_reference_relations returns to diagnose #1467.

- Legacy-Id: 8360
Note: SVN reference [8236] has been migrated to Git commit b95b769267907f2ac8430893b153a7c82756265b
This commit is contained in:
Henrik Levkowetz 2014-09-28 17:53:02 +00:00
parent 607c6f3eec
commit 1c439cda48
2 changed files with 4 additions and 2 deletions

View file

@ -228,7 +228,7 @@ def get_ready_commits(repo, tree):
if (line.startswith(' M') or line.startswith(' A') or line.startswith(' D')) and branch == None:
type, path = line[:4], line[5:]
branch = '/'.join(path.split('/')[1:4])
elif re.search("(?i)(commit ready (for|to) merge)", line):
elif re.search("(?i)((commit|branch) ready (for|to) merge)", line):
if not (rev in merged_revs and branch == merged_revs[rev]):
note(" %s %s: %s@%s" % (when, who, branch, rev))
list += [(rev, repo, branch),]

View file

@ -159,7 +159,9 @@ def post_submission(request, submission):
update_authors(draft, submission)
rebuild_reference_relations(draft)
trouble = rebuild_reference_relations(draft)
if trouble:
log('Rebuild_reference_relations trouble: %s'%trouble)
# new revision event
e = NewRevisionDocEvent(type="new_revision", doc=draft, rev=draft.rev)