Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/hgext/convert/convcmd.py Mon May 19 22:10:50 2014 +0200 +++ b/hgext/convert/convcmd.py Mon May 19 22:11:14 2014 +0200 @@ -193,7 +193,7 @@ """ for c in sorted(splicemap): if c not in parents: - if not self.dest.hascommit(self.map.get(c, c)): + if not self.dest.hascommitforsplicemap(self.map.get(c, c)): # Could be in source but not converted during this run self.ui.warn(_('splice map revision %s is not being ' 'converted, ignoring\n') % c) @@ -201,7 +201,7 @@ pc = [] for p in splicemap[c]: # We do not have to wait for nodes already in dest. - if self.dest.hascommit(self.map.get(p, p)): + if self.dest.hascommitforsplicemap(self.map.get(p, p)): continue # Parent is not in dest and not being converted, not good if p not in parents: