Show More
@@ -69,7 +69,7 b' def _destrebase(repo):' | |||||
69 | branch = repo[None].branch() |
|
69 | branch = repo[None].branch() | |
70 | return repo[branch].rev() |
|
70 | return repo[branch].rev() | |
71 |
|
71 | |||
72 |
def _re |
|
72 | def _revsetdestrebase(repo, subset, x): | |
73 | # ``_rebasedefaultdest()`` |
|
73 | # ``_rebasedefaultdest()`` | |
74 |
|
74 | |||
75 | # default destination for rebase. |
|
75 | # default destination for rebase. | |
@@ -1222,4 +1222,4 b' def uisetup(ui):' | |||||
1222 | _("use 'hg rebase --continue' or 'hg rebase --abort'")]) |
|
1222 | _("use 'hg rebase --continue' or 'hg rebase --abort'")]) | |
1223 | # ensure rebased rev are not hidden |
|
1223 | # ensure rebased rev are not hidden | |
1224 | extensions.wrapfunction(repoview, '_getdynamicblockers', _rebasedvisible) |
|
1224 | extensions.wrapfunction(repoview, '_getdynamicblockers', _rebasedvisible) | |
1225 |
revset.symbols['_rebase |
|
1225 | revset.symbols['_destrebase'] = _revsetdestrebase |
@@ -743,3 +743,14 b' Test that rebase is not confused by $CWD' | |||||
743 | rebasing 2:779a07b1b7a0 "first source commit" |
|
743 | rebasing 2:779a07b1b7a0 "first source commit" | |
744 | rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) |
|
744 | rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) | |
745 | saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob) |
|
745 | saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob) | |
|
746 | ||||
|
747 | Test experimental revset | |||
|
748 | ||||
|
749 | $ cd .. | |||
|
750 | $ hg log -r '_destrebase()' | |||
|
751 | changeset: 3:1910d5ff34ea | |||
|
752 | tag: tip | |||
|
753 | user: test | |||
|
754 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
755 | summary: second source with subdir | |||
|
756 |
General Comments 0
You need to be logged in to leave comments.
Login now