| durin42 |
This allows us to do extra sanity checks using batch APIs to prevent
updating a wrong revision, which could happen when people switch Phabricator
instances and having stale tags living in the repo.
| Lint Skipped |
| Unit Tests Skipped |
| repophid = encoding.strtolocal(query[r'data'][0][r'phid']) | repophid = encoding.strtolocal(query[r'data'][0][r'phid']) | ||||
| repo.ui.setconfig('phabricator', 'repophid', repophid) | repo.ui.setconfig('phabricator', 'repophid', repophid) | ||||
| return repophid | return repophid | ||||
| _differentialrevisiontagre = re.compile('\AD([1-9][0-9]*)\Z') | _differentialrevisiontagre = re.compile('\AD([1-9][0-9]*)\Z') | ||||
| _differentialrevisiondescre = re.compile( | _differentialrevisiondescre = re.compile( | ||||
| '^Differential Revision:.*D([1-9][0-9]*)$', re.M) | '^Differential Revision:.*D([1-9][0-9]*)$', re.M) | ||||
| def getmapping(ctx): | def getoldnodedrevmap(repo, nodelist): | ||||
| """return (node, associated Differential Revision ID) or (None, None) | """find previous nodes that has been sent to Phabricator | ||||
| return {node: (oldnode or None, Differential Revision ID)} | |||||
| for node in nodelist with known previous sent versions, or associated | |||||
| Differential Revision IDs. | |||||
| Examines all precursors and their tags. Tags with format like "D1234" are | Examines all precursors and their tags. Tags with format like "D1234" are | ||||
| considered a match and the node with that tag, and the number after "D" | considered a match and the node with that tag, and the number after "D" | ||||
| (ex. 1234) will be returned. | (ex. 1234) will be returned. | ||||
| If tags are not found, examine commit message. The "Differential Revision:" | If tags are not found, examine commit message. The "Differential Revision:" | ||||
| line could associate this changeset to a Differential Revision. | line could associate this changeset to a Differential Revision. | ||||
| """ | """ | ||||
| unfi = ctx.repo().unfiltered() | url, token = readurltoken(repo) | ||||
| unfi = repo.unfiltered() | |||||
| nodemap = unfi.changelog.nodemap | nodemap = unfi.changelog.nodemap | ||||
| result = {} # {node: (oldnode or None, drev)} | |||||
| for node in nodelist: | |||||
| ctx = unfi[node] | |||||
| # Check tags like "D123" | # Check tags like "D123" | ||||
| for n in obsolete.allprecursors(unfi.obsstore, [ctx.node()]): | for n in obsolete.allprecursors(unfi.obsstore, [node]): | ||||
| if n in nodemap: | if n in nodemap: | ||||
| for tag in unfi.nodetags(n): | for tag in unfi.nodetags(n): | ||||
| m = _differentialrevisiontagre.match(tag) | m = _differentialrevisiontagre.match(tag) | ||||
| if m: | if m: | ||||
| return n, int(m.group(1)) | result[node] = (n, int(m.group(1))) | ||||
| continue | |||||
| # Check commit message | # Check commit message | ||||
| m = _differentialrevisiondescre.search(ctx.description()) | m = _differentialrevisiondescre.search(ctx.description()) | ||||
| if m: | if m: | ||||
| return None, int(m.group(1)) | result[node] = (None, int(m.group(1))) | ||||
| return None, None | return result | ||||
| def getdiff(ctx, diffopts): | def getdiff(ctx, diffopts): | ||||
| """plain-text diff without header (user, commit message, etc)""" | """plain-text diff without header (user, commit message, etc)""" | ||||
| output = util.stringio() | output = util.stringio() | ||||
| for chunk, _label in patch.diffui(ctx.repo(), ctx.p1().node(), ctx.node(), | for chunk, _label in patch.diffui(ctx.repo(), ctx.p1().node(), ctx.node(), | ||||
| None, opts=diffopts): | None, opts=diffopts): | ||||
| output.write(chunk) | output.write(chunk) | ||||
| return output.getvalue() | return output.getvalue() | ||||
| existing Differential Revision, or create a new one. | existing Differential Revision, or create a new one. | ||||
| """ | """ | ||||
| revs = list(revs) + opts.get('rev', []) | revs = list(revs) + opts.get('rev', []) | ||||
| revs = scmutil.revrange(repo, revs) | revs = scmutil.revrange(repo, revs) | ||||
| if not revs: | if not revs: | ||||
| raise error.Abort(_('phabsend requires at least one changeset')) | raise error.Abort(_('phabsend requires at least one changeset')) | ||||
| oldnodedrev = getoldnodedrevmap(repo, [repo[r].node() for r in revs]) | |||||
| # Send patches one by one so we know their Differential Revision IDs and | # Send patches one by one so we know their Differential Revision IDs and | ||||
| # can provide dependency relationship | # can provide dependency relationship | ||||
| lastrevid = None | lastrevid = None | ||||
| for rev in revs: | for rev in revs: | ||||
| ui.debug('sending rev %d\n' % rev) | ui.debug('sending rev %d\n' % rev) | ||||
| ctx = repo[rev] | ctx = repo[rev] | ||||
| # Get Differential Revision ID | # Get Differential Revision ID | ||||
| oldnode, revid = getmapping(ctx) | oldnode, revid = oldnodedrev.get(ctx.node(), (None, None)) | ||||
| if oldnode != ctx.node(): | if oldnode != ctx.node(): | ||||
| # Create or update Differential Revision | # Create or update Differential Revision | ||||
| revision = createdifferentialrevision(ctx, revid, lastrevid, | revision = createdifferentialrevision(ctx, revid, lastrevid, | ||||
| oldnode) | oldnode) | ||||
| newrevid = int(revision[r'object'][r'id']) | newrevid = int(revision[r'object'][r'id']) | ||||
| if revid: | if revid: | ||||
| action = _('updated') | action = _('updated') | ||||
| else: | else: | ||||