Mercurial > hg
comparison hgext/convert/convcmd.py @ 21634:23b24d6a70c8
convert: rename sink hascommit to hascommitforsplicemap
The name 'hascommit' sounds like something generic ... but it might
also throw exceptions in specific cases and it is thus (apparently)
only useful for splicemap.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Mon, 19 May 2014 22:11:14 +0200 |
parents | 78b15ad2f968 |
children | 3de9f2c4900c |
comparison
equal
deleted
inserted
replaced
21633:0ae44984b8d9 | 21634:23b24d6a70c8 |
---|---|
191 map contains valid revision identifiers and merge the new | 191 map contains valid revision identifiers and merge the new |
192 links in the source graph. | 192 links in the source graph. |
193 """ | 193 """ |
194 for c in sorted(splicemap): | 194 for c in sorted(splicemap): |
195 if c not in parents: | 195 if c not in parents: |
196 if not self.dest.hascommit(self.map.get(c, c)): | 196 if not self.dest.hascommitforsplicemap(self.map.get(c, c)): |
197 # Could be in source but not converted during this run | 197 # Could be in source but not converted during this run |
198 self.ui.warn(_('splice map revision %s is not being ' | 198 self.ui.warn(_('splice map revision %s is not being ' |
199 'converted, ignoring\n') % c) | 199 'converted, ignoring\n') % c) |
200 continue | 200 continue |
201 pc = [] | 201 pc = [] |
202 for p in splicemap[c]: | 202 for p in splicemap[c]: |
203 # We do not have to wait for nodes already in dest. | 203 # We do not have to wait for nodes already in dest. |
204 if self.dest.hascommit(self.map.get(p, p)): | 204 if self.dest.hascommitforsplicemap(self.map.get(p, p)): |
205 continue | 205 continue |
206 # Parent is not in dest and not being converted, not good | 206 # Parent is not in dest and not being converted, not good |
207 if p not in parents: | 207 if p not in parents: |
208 raise util.Abort(_('unknown splice map parent: %s') % p) | 208 raise util.Abort(_('unknown splice map parent: %s') % p) |
209 pc.append(p) | 209 pc.append(p) |