comparison mercurial/subrepo.py @ 12770:614f0d8724ab

check-code: find trailing whitespace
author Martin Geisler <mg@lazybytes.net>
date Wed, 20 Oct 2010 10:13:04 +0200
parents ef5eaf53f4f7
children 3d6ba8c2b1b8
comparison
equal deleted inserted replaced
12769:daa8dc6e1f66 12770:614f0d8724ab
190 if push and repo.ui.config('paths', 'default-push'): 190 if push and repo.ui.config('paths', 'default-push'):
191 return repo.ui.config('paths', 'default-push') 191 return repo.ui.config('paths', 'default-push')
192 if repo.ui.config('paths', 'default'): 192 if repo.ui.config('paths', 'default'):
193 return repo.ui.config('paths', 'default') 193 return repo.ui.config('paths', 'default')
194 if abort: 194 if abort:
195 raise util.Abort(_("default path for subrepository %s not found") % 195 raise util.Abort(_("default path for subrepository %s not found") %
196 reporelpath(repo)) 196 reporelpath(repo))
197 197
198 def itersubrepos(ctx1, ctx2): 198 def itersubrepos(ctx1, ctx2):
199 """find subrepos in ctx1 or ctx2""" 199 """find subrepos in ctx1 or ctx2"""
200 # Create a (subpath, ctx) mapping where we prefer subpaths from 200 # Create a (subpath, ctx) mapping where we prefer subpaths from