equal
deleted
inserted
replaced
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 # tarfile normalizes path separators to '/' |
38 # tarfile normalizes path separators to '/' |
39 statusfile = '/'.join(['.hg', 'imerge', 'status']) |
39 statusfile = '.hg/imerge/status' |
40 if statusfile not in contents: |
40 if statusfile not in contents: |
41 raise InvalidStateFileException('no status file') |
41 raise InvalidStateFileException('no status file') |
42 |
42 |
43 tf.extract(statusfile, self.im.repo.root) |
43 tf.extract(statusfile, self.im.repo.root) |
44 p1, p2 = self.im.load() |
44 p1, p2 = self.im.load() |