comparison mercurial/subrepo.py @ 10699:7b0a0d498cc0

Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Mon, 15 Mar 2010 18:36:11 +0100
parents 001ffc2b3d22 c90d923fff64
children 8d5f5122a732
comparison
equal deleted inserted replaced
10696:28e9a9907236 10699:7b0a0d498cc0
191 191
192 def addpathconfig(key, value): 192 def addpathconfig(key, value):
193 fp.write('%s = %s\n' % (key, value)) 193 fp.write('%s = %s\n' % (key, value))
194 self._repo.ui.setconfig('paths', key, value) 194 self._repo.ui.setconfig('paths', key, value)
195 195
196 defpath = os.path.join(_abssource(ctx._repo), path) 196 defpath = _abssource(self._repo)
197 defpushpath = _abssource(self._repo, True)
197 addpathconfig('default', defpath) 198 addpathconfig('default', defpath)
199 if defpath != defpushpath:
200 addpathconfig('default-push', defpushpath)
198 fp.close() 201 fp.close()
199 202
200 def dirty(self): 203 def dirty(self):
201 r = self._state[1] 204 r = self._state[1]
202 if r == '': 205 if r == '':