Mercurial > hg
comparison hgext/extdiff.py @ 32431:9fd9f91b0c43
cmdutil: rename template param to export to fntemplate
It's actually a template for the filename, not a formatter template.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sat, 20 May 2017 20:15:05 -0400 |
| parents | 04baab18d60a |
| children | bb2525871d95 |
comparison
equal
deleted
inserted
replaced
| 32430:1f4be037f558 | 32431:9fd9f91b0c43 |
|---|---|
| 238 dir2 = os.path.join(dir2root, dir2, common_file) | 238 dir2 = os.path.join(dir2root, dir2, common_file) |
| 239 label2 = common_file + rev2 | 239 label2 = common_file + rev2 |
| 240 else: | 240 else: |
| 241 template = 'hg-%h.patch' | 241 template = 'hg-%h.patch' |
| 242 cmdutil.export(repo, [repo[node1a].rev(), repo[node2].rev()], | 242 cmdutil.export(repo, [repo[node1a].rev(), repo[node2].rev()], |
| 243 template=repo.vfs.reljoin(tmproot, template), | 243 fntemplate=repo.vfs.reljoin(tmproot, template), |
| 244 match=matcher) | 244 match=matcher) |
| 245 label1a = cmdutil.makefilename(repo, template, node1a) | 245 label1a = cmdutil.makefilename(repo, template, node1a) |
| 246 label2 = cmdutil.makefilename(repo, template, node2) | 246 label2 = cmdutil.makefilename(repo, template, node2) |
| 247 dir1a = repo.vfs.reljoin(tmproot, label1a) | 247 dir1a = repo.vfs.reljoin(tmproot, label1a) |
| 248 dir2 = repo.vfs.reljoin(tmproot, label2) | 248 dir2 = repo.vfs.reljoin(tmproot, label2) |