mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
templatekw: make join() escape values of extras (BC) (issue5504)
Since extras may contain blob, the default template escapes its values: 'extra': '{key}={value|stringescape}' join() should follow the output style of the default template.
This commit is contained in:
parent
02022fc3c5
commit
5ce2afb81d
@ -336,7 +336,7 @@ def showextras(**args):
|
|||||||
c = [makemap(k) for k in extras]
|
c = [makemap(k) for k in extras]
|
||||||
f = _showlist('extra', c, plural='extras', **args)
|
f = _showlist('extra', c, plural='extras', **args)
|
||||||
return _hybrid(f, extras, makemap,
|
return _hybrid(f, extras, makemap,
|
||||||
lambda x: '%s=%s' % (x['key'], x['value']))
|
lambda x: '%s=%s' % (x['key'], util.escapestr(x['value'])))
|
||||||
|
|
||||||
@templatekeyword('file_adds')
|
@templatekeyword('file_adds')
|
||||||
def showfileadds(**args):
|
def showfileadds(**args):
|
||||||
|
@ -582,8 +582,7 @@ The transplant case
|
|||||||
21: fbb6c5cc81002f2b4b49c9d731404688bcae5ade
|
21: fbb6c5cc81002f2b4b49c9d731404688bcae5ade
|
||||||
branch=dev
|
branch=dev
|
||||||
convert_revision=7e61b508e709a11d28194a5359bc3532d910af21
|
convert_revision=7e61b508e709a11d28194a5359bc3532d910af21
|
||||||
transplant_source=z\xe8F\xe9\x11\x1f\xc8\xf5wEcBP\xc7\xb9\xac (esc)
|
transplant_source=z\xe8F\xe9\x11\x1f\xc8\xf5wEcBP\xc7\xb9\xac\n`h\x9b
|
||||||
`h\x9b (esc)
|
|
||||||
$ hg -R ../converted log -r 'origin(tip)'
|
$ hg -R ../converted log -r 'origin(tip)'
|
||||||
changeset: 2:e0213322b2c1
|
changeset: 2:e0213322b2c1
|
||||||
user: test
|
user: test
|
||||||
|
@ -94,6 +94,15 @@ rebase b onto r1
|
|||||||
1 r2
|
1 r2
|
||||||
0 r1
|
0 r1
|
||||||
|
|
||||||
|
test format of transplant_source
|
||||||
|
|
||||||
|
$ hg log -r7 --debug | grep transplant_source
|
||||||
|
extra: transplant_source=\xa52Q\xcd\xf7\x17g\x9d\x19\x07\xb2\x89\xf9\x91SK\xe0\\\x99z
|
||||||
|
$ hg log -r7 -T '{extras}\n'
|
||||||
|
branch=defaulttransplant_source=\xa52Q\xcd\xf7\x17g\x9d\x19\x07\xb2\x89\xf9\x91SK\xe0\\\x99z
|
||||||
|
$ hg log -r7 -T '{join(extras, " ")}\n'
|
||||||
|
branch=default transplant_source=\xa52Q\xcd\xf7\x17g\x9d\x19\x07\xb2\x89\xf9\x91SK\xe0\\\x99z
|
||||||
|
|
||||||
test transplanted revset
|
test transplanted revset
|
||||||
|
|
||||||
$ hg log -r 'transplanted()' --template '{rev} {parents} {desc}\n'
|
$ hg log -r 'transplanted()' --template '{rev} {parents} {desc}\n'
|
||||||
|
Loading…
Reference in New Issue
Block a user