Show More
@@ -225,7 +225,8 class mercurial_sink(converter_sink): | |||||
225 |
|
225 | |||
226 | extra = commit.extra.copy() |
|
226 | extra = commit.extra.copy() | |
227 |
|
227 | |||
228 |
for label in ('source', 'transplant_source', 'rebase_source' |
|
228 | for label in ('source', 'transplant_source', 'rebase_source', | |
|
229 | 'intermediate-source'): | |||
229 | node = extra.get(label) |
|
230 | node = extra.get(label) | |
230 |
|
231 | |||
231 | if node is None: |
|
232 | if node is None: |
@@ -492,10 +492,12 The graft case | |||||
492 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
492 | date: Thu Jan 01 00:00:00 1970 +0000 | |
493 | summary: 2 |
|
493 | summary: 2 | |
494 |
|
494 | |||
495 | Test that template correctly expands more than one 'extra' (issue4362) |
|
495 | Test that template correctly expands more than one 'extra' (issue4362), and that | |
496 | $ hg -R ../converted log -r 7 --template "{extras % ' Extra: {extra}\n'}" |
|
496 | 'intermediate-source' is converted. | |
|
497 | $ hg -R ../converted log -r 13 --template "{extras % ' Extra: {extra}\n'}" | |||
497 | Extra: branch=default |
|
498 | Extra: branch=default | |
498 | Extra: convert_revision=ef0ef43d49e79e81ddafdc7997401ba0041efc82 |
|
499 | Extra: convert_revision=7a4785234d87ec1aa420ed6b11afe40fa73e12a9 | |
|
500 | Extra: intermediate-source=7ae846e9111fc8f57745634250c7b9ac0a60689b | |||
499 | Extra: source=e0213322b2c1a5d5d236c74e79666441bee67a7d |
|
501 | Extra: source=e0213322b2c1a5d5d236c74e79666441bee67a7d | |
500 |
|
502 | |||
501 | The transplant case |
|
503 | The transplant case |
General Comments 0
You need to be logged in to leave comments.
Login now