Show More
@@ -304,7 +304,7 b' def getoldnodedrevmap(repo, nodelist):' | |||
|
304 | 304 | # Check commit message |
|
305 | 305 | m = _differentialrevisiondescre.search(ctx.description()) |
|
306 | 306 | if m: |
|
307 |
toconfirm[node] = (1, set(precnodes), int(m.group( |
|
|
307 | toconfirm[node] = (1, set(precnodes), int(m.group(r'id'))) | |
|
308 | 308 | |
|
309 | 309 | # Double check if tags are genuine by collecting all old nodes from |
|
310 | 310 | # Phabricator, and expect precursors overlap with it. |
@@ -555,7 +555,7 b' def phabsend(ui, repo, *revs, **opts):' | |||
|
555 | 555 | # Create a local tag to note the association, if commit message |
|
556 | 556 | # does not have it already |
|
557 | 557 | m = _differentialrevisiondescre.search(ctx.description()) |
|
558 |
if not m or int(m.group( |
|
|
558 | if not m or int(m.group(r'id')) != newrevid: | |
|
559 | 559 | tagname = b'D%d' % newrevid |
|
560 | 560 | tags.tag(repo, tagname, ctx.node(), message=None, user=None, |
|
561 | 561 | date=None, local=True) |
@@ -1001,8 +1001,8 b' def template_review(context, mapping):' | |||
|
1001 | 1001 | m = _differentialrevisiondescre.search(ctx.description()) |
|
1002 | 1002 | if m: |
|
1003 | 1003 | return templateutil.hybriddict({ |
|
1004 |
b'url': m.group( |
|
|
1005 |
b'id': b"D{}".format(m.group( |
|
|
1004 | b'url': m.group(r'url'), | |
|
1005 | b'id': b"D{}".format(m.group(r'id')), | |
|
1006 | 1006 | }) |
|
1007 | 1007 | else: |
|
1008 | 1008 | tags = ctx.repo().nodetags(ctx.node()) |
General Comments 0
You need to be logged in to leave comments.
Login now