equal
deleted
inserted
replaced
719 raise |
719 raise |
720 rbsrt._finishrebase() |
720 rbsrt._finishrebase() |
721 finally: |
721 finally: |
722 release(lock, wlock) |
722 release(lock, wlock) |
723 |
723 |
724 def _definesets(ui, repo, destf=None, srcf=None, basef=None, revf=[], |
724 def _definesets(ui, repo, destf=None, srcf=None, basef=None, revf=None, |
725 destspace=None): |
725 destspace=None): |
726 """use revisions argument to define destination and rebase set |
726 """use revisions argument to define destination and rebase set |
727 """ |
727 """ |
|
728 revf = revf or [] |
|
729 |
728 # destspace is here to work around issues with `hg pull --rebase` see |
730 # destspace is here to work around issues with `hg pull --rebase` see |
729 # issue5214 for details |
731 # issue5214 for details |
730 if srcf and basef: |
732 if srcf and basef: |
731 raise error.Abort(_('cannot specify both a source and a base')) |
733 raise error.Abort(_('cannot specify both a source and a base')) |
732 if revf and basef: |
734 if revf and basef: |