14 https://mercurial-scm.org/wiki/RebaseExtension |
14 https://mercurial-scm.org/wiki/RebaseExtension |
15 ''' |
15 ''' |
16 |
16 |
17 from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks |
17 from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks |
18 from mercurial import extensions, patch, scmutil, phases, obsolete, error |
18 from mercurial import extensions, patch, scmutil, phases, obsolete, error |
19 from mercurial import copies, destutil, repoview, revset |
19 from mercurial import copies, destutil, repoview, registrar, revset |
20 from mercurial.commands import templateopts |
20 from mercurial.commands import templateopts |
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 |
74 |
74 |
75 Please wrap destutil.destmerge instead.""" |
75 Please wrap destutil.destmerge instead.""" |
76 return destutil.destmerge(repo, action='rebase', sourceset=sourceset, |
76 return destutil.destmerge(repo, action='rebase', sourceset=sourceset, |
77 onheadcheck=False) |
77 onheadcheck=False) |
78 |
78 |
79 revsetpredicate = revset.extpredicate() |
79 revsetpredicate = registrar.revsetpredicate() |
80 |
80 |
81 @revsetpredicate('_destrebase') |
81 @revsetpredicate('_destrebase') |
82 def _revsetdestrebase(repo, subset, x): |
82 def _revsetdestrebase(repo, subset, x): |
83 # ``_rebasedefaultdest()`` |
83 # ``_rebasedefaultdest()`` |
84 |
84 |
1323 _("use 'hg rebase --continue' or 'hg rebase --abort'")]) |
1323 _("use 'hg rebase --continue' or 'hg rebase --abort'")]) |
1324 cmdutil.afterresolvedstates.append( |
1324 cmdutil.afterresolvedstates.append( |
1325 ['rebasestate', _('hg rebase --continue')]) |
1325 ['rebasestate', _('hg rebase --continue')]) |
1326 # ensure rebased rev are not hidden |
1326 # ensure rebased rev are not hidden |
1327 extensions.wrapfunction(repoview, '_getdynamicblockers', _rebasedvisible) |
1327 extensions.wrapfunction(repoview, '_getdynamicblockers', _rebasedvisible) |
1328 revsetpredicate.setup() |
|