merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
#!/usr/bin/env python
from mercurial import ui, util
testui = ui.ui()
testui.updateopts(config=[
'values.string=string value',
'values.bool1=true',
'values.bool2=false',
'lists.list1=foo',
'lists.list2=foo bar baz',
'lists.list3=alice, bob',
'lists.list4=foo bar baz alice, bob',
'interpolation.value1=hallo',
'interpolation.value2=%(value1)s world',
'interpolation.value3=%(novalue)s',
'interpolation.value4=%(bad)1',
'interpolation.value5=%bad2',
])
print repr(testui.configitems('values'))
print repr(testui.configitems('lists'))
try:
print repr(testui.configitems('interpolation'))
except util.Abort, inst:
print inst
print "---"
print repr(testui.config('values', 'string'))
print repr(testui.config('values', 'bool1'))
print repr(testui.config('values', 'bool2'))
print repr(testui.config('values', 'unknown'))
print "---"
try:
print repr(testui.configbool('values', 'string'))
except ValueError, why:
print why
print repr(testui.configbool('values', 'bool1'))
print repr(testui.configbool('values', 'bool2'))
print repr(testui.configbool('values', 'bool2', True))
print repr(testui.configbool('values', 'unknown'))
print repr(testui.configbool('values', 'unknown', True))
print "---"
print repr(testui.configlist('lists', 'list1'))
print repr(testui.configlist('lists', 'list2'))
print repr(testui.configlist('lists', 'list3'))
print repr(testui.configlist('lists', 'list4'))
print repr(testui.configlist('lists', 'list4', ['foo']))
print repr(testui.configlist('lists', 'unknown'))
print repr(testui.configlist('lists', 'unknown', ''))
print repr(testui.configlist('lists', 'unknown', 'foo'))
print repr(testui.configlist('lists', 'unknown', ['foo']))
print repr(testui.configlist('lists', 'unknown', 'foo bar'))
print repr(testui.configlist('lists', 'unknown', 'foo, bar'))
print repr(testui.configlist('lists', 'unknown', ['foo bar']))
print repr(testui.configlist('lists', 'unknown', ['foo', 'bar']))
print "---"
print repr(testui.config('interpolation', 'value1'))
print repr(testui.config('interpolation', 'value2'))
try:
print repr(testui.config('interpolation', 'value3'))
except util.Abort, inst:
print inst
try:
print repr(testui.config('interpolation', 'value4'))
except util.Abort, inst:
print inst
try:
print repr(testui.config('interpolation', 'value5'))
except util.Abort, inst:
print inst
print "---"