Mercurial > hg
comparison hgext/extdiff.py @ 36204:33ed8b511185
cmdutil: pass ctx to makefilename() in place of repo/node pair (API)
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 02 Apr 2015 23:32:28 +0900 |
| parents | a8bc191fee5a |
| children | 1fa33bd848ee |
comparison
equal
deleted
inserted
replaced
| 36203:01280638bdb1 | 36204:33ed8b511185 |
|---|---|
| 254 else: | 254 else: |
| 255 template = 'hg-%h.patch' | 255 template = 'hg-%h.patch' |
| 256 cmdutil.export(repo, [repo[node1a].rev(), repo[node2].rev()], | 256 cmdutil.export(repo, [repo[node1a].rev(), repo[node2].rev()], |
| 257 fntemplate=repo.vfs.reljoin(tmproot, template), | 257 fntemplate=repo.vfs.reljoin(tmproot, template), |
| 258 match=matcher) | 258 match=matcher) |
| 259 label1a = cmdutil.makefilename(repo, template, node1a) | 259 label1a = cmdutil.makefilename(repo[node1a], template) |
| 260 label2 = cmdutil.makefilename(repo, template, node2) | 260 label2 = cmdutil.makefilename(repo[node2], template) |
| 261 dir1a = repo.vfs.reljoin(tmproot, label1a) | 261 dir1a = repo.vfs.reljoin(tmproot, label1a) |
| 262 dir2 = repo.vfs.reljoin(tmproot, label2) | 262 dir2 = repo.vfs.reljoin(tmproot, label2) |
| 263 dir1b = None | 263 dir1b = None |
| 264 label1b = None | 264 label1b = None |
| 265 fnsandstat = [] | 265 fnsandstat = [] |