equal
deleted
inserted
replaced
1802 nodechanges = fd(changes, key="oldnode", value="newnodes") |
1802 nodechanges = fd(changes, key="oldnode", value="newnodes") |
1803 fm.data(nodechanges=nodechanges) |
1803 fm.data(nodechanges=nodechanges) |
1804 |
1804 |
1805 def pullrebase(orig, ui, repo, *args, **opts): |
1805 def pullrebase(orig, ui, repo, *args, **opts): |
1806 'Call rebase after pull if the latter has been invoked with --rebase' |
1806 'Call rebase after pull if the latter has been invoked with --rebase' |
1807 ret = None |
|
1808 if opts.get(r'rebase'): |
1807 if opts.get(r'rebase'): |
1809 if ui.configbool('commands', 'rebase.requiredest'): |
1808 if ui.configbool('commands', 'rebase.requiredest'): |
1810 msg = _('rebase destination required by configuration') |
1809 msg = _('rebase destination required by configuration') |
1811 hint = _('use hg pull followed by hg rebase -d DEST') |
1810 hint = _('use hg pull followed by hg rebase -d DEST') |
1812 raise error.Abort(msg, hint=hint) |
1811 raise error.Abort(msg, hint=hint) |