File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -228,7 +228,7 @@ def get_ready_commits(repo, tree):
228228 if (line .startswith (' M' ) or line .startswith (' A' ) or line .startswith (' D' )) and branch == None :
229229 type , path = line [:4 ], line [5 :]
230230 branch = '/' .join (path .split ('/' )[1 :4 ])
231- elif re .search ("(?i)(commit ready (for|to) merge)" , line ):
231+ elif re .search ("(?i)(( commit|branch) ready (for|to) merge)" , line ):
232232 if not (rev in merged_revs and branch == merged_revs [rev ]):
233233 note (" %s %s: %s@%s" % (when , who , branch , rev ))
234234 list += [(rev , repo , branch ),]
Original file line number Diff line number Diff line change @@ -159,7 +159,9 @@ def post_submission(request, submission):
159159
160160 update_authors (draft , submission )
161161
162- rebuild_reference_relations (draft )
162+ trouble = rebuild_reference_relations (draft )
163+ if trouble :
164+ log ('Rebuild_reference_relations trouble: %s' % trouble )
163165
164166 # new revision event
165167 e = NewRevisionDocEvent (type = "new_revision" , doc = draft , rev = draft .rev )
You can’t perform that action at this time.
0 commit comments