equal
deleted
inserted
replaced
3936 Specifying bookmark as ``.`` is equivalent to specifying the active |
3936 Specifying bookmark as ``.`` is equivalent to specifying the active |
3937 bookmark's name. |
3937 bookmark's name. |
3938 |
3938 |
3939 Returns 0 on success, 1 if an update had unresolved files. |
3939 Returns 0 on success, 1 if an update had unresolved files. |
3940 """ |
3940 """ |
|
3941 |
|
3942 if ui.configbool('commands', 'update.requiredest') and opts.get('update'): |
|
3943 msg = _('update destination required by configuration') |
|
3944 hint = _('use hg pull followed by hg update DEST') |
|
3945 raise error.Abort(msg, hint=hint) |
|
3946 |
3941 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
3947 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
3942 ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
3948 ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
3943 other = hg.peer(repo, opts, source) |
3949 other = hg.peer(repo, opts, source) |
3944 try: |
3950 try: |
3945 revs, checkout = hg.addbranchrevs(repo, other, branches, |
3951 revs, checkout = hg.addbranchrevs(repo, other, branches, |