Mercurial > evolve
diff hgext/qsync.py @ 491:6989d8fe4ed2
merge evolve and obsolete
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Fri, 24 Aug 2012 10:44:23 +0200 |
| parents | f2168d0b5700 |
| children | 9825c7da5b54 |
line wrap: on
line diff
--- a/hgext/qsync.py Thu Aug 23 18:21:18 2012 +0200 +++ b/hgext/qsync.py Fri Aug 24 10:44:23 2012 +0200 @@ -83,8 +83,8 @@ review_list.append(patch_name) except IOError: oldnode = oldfiles[patch_name] - obsolete = extensions.find('obsolete') - newnodes = obsolete.newerversion(repo, oldnode) + evolve = extensions.find('evolve') + newnodes = evolve.newerversion(repo, oldnode) if newnodes: newnodes = [n for n in newnodes if n and n[0] in repo] # remove killing if not newnodes: @@ -166,14 +166,14 @@ currentdrafts = set(d[0] for d in newdata) usednew = set() usedold = set() - obsolete = extensions.find('obsolete') + evolve = extensions.find('evolve') for oldhex, oldname in olddata: if oldhex in usedold: continue # no duplicate usedold.add(oldhex) oldname = str(oldname) oldnode = bin(oldhex) - newnodes = obsolete.newerversion(repo, oldnode) + newnodes = evolve.newerversion(repo, oldnode) if newnodes: newnodes = [n for n in newnodes if n and n[0] in repo] # remove killing if len(newnodes) > 1: