Mercurial > hg
comparison hgext/convert/hg.py @ 4906:30847b8af7ca
dirstate: add __contains__ and make __getitem__ more useful
dirstate.state(f) == '?' -> f not in dirstate
dirstate.state(f) -> dirstate[f]
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 21 Jul 2007 16:02:09 -0500 |
parents | 6fd953d5faea |
children | 4106dde15aed |
comparison
equal
deleted
inserted
replaced
4905:fc61495ea9cf | 4906:30847b8af7ca |
---|---|
24 h = self.repo.changelog.heads() | 24 h = self.repo.changelog.heads() |
25 return [ hg.hex(x) for x in h ] | 25 return [ hg.hex(x) for x in h ] |
26 | 26 |
27 def putfile(self, f, e, data): | 27 def putfile(self, f, e, data): |
28 self.repo.wwrite(f, data, e) | 28 self.repo.wwrite(f, data, e) |
29 if self.repo.dirstate.state(f) == '?': | 29 if f not in self.repo.dirstate: |
30 self.repo.dirstate.add(f) | 30 self.repo.dirstate.add(f) |
31 | 31 |
32 def copyfile(self, source, dest): | 32 def copyfile(self, source, dest): |
33 self.repo.copy(source, dest) | 33 self.repo.copy(source, dest) |
34 | 34 |
56 extra = {} | 56 extra = {} |
57 if commit.branch: | 57 if commit.branch: |
58 extra['branch'] = commit.branch | 58 extra['branch'] = commit.branch |
59 if commit.rev: | 59 if commit.rev: |
60 extra['convert_revision'] = commit.rev | 60 extra['convert_revision'] = commit.rev |
61 | 61 |
62 while parents: | 62 while parents: |
63 p1 = p2 | 63 p1 = p2 |
64 p2 = parents.pop(0) | 64 p2 = parents.pop(0) |
65 a = self.repo.rawcommit(files, text, commit.author, commit.date, | 65 a = self.repo.rawcommit(files, text, commit.author, commit.date, |
66 hg.bin(p1), hg.bin(p2), extra=extra) | 66 hg.bin(p1), hg.bin(p2), extra=extra) |