954 # - create obsolete marker *instead of* striping |
954 # - create obsolete marker *instead of* striping |
955 |
955 |
956 def buildstate(orig, repo, dest, rebaseset, *ags, **kws): |
956 def buildstate(orig, repo, dest, rebaseset, *ags, **kws): |
957 """wrapper for rebase 's buildstate that exclude obsolete changeset""" |
957 """wrapper for rebase 's buildstate that exclude obsolete changeset""" |
958 rebaseset = repo.revs('%ld - extinct()', rebaseset) |
958 rebaseset = repo.revs('%ld - extinct()', rebaseset) |
|
959 if not rebaseset: |
|
960 repo.ui.warn(_('whole rebase set is extinct and ignored.\n')) |
|
961 return {} |
959 return orig(repo, dest, rebaseset, *ags, **kws) |
962 return orig(repo, dest, rebaseset, *ags, **kws) |
960 |
963 |
961 def defineparents(orig, repo, rev, target, state, *args, **kwargs): |
964 def defineparents(orig, repo, rev, target, state, *args, **kwargs): |
962 rebasestate = getattr(repo, '_rebasestate', None) |
965 rebasestate = getattr(repo, '_rebasestate', None) |
963 if rebasestate is not None: |
966 if rebasestate is not None: |