equal
deleted
inserted
replaced
107 |
107 |
108 # Rebase |
108 # Rebase |
109 targetancestors = list(repo.changelog.ancestors(target)) |
109 targetancestors = list(repo.changelog.ancestors(target)) |
110 targetancestors.append(target) |
110 targetancestors.append(target) |
111 |
111 |
112 for rev in util.sort(state): |
112 for rev in sorted(state): |
113 if state[rev] == -1: |
113 if state[rev] == -1: |
114 storestatus(repo, originalwd, target, state, collapsef, keepf, |
114 storestatus(repo, originalwd, target, state, collapsef, keepf, |
115 keepbranchesf, external) |
115 keepbranchesf, external) |
116 rebasenode(repo, rev, target, state, skipped, targetancestors, |
116 rebasenode(repo, rev, target, state, skipped, targetancestors, |
117 collapsef, extrafn) |
117 collapsef, extrafn) |