equal
deleted
inserted
replaced
21 from mercurial.node import nullrev, nullid, hex, short |
21 from mercurial.node import nullrev, nullid, hex, short |
22 from mercurial.lock import release |
22 from mercurial.lock import release |
23 from mercurial.i18n import _ |
23 from mercurial.i18n import _ |
24 import os, errno |
24 import os, errno |
25 |
25 |
|
26 # The following constants are used throughout the rebase module. The ordering of |
|
27 # their values must be maintained. |
|
28 |
|
29 # Indicates that a revision needs to be rebased |
26 revtodo = -1 |
30 revtodo = -1 |
27 nullmerge = -2 |
31 nullmerge = -2 |
28 revignored = -3 |
32 revignored = -3 |
|
33 # To do with obsolescence |
29 revprecursor = -4 |
34 revprecursor = -4 |
30 |
35 |
31 cmdtable = {} |
36 cmdtable = {} |
32 command = cmdutil.command(cmdtable) |
37 command = cmdutil.command(cmdtable) |
33 # Note for extension authors: ONLY specify testedwith = 'internal' for |
38 # Note for extension authors: ONLY specify testedwith = 'internal' for |
185 |
190 |
186 """ |
191 """ |
187 originalwd = target = None |
192 originalwd = target = None |
188 activebookmark = None |
193 activebookmark = None |
189 external = nullrev |
194 external = nullrev |
|
195 # Mapping between thes old revision id and either what is the new rebased |
|
196 # revision or what needs to be done with the old revsion. The state dict |
|
197 # will be what contains most of the rebase progress state. |
190 state = {} |
198 state = {} |
191 skipped = set() |
199 skipped = set() |
192 targetancestors = set() |
200 targetancestors = set() |
193 |
201 |
194 |
202 |