Mercurial > hg
comparison hgext/rebase.py @ 27745:d3a128e8604a
rebase: create a new variable to make the next patch more legible
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Wed, 06 Jan 2016 12:55:56 -0800 |
| parents | f2b8b4e2de20 |
| children | f0e9f38d250f |
comparison
equal
deleted
inserted
replaced
| 27744:f2b8b4e2de20 | 27745:d3a128e8604a |
|---|---|
| 346 rebaseobsrevs = set(r for r in rebasesetrevs | 346 rebaseobsrevs = set(r for r in rebasesetrevs |
| 347 if repo[r].obsolete()) | 347 if repo[r].obsolete()) |
| 348 obsoletenotrebased = _computeobsoletenotrebased(repo, | 348 obsoletenotrebased = _computeobsoletenotrebased(repo, |
| 349 rebaseobsrevs, | 349 rebaseobsrevs, |
| 350 dest) | 350 dest) |
| 351 rebaseobsskipped = set(obsoletenotrebased) | |
| 351 | 352 |
| 352 # - plain prune (no successor) changesets are rebased | 353 # - plain prune (no successor) changesets are rebased |
| 353 # - split changesets are not rebased if at least one of the | 354 # - split changesets are not rebased if at least one of the |
| 354 # changeset resulting from the split is an ancestor of dest | 355 # changeset resulting from the split is an ancestor of dest |
| 355 rebaseset = rebasesetrevs - set(obsoletenotrebased) | 356 rebaseset = rebasesetrevs - rebaseobsskipped |
| 356 if rebasesetrevs and not rebaseset: | 357 if rebasesetrevs and not rebaseset: |
| 357 msg = _('all requested changesets have equivalents ' | 358 msg = _('all requested changesets have equivalents ' |
| 358 'or were marked as obsolete') | 359 'or were marked as obsolete') |
| 359 hint = _('to force the rebase, set the config ' | 360 hint = _('to force the rebase, set the config ' |
| 360 'experimental.rebaseskipobsolete to False') | 361 'experimental.rebaseskipobsolete to False') |