| Alphare |
| hg-reviewers |
We are about to run it in a loop, so lets pre-indent it to clarify the actual
change in the next changesets.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| if ui.configbool(b'commands', b'update.requiredest') and opts.get( | if ui.configbool(b'commands', b'update.requiredest') and opts.get( | ||||
| b'update' | b'update' | ||||
| ): | ): | ||||
| msg = _(b'update destination required by configuration') | msg = _(b'update destination required by configuration') | ||||
| hint = _(b'use hg pull followed by hg update DEST') | hint = _(b'use hg pull followed by hg update DEST') | ||||
| raise error.InputError(msg, hint=hint) | raise error.InputError(msg, hint=hint) | ||||
| source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch')) | if True: | ||||
| source, branches = hg.parseurl( | |||||
| ui.expandpath(source), opts.get(b'branch') | |||||
| ) | |||||
| ui.status(_(b'pulling from %s\n') % util.hidepassword(source)) | ui.status(_(b'pulling from %s\n') % util.hidepassword(source)) | ||||
| ui.flush() | ui.flush() | ||||
| other = hg.peer(repo, opts, source) | other = hg.peer(repo, opts, source) | ||||
| update_conflict = None | update_conflict = None | ||||
| try: | try: | ||||
| revs, checkout = hg.addbranchrevs( | revs, checkout = hg.addbranchrevs( | ||||
| repo, other, branches, opts.get(b'rev') | repo, other, branches, opts.get(b'rev') | ||||
| ) | ) | ||||
| pullopargs = {} | pullopargs = {} | ||||
| nodes = None | nodes = None | ||||
| if opts.get(b'bookmark') or revs: | if opts.get(b'bookmark') or revs: | ||||
| # The list of bookmark used here is the same used to actually update | # The list of bookmark used here is the same used to actually update | ||||
| # the bookmark names, to avoid the race from issue 4689 and we do | # the bookmark names, to avoid the race from issue 4689 and we do | ||||
| # all lookup and bookmark queries in one go so they see the same | # all lookup and bookmark queries in one go so they see the same | ||||
| # version of the server state (issue 4700). | # version of the server state (issue 4700). | ||||
| nodes = [] | nodes = [] | ||||
| fnodes = [] | fnodes = [] | ||||
| revs = revs or [] | revs = revs or [] | ||||
| if revs and not other.capable(b'lookup'): | if revs and not other.capable(b'lookup'): | ||||
| err = _( | err = _( | ||||
| b"other repository doesn't support revision lookup, " | b"other repository doesn't support revision lookup, " | ||||
| b"so a rev cannot be specified." | b"so a rev cannot be specified." | ||||
| ) | ) | ||||
| raise error.Abort(err) | raise error.Abort(err) | ||||
| with other.commandexecutor() as e: | with other.commandexecutor() as e: | ||||
| fremotebookmarks = e.callcommand( | fremotebookmarks = e.callcommand( | ||||
| b'listkeys', {b'namespace': b'bookmarks'} | b'listkeys', {b'namespace': b'bookmarks'} | ||||
| ) | ) | ||||
| for r in revs: | for r in revs: | ||||
| fnodes.append(e.callcommand(b'lookup', {b'key': r})) | fnodes.append(e.callcommand(b'lookup', {b'key': r})) | ||||
| remotebookmarks = fremotebookmarks.result() | remotebookmarks = fremotebookmarks.result() | ||||
| remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks) | remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks) | ||||
| pullopargs[b'remotebookmarks'] = remotebookmarks | pullopargs[b'remotebookmarks'] = remotebookmarks | ||||
| for b in opts.get(b'bookmark', []): | for b in opts.get(b'bookmark', []): | ||||
| b = repo._bookmarks.expandname(b) | b = repo._bookmarks.expandname(b) | ||||
| if b not in remotebookmarks: | if b not in remotebookmarks: | ||||
| raise error.InputError( | raise error.InputError( | ||||
| _(b'remote bookmark %s not found!') % b | _(b'remote bookmark %s not found!') % b | ||||
| ) | ) | ||||
| nodes.append(remotebookmarks[b]) | nodes.append(remotebookmarks[b]) | ||||
| for i, rev in enumerate(revs): | for i, rev in enumerate(revs): | ||||
| node = fnodes[i].result() | node = fnodes[i].result() | ||||
| nodes.append(node) | nodes.append(node) | ||||
| if rev == checkout: | if rev == checkout: | ||||
| checkout = node | checkout = node | ||||
| wlock = util.nullcontextmanager() | wlock = util.nullcontextmanager() | ||||
| if opts.get(b'update'): | if opts.get(b'update'): | ||||
| wlock = repo.wlock() | wlock = repo.wlock() | ||||
| with wlock: | with wlock: | ||||
| pullopargs.update(opts.get(b'opargs', {})) | pullopargs.update(opts.get(b'opargs', {})) | ||||
| modheads = exchange.pull( | modheads = exchange.pull( | ||||
| repo, | repo, | ||||
| other, | other, | ||||
| heads=nodes, | heads=nodes, | ||||
| force=opts.get(b'force'), | force=opts.get(b'force'), | ||||
| bookmarks=opts.get(b'bookmark', ()), | bookmarks=opts.get(b'bookmark', ()), | ||||
| opargs=pullopargs, | opargs=pullopargs, | ||||
| confirm=opts.get(b'confirm'), | confirm=opts.get(b'confirm'), | ||||
| ).cgresult | ).cgresult | ||||
| # brev is a name, which might be a bookmark to be activated at | # brev is a name, which might be a bookmark to be activated at | ||||
| # the end of the update. In other words, it is an explicit | # the end of the update. In other words, it is an explicit | ||||
| # destination of the update | # destination of the update | ||||
| brev = None | brev = None | ||||
| if checkout: | if checkout: | ||||
| checkout = repo.unfiltered().changelog.rev(checkout) | checkout = repo.unfiltered().changelog.rev(checkout) | ||||
| # order below depends on implementation of | # order below depends on implementation of | ||||
| # hg.addbranchrevs(). opts['bookmark'] is ignored, | # hg.addbranchrevs(). opts['bookmark'] is ignored, | ||||
| # because 'checkout' is determined without it. | # because 'checkout' is determined without it. | ||||
| if opts.get(b'rev'): | if opts.get(b'rev'): | ||||
| brev = opts[b'rev'][0] | brev = opts[b'rev'][0] | ||||
| elif opts.get(b'branch'): | elif opts.get(b'branch'): | ||||
| brev = opts[b'branch'][0] | brev = opts[b'branch'][0] | ||||
| else: | else: | ||||
| brev = branches[0] | brev = branches[0] | ||||
| repo._subtoppath = source | repo._subtoppath = source | ||||
| try: | try: | ||||
| update_conflict = postincoming( | update_conflict = postincoming( | ||||
| ui, repo, modheads, opts.get(b'update'), checkout, brev | ui, repo, modheads, opts.get(b'update'), checkout, brev | ||||
| ) | ) | ||||
| except error.FilteredRepoLookupError as exc: | except error.FilteredRepoLookupError as exc: | ||||
| msg = _(b'cannot update to target: %s') % exc.args[0] | msg = _(b'cannot update to target: %s') % exc.args[0] | ||||
| exc.args = (msg,) + exc.args[1:] | exc.args = (msg,) + exc.args[1:] | ||||
| raise | raise | ||||
| finally: | finally: | ||||
| del repo._subtoppath | del repo._subtoppath | ||||
| finally: | finally: | ||||
| other.close() | other.close() | ||||
| if update_conflict: | if update_conflict: | ||||
| return 1 | return 1 | ||||
| else: | else: | ||||
| return 0 | return 0 | ||||
| @command( | @command( | ||||
| b'purge|clean', | b'purge|clean', | ||||