Mercurial > hg
changeset 22821:5d4c17d11d7e
qimport: use `first` and `last` instead of direct indexing
This makes it compatible with all smartset classes.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 07 Oct 2014 00:33:47 -0700 |
parents | 103dcfbb385f |
children | 7a06ad9518c0 |
files | hgext/mq.py |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Tue Oct 07 00:16:59 2014 -0700 +++ b/hgext/mq.py Tue Oct 07 00:33:47 2014 -0700 @@ -1992,24 +1992,24 @@ # If mq patches are applied, we can only import revisions # that form a linear path to qbase. # Otherwise, they should form a linear path to a head. - heads = repo.changelog.heads(repo.changelog.node(rev[-1])) + heads = repo.changelog.heads(repo.changelog.node(rev.first())) if len(heads) > 1: raise util.Abort(_('revision %d is the root of more than one ' 'branch') % rev.last()) if self.applied: - base = repo.changelog.node(rev[0]) + base = repo.changelog.node(rev.first()) if base in [n.node for n in self.applied]: raise util.Abort(_('revision %d is already managed') % rev[0]) if heads != [self.applied[-1].node]: raise util.Abort(_('revision %d is not the parent of ' - 'the queue') % rev[0]) + 'the queue') % rev.first()) base = repo.changelog.rev(self.applied[0].node) lastparent = repo.changelog.parentrevs(base)[0] else: - if heads != [repo.changelog.node(rev[0])]: + if heads != [repo.changelog.node(rev.first())]: raise util.Abort(_('revision %d has unmanaged children') - % rev[0]) + % rev.first()) lastparent = None diffopts = self.diffopts({'git': git})