Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 13315:0d1dca7d2a04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 28 Jan 2011 03:09:22 +0100
parents 0935ff767285 8dc488dfcdb4
children 3f6a4579f803 adf3c4401c5d
comparison
equal deleted inserted replaced
13313:0c493e5ce8e9 13315:0d1dca7d2a04
542 r = src.config('bundle', 'mainreporoot') 542 r = src.config('bundle', 'mainreporoot')
543 if r: 543 if r:
544 dst.setconfig('bundle', 'mainreporoot', r) 544 dst.setconfig('bundle', 'mainreporoot', r)
545 545
546 # copy selected local settings to the remote ui 546 # copy selected local settings to the remote ui
547 for sect in ('auth', 'http_proxy'): 547 for sect in ('auth', 'hostfingerprints', 'http_proxy'):
548 for key, val in src.configitems(sect): 548 for key, val in src.configitems(sect):
549 dst.setconfig(sect, key, val) 549 dst.setconfig(sect, key, val)
550 v = src.config('web', 'cacerts') 550 v = src.config('web', 'cacerts')
551 if v: 551 if v:
552 dst.setconfig('web', 'cacerts', util.expandpath(v)) 552 dst.setconfig('web', 'cacerts', util.expandpath(v))