##// END OF EJS Templates
rebase: extra default destination in its own function...
Pierre-Yves David -
r26717:1755e1d9 default
parent child Browse files
Show More
@@ -63,6 +63,12 b' def _makeextrafn(copiers):'
63 c(ctx, extra)
63 c(ctx, extra)
64 return extrafn
64 return extrafn
65
65
66 def _destrebase(repo):
67 # Destination defaults to the latest revision in the
68 # current branch
69 branch = repo[None].branch()
70 return repo[branch].rev()
71
66 def _rebasedefaultdest(repo, subset, x):
72 def _rebasedefaultdest(repo, subset, x):
67 # ``_rebasedefaultdest()``
73 # ``_rebasedefaultdest()``
68
74
@@ -73,10 +79,7 b' def _rebasedefaultdest(repo, subset, x):'
73 # # XXX: - probably merging with the merge destination.
79 # # XXX: - probably merging with the merge destination.
74 # i18n: "_rebasedefaultdest" is a keyword
80 # i18n: "_rebasedefaultdest" is a keyword
75 revset.getargs(x, 0, 0, _("_rebasedefaultdest takes no arguments"))
81 revset.getargs(x, 0, 0, _("_rebasedefaultdest takes no arguments"))
76 # Destination defaults to the latest revision in the
82 return subset & revset.baseset([_destrebase(repo)])
77 # current branch
78 branch = repo[None].branch()
79 return subset & revset.baseset([repo[branch].rev()])
80
83
81 @command('rebase',
84 @command('rebase',
82 [('s', 'source', '',
85 [('s', 'source', '',
General Comments 0
You need to be logged in to leave comments. Login now