| mitrandir | |
| durin42 |
| hg-reviewers |
Previously, readpatch and querydrev take a same params and stack
parameters. This patch changes readpatch so it takes the output of
querydrev, not the input of querydrev. This makes the code more
flexible and cleaner.
| Lint Skipped |
| Unit Tests Skipped |
| r'date': r'%d 0' % commit[r'time'], | r'date': r'%d 0' % commit[r'time'], | ||||
| r'node': commit[r'rev'], | r'node': commit[r'rev'], | ||||
| r'user': r'%s <%s>' % (commit[r'author'], commit[r'authorEmail']), | r'user': r'%s <%s>' % (commit[r'author'], commit[r'authorEmail']), | ||||
| } | } | ||||
| if len(commit.get(r'parents', ())) >= 1: | if len(commit.get(r'parents', ())) >= 1: | ||||
| meta[r'parent'] = commit[r'parents'][0] | meta[r'parent'] = commit[r'parents'][0] | ||||
| return meta or {} | return meta or {} | ||||
| def readpatch(repo, params, write, stack=False): | def readpatch(repo, drevs, write): | ||||
| """generate plain-text patch readable by 'hg import' | """generate plain-text patch readable by 'hg import' | ||||
| write is usually ui.write. params is passed to "differential.query". If | write is usually ui.write. drevs is what "querydrev" returns, results of | ||||
| stack is True, also write dependent patches. | "differential.query". | ||||
| """ | """ | ||||
| # Differential Revisions | |||||
| drevs = querydrev(repo, params, stack) | |||||
| # Prefetch hg:meta property for all diffs | # Prefetch hg:meta property for all diffs | ||||
| diffids = sorted(set(max(int(v) for v in drev[r'diffs']) for drev in drevs)) | diffids = sorted(set(max(int(v) for v in drev[r'diffs']) for drev in drevs)) | ||||
| diffs = callconduit(repo, 'differential.querydiffs', {'ids': diffids}) | diffs = callconduit(repo, 'differential.querydiffs', {'ids': diffids}) | ||||
| # Generate patch for each drev | # Generate patch for each drev | ||||
| for drev in drevs: | for drev in drevs: | ||||
| repo.ui.note(_('reading D%s\n') % drev[r'id']) | repo.ui.note(_('reading D%s\n') % drev[r'id']) | ||||
| number ``123``, or a full URL like ``https://phab.example.com/D123``. | number ``123``, or a full URL like ``https://phab.example.com/D123``. | ||||
| If --stack is given, follow dependencies information and read all patches. | If --stack is given, follow dependencies information and read all patches. | ||||
| """ | """ | ||||
| try: | try: | ||||
| revid = int(revid.split('/')[-1].replace('D', '')) | revid = int(revid.split('/')[-1].replace('D', '')) | ||||
| except ValueError: | except ValueError: | ||||
| raise error.Abort(_('invalid Revision ID: %s') % revid) | raise error.Abort(_('invalid Revision ID: %s') % revid) | ||||
| readpatch(repo, {'ids': [revid]}, ui.write, opts.get('stack')) | drevs = querydrev(repo, {'ids': [revid]}, opts.get('stack')) | ||||
| readpatch(repo, drevs, ui.write) | |||||