Mercurial > hg
comparison hgext/rebase.py @ 10436:6cebf27287de
rebase: split line longer than 80 chars
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Fri, 12 Feb 2010 15:17:10 +0100 |
| parents | e433002acb05 |
| children | 6227c8d669d5 86dc21148bdb |
comparison
equal
deleted
inserted
replaced
| 10426:5a3a916aad58 | 10436:6cebf27287de |
|---|---|
| 167 if not keepf: | 167 if not keepf: |
| 168 # Remove no more useful revisions | 168 # Remove no more useful revisions |
| 169 rebased = [rev for rev in state if state[rev] != nullmerge] | 169 rebased = [rev for rev in state if state[rev] != nullmerge] |
| 170 if rebased: | 170 if rebased: |
| 171 if set(repo.changelog.descendants(min(rebased))) - set(state): | 171 if set(repo.changelog.descendants(min(rebased))) - set(state): |
| 172 ui.warn(_("warning: new changesets detected on source branch, " | 172 ui.warn(_("warning: new changesets detected " |
| 173 "not stripping\n")) | 173 "on source branch, not stripping\n")) |
| 174 else: | 174 else: |
| 175 repair.strip(ui, repo, repo[min(rebased)].node(), "strip") | 175 repair.strip(ui, repo, repo[min(rebased)].node(), "strip") |
| 176 | 176 |
| 177 clearstatus(repo) | 177 clearstatus(repo) |
| 178 ui.status(_("rebase completed\n")) | 178 ui.status(_("rebase completed\n")) |