Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 10962:8d5f5122a732

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 19 Apr 2010 17:00:02 -0500
parents 56fffc9c8928 f1250e2e8fd1
children 80b9101688ac
comparison
equal deleted inserted replaced
10961:ce6d56b95f2e 10962:8d5f5122a732
127 # copy bundle-specific options 127 # copy bundle-specific options
128 r = src.config('bundle', 'mainreporoot') 128 r = src.config('bundle', 'mainreporoot')
129 if r: 129 if r:
130 dst.setconfig('bundle', 'mainreporoot', r) 130 dst.setconfig('bundle', 'mainreporoot', r)
131 131
132 # copy auth section settings 132 # copy auth and http_proxy section settings
133 for key, val in src.configitems('auth'): 133 for sect in ('auth', 'http_proxy'):
134 dst.setconfig('auth', key, val) 134 for key, val in src.configitems(sect):
135 dst.setconfig(sect, key, val)
135 136
136 return dst 137 return dst
137 138
138 def revpair(repo, revs): 139 def revpair(repo, revs):
139 '''return pair of nodes, given list of revisions. second item can 140 '''return pair of nodes, given list of revisions. second item can