Show More
@@ -550,35 +550,23 b' def get_unique_pull_path(action, repo, u' | |||
|
550 | 550 | |
|
551 | 551 | The `action` parameter will be used for the error message. |
|
552 | 552 | """ |
|
553 |
|
|
|
554 | if source is None: | |
|
555 | if b'default' in ui.paths: | |
|
556 | urls.extend(p.rawloc for p in ui.paths[b'default']) | |
|
557 | else: | |
|
558 | # XXX this is the historical default behavior, but that is not | |
|
559 | # great, consider breaking BC on this. | |
|
560 | urls.append(b'default') | |
|
561 | else: | |
|
562 | if source in ui.paths: | |
|
563 | urls.extend(p.rawloc for p in ui.paths[source]) | |
|
564 | else: | |
|
565 | # Try to resolve as a local path or URI. | |
|
566 | path = try_path(ui, source) | |
|
567 | if path is not None: | |
|
568 | urls.append(path.rawloc) | |
|
569 | else: | |
|
570 | urls.append(source) | |
|
571 | if len(urls) != 1: | |
|
553 | sources = [] | |
|
554 | if source is not None: | |
|
555 | sources.append(source) | |
|
556 | ||
|
557 | pull_paths = list(get_pull_paths(repo, ui, sources=sources)) | |
|
558 | path_count = len(pull_paths) | |
|
559 | if path_count != 1: | |
|
572 | 560 | if source is None: |
|
573 | 561 | msg = _( |
|
574 | 562 | b"default path points to %d urls while %s only supports one" |
|
575 | 563 | ) |
|
576 |
msg %= ( |
|
|
564 | msg %= (path_count, action) | |
|
577 | 565 | else: |
|
578 | 566 | msg = _(b"path points to %d urls while %s only supports one: %s") |
|
579 |
msg %= ( |
|
|
567 | msg %= (path_count, action, source) | |
|
580 | 568 | raise error.Abort(msg) |
|
581 |
return parseurl(u |
|
|
569 | return parseurl(pull_paths[0].rawloc, default_branches) | |
|
582 | 570 | |
|
583 | 571 | |
|
584 | 572 | def get_clone_path(ui, source, default_branches=()): |
General Comments 0
You need to be logged in to leave comments.
Login now