facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

rebase: transform the smartset to a list before comparing with a list

Browse Source 
This is highly suboptimal but smartsets are not comparable to lists yet.
This commit is contained in:
Pierre-Yves David 2014-10-07 00:31:53 -07:00
parent 04745ea203
commit 24a85b292d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hgext/rebase.py
View File

@ -276,7 +276,10 @@ def rebase(ui, repo, **opts):
'(children(ancestor(%ld, %d)) and ::(%ld))::',
base, dest, base)
if not rebaseset:
if base == [dest.rev()]:
# transform to list because smartsets are not comparable to
# lists. This should be improved to honor lazyness of
# smartset.
if list(base) == [dest.rev()]:
if basef:
ui.status(_('nothing to rebase - %s is both "base"'
' and destination\n') % dest)