hgext/rebase.py
changeset 22823 18ac67b0814c
parent 22820 103dcfbb385f
child 22901 722117c8e023
equal deleted inserted replaced
22822:7a06ad9518c0 22823:18ac67b0814c
   274                     return 1
   274                     return 1
   275                 rebaseset = repo.revs(
   275                 rebaseset = repo.revs(
   276                     '(children(ancestor(%ld, %d)) and ::(%ld))::',
   276                     '(children(ancestor(%ld, %d)) and ::(%ld))::',
   277                     base, dest, base)
   277                     base, dest, base)
   278                 if not rebaseset:
   278                 if not rebaseset:
   279                     if base == [dest.rev()]:
   279                     # transform to list because smartsets are not comparable to
       
   280                     # lists. This should be improved to honor lazyness of
       
   281                     # smartset.
       
   282                     if list(base) == [dest.rev()]:
   280                         if basef:
   283                         if basef:
   281                             ui.status(_('nothing to rebase - %s is both "base"'
   284                             ui.status(_('nothing to rebase - %s is both "base"'
   282                                         ' and destination\n') % dest)
   285                                         ' and destination\n') % dest)
   283                         else:
   286                         else:
   284                             ui.status(_('nothing to rebase - working directory '
   287                             ui.status(_('nothing to rebase - working directory '