Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/imerge.py @ 5153:1d5ebb0d366f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: fix status file lookups
author Patrick Mezard <pmezard@gmail.com>
date Mon, 13 Aug 2007 19:42:52 +0200
parents d4fa6bafc43a
children ec24bfd852ab
comparison
equal deleted inserted replaced
5152:b51d07ed1b18 5153:1d5ebb0d366f
33 wlock = self.im.repo.wlock() 33 wlock = self.im.repo.wlock()
34 lock = self.im.repo.lock() 34 lock = self.im.repo.lock()
35 35
36 tf = tarfile.open(source, 'r') 36 tf = tarfile.open(source, 'r')
37 contents = tf.getnames() 37 contents = tf.getnames()
38 statusfile = os.path.join('.hg', 'imerge', 'status') 38 # tarfile normalizes path separators to '/'
39 statusfile = '/'.join(['.hg', 'imerge', 'status'])
39 if statusfile not in contents: 40 if statusfile not in contents:
40 raise InvalidStateFileException('no status file') 41 raise InvalidStateFileException('no status file')
41 42
42 tf.extract(statusfile, self.im.repo.root) 43 tf.extract(statusfile, self.im.repo.root)
43 p1, p2 = self.im.load() 44 p1, p2 = self.im.load()