Show More
@@ -138,7 +138,7 b' def getrepophid(repo):' | |||
|
138 | 138 | |
|
139 | 139 | _differentialrevisiontagre = re.compile('\AD([1-9][0-9]*)\Z') |
|
140 | 140 | _differentialrevisiondescre = re.compile( |
|
141 | '^Differential Revision:.*D([1-9][0-9]*)$', re.M) | |
|
141 | '^Differential Revision:\s*(.*)D([1-9][0-9]*)$', re.M) | |
|
142 | 142 | |
|
143 | 143 | def getoldnodedrevmap(repo, nodelist): |
|
144 | 144 | """find previous nodes that has been sent to Phabricator |
@@ -172,10 +172,14 b' def getoldnodedrevmap(repo, nodelist):' | |||
|
172 | 172 | toconfirm[node] = (n, set(precnodes), int(m.group(1))) |
|
173 | 173 | continue |
|
174 | 174 | |
|
175 | # Check commit message | |
|
175 | # Check commit message (make sure URL matches) | |
|
176 | 176 | m = _differentialrevisiondescre.search(ctx.description()) |
|
177 | 177 | if m: |
|
178 | result[node] = (None, int(m.group(1))) | |
|
178 | if m.group(1).rstrip('/') == url.rstrip('/'): | |
|
179 | result[node] = (None, int(m.group(2))) | |
|
180 | else: | |
|
181 | unfi.ui.warn(_('%s: Differential Revision URL ignored - host ' | |
|
182 | 'does not match config\n') % ctx) | |
|
179 | 183 | |
|
180 | 184 | # Double check if tags are genuine by collecting all old nodes from |
|
181 | 185 | # Phabricator, and expect precursors overlap with it. |
General Comments 0
You need to be logged in to leave comments.
Login now