comparison mercurial/cmdutil.py @ 10026:0b0a46607ac9

merge with the stable branch
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 10 Dec 2009 12:31:57 +0100
parents 2b630e4c8f2f fb45c1e4396f
children 5c5c6295533d
comparison
equal deleted inserted replaced
10024:2b630e4c8f2f 10026:0b0a46607ac9
109 # copy ssh-specific options 109 # copy ssh-specific options
110 for o in 'ssh', 'remotecmd': 110 for o in 'ssh', 'remotecmd':
111 v = opts.get(o) or src.config('ui', o) 111 v = opts.get(o) or src.config('ui', o)
112 if v: 112 if v:
113 dst.setconfig("ui", o, v) 113 dst.setconfig("ui", o, v)
114
114 # copy bundle-specific options 115 # copy bundle-specific options
115 r = src.config('bundle', 'mainreporoot') 116 r = src.config('bundle', 'mainreporoot')
116 if r: 117 if r:
117 dst.setconfig('bundle', 'mainreporoot', r) 118 dst.setconfig('bundle', 'mainreporoot', r)
119
120 # copy auth section settings
121 for key, val in src.configitems('auth'):
122 dst.setconfig('auth', key, val)
118 123
119 return dst 124 return dst
120 125
121 def revpair(repo, revs): 126 def revpair(repo, revs):
122 '''return pair of nodes, given list of revisions. second item can 127 '''return pair of nodes, given list of revisions. second item can