| pulkit | |
| Alphare |
| hg-reviewers |
This means the caller has to do a bit more work, however it give access to the
path instance and the information it contains.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (11 lines) | |||
| M | mercurial/hg.py (5 lines) | |||
| M | mercurial/utils/urlutil.py (6 lines) |
| ) | ) | ||||
| hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | ||||
| return 0 | return 0 | ||||
| cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle']) | cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle']) | ||||
| if opts.get(b'bookmarks'): | if opts.get(b'bookmarks'): | ||||
| srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch')) | srcs = urlutil.get_pull_paths(repo, ui, [source]) | ||||
| for source, branches in srcs: | for path in srcs: | ||||
| source, branches = urlutil.parseurl( | |||||
| path.rawloc, opts.get(b'branch') | |||||
| ) | |||||
| other = hg.peer(repo, opts, source) | other = hg.peer(repo, opts, source) | ||||
| try: | try: | ||||
| if b'bookmarks' not in other.listkeys(b'namespaces'): | if b'bookmarks' not in other.listkeys(b'namespaces'): | ||||
| ui.warn(_(b"remote doesn't support bookmarks\n")) | ui.warn(_(b"remote doesn't support bookmarks\n")) | ||||
| return 0 | return 0 | ||||
| ui.pager(b'incoming') | ui.pager(b'incoming') | ||||
| ui.status( | ui.status( | ||||
| _(b'comparing with %s\n') % urlutil.hidepassword(source) | _(b'comparing with %s\n') % urlutil.hidepassword(source) | ||||
| 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) | ||||
| sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch')) | for path in urlutil.get_pull_paths(repo, ui, sources): | ||||
| for source, branches in sources: | source, branches = urlutil.parseurl(path.rawloc, opts.get(b'branch')) | ||||
| ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source)) | ui.status(_(b'pulling from %s\n') % urlutil.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') | ||||
| ) | ) | ||||
| subpath=None, | subpath=None, | ||||
| ): | ): | ||||
| """ | """ | ||||
| Helper for incoming / gincoming. | Helper for incoming / gincoming. | ||||
| displaychlist gets called with | displaychlist gets called with | ||||
| (remoterepo, incomingchangesetlist, displayer) parameters, | (remoterepo, incomingchangesetlist, displayer) parameters, | ||||
| and is supposed to contain only code that can't be unified. | and is supposed to contain only code that can't be unified. | ||||
| """ | """ | ||||
| srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch')) | srcs = urlutil.get_pull_paths(repo, ui, [source]) | ||||
| srcs = list(srcs) | srcs = list(srcs) | ||||
| if len(srcs) != 1: | if len(srcs) != 1: | ||||
| msg = _(b'for now, incoming supports only a single source, %d provided') | msg = _(b'for now, incoming supports only a single source, %d provided') | ||||
| msg %= len(srcs) | msg %= len(srcs) | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| source, branches = srcs[0] | path = srcs[0] | ||||
| source, branches = urlutil.parseurl(path.rawloc, opts.get(b'branch')) | |||||
| if subpath is not None: | if subpath is not None: | ||||
| subpath = urlutil.url(subpath) | subpath = urlutil.url(subpath) | ||||
| if subpath.isabs(): | if subpath.isabs(): | ||||
| source = bytes(subpath) | source = bytes(subpath) | ||||
| else: | else: | ||||
| p = urlutil.url(source) | p = urlutil.url(source) | ||||
| p.path = os.path.normpath(b'%s/%s' % (p.path, subpath)) | p.path = os.path.normpath(b'%s/%s' % (p.path, subpath)) | ||||
| source = bytes(p) | source = bytes(p) | ||||
| path = try_path(ui, dest) | path = try_path(ui, dest) | ||||
| if path is None: | if path is None: | ||||
| msg = _(b'repository %s does not exist') | msg = _(b'repository %s does not exist') | ||||
| msg %= dest | msg %= dest | ||||
| raise error.RepoError(msg) | raise error.RepoError(msg) | ||||
| yield path | yield path | ||||
| def get_pull_paths(repo, ui, sources, default_branches=()): | def get_pull_paths(repo, ui, sources): | ||||
| """yields all the `(path, branch)` selected as pull source by `sources`""" | """yields all the `(path, branch)` selected as pull source by `sources`""" | ||||
| if not sources: | if not sources: | ||||
| sources = [b'default'] | sources = [b'default'] | ||||
| for source in sources: | for source in sources: | ||||
| if source in ui.paths: | if source in ui.paths: | ||||
| for p in ui.paths[source]: | for p in ui.paths[source]: | ||||
| yield parseurl(p.rawloc, default_branches) | yield p | ||||
| else: | else: | ||||
| p = path(ui, None, source, validate_path=False) | p = path(ui, None, source, validate_path=False) | ||||
| yield parseurl(p.rawloc, default_branches) | yield p | ||||
| def get_unique_push_path(action, repo, ui, dest=None): | def get_unique_push_path(action, repo, ui, dest=None): | ||||
| """return a unique `path` or abort if multiple are found | """return a unique `path` or abort if multiple are found | ||||
| This is useful for command and action that does not support multiple | This is useful for command and action that does not support multiple | ||||
| destination (yet). | destination (yet). | ||||