equal
deleted
inserted
replaced
45 registrar, |
45 registrar, |
46 repair, |
46 repair, |
47 repoview, |
47 repoview, |
48 revset, |
48 revset, |
49 scmutil, |
49 scmutil, |
|
50 smartset, |
50 util, |
51 util, |
51 ) |
52 ) |
52 |
53 |
53 release = lock.release |
54 release = lock.release |
54 templateopts = commands.templateopts |
55 templateopts = commands.templateopts |
116 # # XXX: Currently private because I expect the signature to change. |
117 # # XXX: Currently private because I expect the signature to change. |
117 # # XXX: - bailing out in case of ambiguity vs returning all data. |
118 # # XXX: - bailing out in case of ambiguity vs returning all data. |
118 # i18n: "_rebasedefaultdest" is a keyword |
119 # i18n: "_rebasedefaultdest" is a keyword |
119 sourceset = None |
120 sourceset = None |
120 if x is not None: |
121 if x is not None: |
121 sourceset = revset.getset(repo, revset.fullreposet(repo), x) |
122 sourceset = revset.getset(repo, smartset.fullreposet(repo), x) |
122 return subset & revset.baseset([_destrebase(repo, sourceset)]) |
123 return subset & smartset.baseset([_destrebase(repo, sourceset)]) |
123 |
124 |
124 class rebaseruntime(object): |
125 class rebaseruntime(object): |
125 """This class is a container for rebase runtime state""" |
126 """This class is a container for rebase runtime state""" |
126 def __init__(self, repo, ui, opts=None): |
127 def __init__(self, repo, ui, opts=None): |
127 if opts is None: |
128 if opts is None: |