Mercurial > hg
comparison hgext/transplant.py @ 12349:7340b0fa049a
transplant: fix var name conflict introduced by 2912881c2a98
| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
|---|---|
| date | Sat, 18 Sep 2010 08:30:11 +0200 |
| parents | 6277a9469dff |
| children | 19dabc8a3236 |
comparison
equal
deleted
inserted
replaced
| 12348:7f97b4841ee7 | 12349:7340b0fa049a |
|---|---|
| 46 def write(self): | 46 def write(self): |
| 47 if self.dirty and self.transplantfile: | 47 if self.dirty and self.transplantfile: |
| 48 if not os.path.isdir(self.path): | 48 if not os.path.isdir(self.path): |
| 49 os.mkdir(self.path) | 49 os.mkdir(self.path) |
| 50 fp = self.opener(self.transplantfile, 'w') | 50 fp = self.opener(self.transplantfile, 'w') |
| 51 for l in self.transplants.itervalues(): | 51 for list in self.transplants.itervalues(): |
| 52 for c in l: | 52 for t in list: |
| 53 l, r = map(revlog.hex, (c.lnode, c.rnode)) | 53 l, r = map(revlog.hex, (t.lnode, t.rnode)) |
| 54 fp.write(l + ':' + r + '\n') | 54 fp.write(l + ':' + r + '\n') |
| 55 fp.close() | 55 fp.close() |
| 56 self.dirty = False | 56 self.dirty = False |
| 57 | 57 |
| 58 def get(self, rnode): | 58 def get(self, rnode): |