Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 37084:f0b6fbea00cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stringutil: bulk-replace call sites to point to new module This might conflict with other patches floating around, sorry.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 22 Mar 2018 21:56:20 +0900
parents ffa3026d4196
children 71543b942eea
comparison
equal deleted inserted replaced
37083:f99d64e8a4e4 37084:f0b6fbea00cf
46 util, 46 util,
47 verify as verifymod, 47 verify as verifymod,
48 vfs as vfsmod, 48 vfs as vfsmod,
49 ) 49 )
50 50
51 from .utils import (
52 stringutil,
53 )
54
51 release = lock.release 55 release = lock.release
52 56
53 # shared features 57 # shared features
54 sharedbookmarks = 'bookmarks' 58 sharedbookmarks = 'bookmarks'
55 59
268 requirements += 'relshared\n' 272 requirements += 'relshared\n'
269 except (IOError, ValueError) as e: 273 except (IOError, ValueError) as e:
270 # ValueError is raised on Windows if the drive letters differ on 274 # ValueError is raised on Windows if the drive letters differ on
271 # each path 275 # each path
272 raise error.Abort(_('cannot calculate relative path'), 276 raise error.Abort(_('cannot calculate relative path'),
273 hint=util.forcebytestr(e)) 277 hint=stringutil.forcebytestr(e))
274 else: 278 else:
275 requirements += 'shared\n' 279 requirements += 'shared\n'
276 280
277 destvfs.write('requires', requirements) 281 destvfs.write('requires', requirements)
278 destvfs.write('sharedpath', sharedpath) 282 destvfs.write('sharedpath', sharedpath)