##// END OF EJS Templates
rebase: abort hg pull --rebase if rebase.requiredest is set (issue5514)...
Ryan McElroy -
r31733:ae6bab09 default
parent child Browse files
Show More
@@ -1362,6 +1362,11 def pullrebase(orig, ui, repo, *args, **
1362 'Call rebase after pull if the latter has been invoked with --rebase'
1362 'Call rebase after pull if the latter has been invoked with --rebase'
1363 ret = None
1363 ret = None
1364 if opts.get('rebase'):
1364 if opts.get('rebase'):
1365 if ui.configbool('commands', 'rebase.requiredest'):
1366 msg = _('rebase destination required by configuration')
1367 hint = _('use hg pull followed by hg rebase -d DEST')
1368 raise error.Abort(msg, hint=hint)
1369
1365 wlock = lock = None
1370 wlock = lock = None
1366 try:
1371 try:
1367 wlock = repo.wlock()
1372 wlock = repo.wlock()
@@ -72,13 +72,7 Check rebase.requiredest interaction wit
72 $ echo f > f
72 $ echo f > f
73 $ hg commit -qAm ff
73 $ hg commit -qAm ff
74 $ hg pull --rebase
74 $ hg pull --rebase
75 pulling from $TESTTMP/repo
75 abort: rebase destination required by configuration
76 searching for changes
76 (use hg pull followed by hg rebase -d DEST)
77 adding changesets
78 adding manifests
79 adding file changes
80 added 1 changesets with 2 changes to 2 files (+1 heads)
81 abort: you must specify a destination
82 (use: hg rebase -d REV)
83 [255]
77 [255]
84
78
General Comments 0
You need to be logged in to leave comments. Login now