facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

convert: update 'intermediate-source' in the destination's extras dictionary

Browse Source
This commit is contained in:
Matt Harbison 2015-06-15 16:50:31 -04:00
parent 5ddbe8ee34
commit 5776a99bfa
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hgext/convert/hg.py
View File

@ -225,7 +225,8 @@ class mercurial_sink(converter_sink):
extra = commit.extra.copy()
for label in ('source', 'transplant_source', 'rebase_source'):
for label in ('source', 'transplant_source', 'rebase_source',
'intermediate-source'):
node = extra.get(label)
if node is None:

8
tests/test-graft.t
View File

@ -492,10 +492,12 @@ The graft case
date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
Test that template correctly expands more than one 'extra' (issue4362)
$ hg -R ../converted log -r 7 --template "{extras % ' Extra: {extra}\n'}"
Test that template correctly expands more than one 'extra' (issue4362), and that
'intermediate-source' is converted.
$ hg -R ../converted log -r 13 --template "{extras % ' Extra: {extra}\n'}"
Extra: branch=default
Extra: convert_revision=ef0ef43d49e79e81ddafdc7997401ba0041efc82
Extra: convert_revision=7a4785234d87ec1aa420ed6b11afe40fa73e12a9
Extra: intermediate-source=7ae846e9111fc8f57745634250c7b9ac0a60689b
Extra: source=e0213322b2c1a5d5d236c74e79666441bee67a7d
The transplant case