equal
deleted
inserted
replaced
723 |
723 |
724 def _definesets(ui, repo, destf=None, srcf=None, basef=None, revf=None, |
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 [] |
728 if revf is None: |
|
729 revf = [] |
729 |
730 |
730 # destspace is here to work around issues with `hg pull --rebase` see |
731 # destspace is here to work around issues with `hg pull --rebase` see |
731 # issue5214 for details |
732 # issue5214 for details |
732 if srcf and basef: |
733 if srcf and basef: |
733 raise error.Abort(_('cannot specify both a source and a base')) |
734 raise error.Abort(_('cannot specify both a source and a base')) |